nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(network): add bssid to AccessPoint component

Browse source
This commit is contained in:
Piotr Bartoszewicz 2025-06-08 18:18:04 +02:00
parent e96f10d9a9
commit 790cb3e911
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
services/Network.qml
View file

@ -23,31 +23,31 @@ Singleton {
Process { Process {
id: getNetworks id: getNetworks
running: true running: true
command: ["sh", "-c", `nmcli -g ACTIVE,SIGNAL,FREQ,SSID d w | jq -ncR '[(inputs / ":") | select(.[3] | length >= 4)]'`] command: ["sh", "-c", `nmcli -g ACTIVE,SIGNAL,FREQ,SSID,BSSID d w | jq -ncR '[(inputs | split("(?<!\\\\\\\\):"; "g")) | select(.[3] | length >= 4)]'`]
stdout: SplitParser { stdout: SplitParser {
onRead: data => { onRead: data => {
const networks = JSON.parse(data) const networks = JSON.parse(data).map(n => [n[0] === "yes", parseInt(n[1]), parseInt(n[2]), n[3], n[4].replace(/\\/g, "")]);
.filter(n => n[0] === "yes")
.map(n => [n[0] === "yes", parseInt(n[1]), parseInt(n[2]), n[3]]);
const rNetworks = root.networks; const rNetworks = root.networks;
const destroyed = rNetworks.filter(rn => !networks.find(n => n[2] === rn.frequency && n[3] === rn.ssid)); const destroyed = rNetworks.filter(rn => !networks.find(n => n[2] === rn.frequency && n[3] === rn.ssid && n[4] === rn.bssid));
for (const network of destroyed) for (const network of destroyed)
rNetworks.splice(rNetworks.indexOf(network), 1).forEach(n => n.destroy()); rNetworks.splice(rNetworks.indexOf(network), 1).forEach(n => n.destroy());
for (const network of networks) { for (const network of networks) {
const match = rNetworks.find(n => n.frequency === network[2] && n.ssid === network[3]); const match = rNetworks.find(n => n.frequency === network[2] && n.ssid === network[3] && n.bssid === network[4]);
if (match) { if (match) {
match.active = network[0]; match.active = network[0];
match.strength = network[1]; match.strength = network[1];
match.frequency = network[2]; match.frequency = network[2];
match.ssid = network[3]; match.ssid = network[3];
match.bssid = network[4];
} else { } else {
rNetworks.push(apComp.createObject(root, { rNetworks.push(apComp.createObject(root, {
active: network[0], active: network[0],
strength: network[1], strength: network[1],
frequency: network[2], frequency: network[2],
ssid: network[3] ssid: network[3],
bssid: network[4]
})); }));
} }
} }
@ -57,6 +57,7 @@ Singleton {
component AccessPoint: QtObject { component AccessPoint: QtObject {
required property string ssid required property string ssid
required property string bssid
required property int strength required property int strength
required property int frequency required property int frequency
required property bool active required property bool active