never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WiFi: auto formattings (removed es6 syntax for split to not break qmlfmt)

Browse source
This commit is contained in:
LemmyCook 2025-09-05 11:58:30 -04:00
parent de92c989f2
commit 0567da94dd
2 changed files with 114 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Modules/WiFiPanel/WiFiPanel.qml
View file

@ -139,7 +139,8 @@ NPanel {
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
visible: Settings.data.network.wifiEnabled && NetworkService.isLoading && Object.keys(NetworkService.networks).length === 0 visible: Settings.data.network.wifiEnabled && NetworkService.isLoading && Object.keys(
NetworkService.networks).length === 0
spacing: Style.marginM * scaling spacing: Style.marginM * scaling
NBusyIndicator { NBusyIndicator {
@ -193,15 +194,18 @@ NPanel {
// Network list // Network list
Repeater { Repeater {
model: { model: {
if (!Settings.data.network.wifiEnabled || NetworkService.isLoading) return [] if (!Settings.data.network.wifiEnabled || NetworkService.isLoading)
return []
// Sort networks: connected first, then by signal strength // Sort networks: connected first, then by signal strength
const nets = Object.values(NetworkService.networks) const nets = Object.values(NetworkService.networks)
return nets.sort((a, b) => { return nets.sort((a, b) => {
if (a.connected && !b.connected) return -1 if (a.connected && !b.connected)
if (!a.connected && b.connected) return 1 return -1
return b.signal - a.signal if (!a.connected && b.connected)
}) return 1
return b.signal - a.signal
})
} }
Item { Item {
@ -213,7 +217,8 @@ NPanel {
width: parent.width width: parent.width
implicitHeight: networkContent.implicitHeight + (Style.marginM * scaling * 2) implicitHeight: networkContent.implicitHeight + (Style.marginM * scaling * 2)
radius: Style.radiusM * scaling radius: Style.radiusM * scaling
color: modelData.connected ? Qt.rgba(Color.mPrimary.r, Color.mPrimary.g, Color.mPrimary.b, 0.05) : Color.mSurface color: modelData.connected ? Qt.rgba(Color.mPrimary.r, Color.mPrimary.g, Color.mPrimary.b,
0.05) : Color.mSurface
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)
border.color: modelData.connected ? Color.mPrimary : Color.mOutline border.color: modelData.connected ? Color.mPrimary : Color.mOutline
clip: true clip: true
@ -254,7 +259,8 @@ NPanel {
NText { NText {
text: { text: {
const security = modelData.security && modelData.security !== "--" ? modelData.security : "Open" const security = modelData.security
&& modelData.security !== "--" ? modelData.security : "Open"
const signal = `${modelData.signal}%` const signal = `${modelData.signal}%`
return `${signal} • ${security}` return `${signal} • ${security}`
} }
@ -333,7 +339,8 @@ NPanel {
visible: !modelData.connected && (expandedNetwork !== modelData.ssid || !showPasswordPrompt) visible: !modelData.connected && (expandedNetwork !== modelData.ssid || !showPasswordPrompt)
outlined: !hovered outlined: !hovered
fontSize: Style.fontSizeXS * scaling fontSize: Style.fontSizeXS * scaling
text: modelData.existing ? "Connect" : (NetworkService.isSecured(modelData.security) ? "Password" : "Connect") text: modelData.existing ? "Connect" : (NetworkService.isSecured(
modelData.security) ? "Password" : "Connect")
icon: "wifi" icon: "wifi"
onClicked: { onClicked: {
if (modelData.existing || !NetworkService.isSecured(modelData.security)) { if (modelData.existing || !NetworkService.isSecured(modelData.security)) {
@ -447,12 +454,15 @@ NPanel {
// Forget network option - appears when saved badge is clicked // Forget network option - appears when saved badge is clicked
RowLayout { RowLayout {
visible: (modelData.existing || modelData.cached) && expandedNetwork === modelData.ssid && !showPasswordPrompt visible: (modelData.existing || modelData.cached) && expandedNetwork === modelData.ssid
&& !showPasswordPrompt
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Style.marginXS * scaling Layout.topMargin: Style.marginXS * scaling
spacing: Style.marginS * scaling spacing: Style.marginS * scaling
Item { Layout.fillWidth: true } Item {
Layout.fillWidth: true
}
NButton { NButton {
id: forgetButton id: forgetButton
@ -478,7 +488,8 @@ NPanel {
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
visible: Settings.data.network.wifiEnabled && !NetworkService.isLoading && Object.keys(NetworkService.networks).length === 0 visible: Settings.data.network.wifiEnabled && !NetworkService.isLoading && Object.keys(
NetworkService.networks).length === 0
spacing: Style.marginM * scaling spacing: Style.marginM * scaling
NIcon { NIcon {
@ -506,4 +517,4 @@ NPanel {
} }
} }
} }
} }

159
Services/NetworkService.qml
View file

@ -18,7 +18,7 @@ Singleton {
property bool ethernet: false property bool ethernet: false
property int retryCount: 0 property int retryCount: 0
property int maxRetries: 3 property int maxRetries: 3
// File path for persistent storage // File path for persistent storage
property string cacheFile: Settings.cacheDir + "network.json" property string cacheFile: Settings.cacheDir + "network.json"
@ -38,7 +38,7 @@ Singleton {
autoConnectTimer.start() autoConnectTimer.start()
} }
} }
onLoadFailed: function(error) { onLoadFailed: function (error) {
Logger.log("Network", "No existing cache found, creating new one") Logger.log("Network", "No existing cache found, creating new one")
// Initialize with empty data // Initialize with empty data
adapter.knownNetworks = ({}) adapter.knownNetworks = ({})
@ -63,7 +63,7 @@ Singleton {
Component.onCompleted: { Component.onCompleted: {
Logger.log("Network", "Service started") Logger.log("Network", "Service started")
if (Settings.data.network.wifiEnabled) { if (Settings.data.network.wifiEnabled) {
refreshNetworks() refreshNetworks()
} }
@ -71,15 +71,23 @@ Singleton {
// Signal strength icon mapping // Signal strength icon mapping
function signalIcon(signal) { function signalIcon(signal) {
const levels = [ const levels = [{
{ threshold: 80, icon: "network_wifi" }, "threshold": 80,
{ threshold: 60, icon: "network_wifi_3_bar" }, "icon": "network_wifi"
{ threshold: 40, icon: "network_wifi_2_bar" }, }, {
{ threshold: 20, icon: "network_wifi_1_bar" } "threshold": 60,
] "icon": "network_wifi_3_bar"
}, {
"threshold": 40,
"icon": "network_wifi_2_bar"
}, {
"threshold": 20,
"icon": "network_wifi_1_bar"
}]
for (const level of levels) { for (const level of levels) {
if (signal >= level.threshold) return level.icon if (signal >= level.threshold)
return level.icon
} }
return "signal_wifi_0_bar" return "signal_wifi_0_bar"
} }
@ -90,8 +98,9 @@ Singleton {
// Enhanced refresh with retry logic // Enhanced refresh with retry logic
function refreshNetworks() { function refreshNetworks() {
if (isLoading) return if (isLoading)
return
isLoading = true isLoading = true
retryCount = 0 retryCount = 0
adapter.lastRefresh = Date.now() adapter.lastRefresh = Date.now()
@ -137,20 +146,20 @@ Singleton {
// Forget network function // Forget network function
function forgetNetwork(ssid) { function forgetNetwork(ssid) {
Logger.log("Network", `Forgetting network: ${ssid}`) Logger.log("Network", `Forgetting network: ${ssid}`)
// Remove from cache // Remove from cache
let known = adapter.knownNetworks let known = adapter.knownNetworks
delete known[ssid] delete known[ssid]
adapter.knownNetworks = known adapter.knownNetworks = known
// Clear last connected if it's this network // Clear last connected if it's this network
if (adapter.lastConnected === ssid) { if (adapter.lastConnected === ssid) {
adapter.lastConnected = "" adapter.lastConnected = ""
} }
// Save changes // Save changes
saveTimer.restart() saveTimer.restart()
// Remove NetworkManager profile // Remove NetworkManager profile
forgetProcess.ssid = ssid forgetProcess.ssid = ssid
forgetProcess.running = true forgetProcess.running = true
@ -161,14 +170,14 @@ Singleton {
property string ssid: "" property string ssid: ""
running: false running: false
command: ["nmcli", "connection", "delete", "id", ssid] command: ["nmcli", "connection", "delete", "id", ssid]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
Logger.log("Network", `Successfully forgot network: ${forgetProcess.ssid}`) Logger.log("Network", `Successfully forgot network: ${forgetProcess.ssid}`)
refreshNetworks() refreshNetworks()
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
if (text.includes("no such connection profile")) { if (text.includes("no such connection profile")) {
@ -197,7 +206,7 @@ Singleton {
break break
} }
} }
wifiRadioProcess.action = "off" wifiRadioProcess.action = "off"
wifiRadioProcess.running = true wifiRadioProcess.running = true
} }
@ -209,7 +218,7 @@ Singleton {
property string action: "on" property string action: "on"
running: false running: false
command: ["nmcli", "radio", "wifi", action] command: ["nmcli", "radio", "wifi", action]
onRunningChanged: { onRunningChanged: {
if (!running) { if (!running) {
if (action === "on") { if (action === "on") {
@ -220,7 +229,7 @@ Singleton {
} }
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
if (text.trim()) { if (text.trim()) {
@ -259,26 +268,26 @@ Singleton {
connectStatus = "" connectStatus = ""
connectStatusSsid = ssid connectStatusSsid = ssid
connectError = "" connectError = ""
// Check if profile exists // Check if profile exists
if (networks[ssid]?.existing) { if (networks[ssid]?.existing) {
connectToExisting(ssid) connectToExisting(ssid)
return return
} }
// Check cache for known network // Check cache for known network
const known = adapter.knownNetworks[ssid] const known = adapter.knownNetworks[ssid]
if (known?.profileName) { if (known?.profileName) {
connectToExisting(known.profileName) connectToExisting(known.profileName)
return return
} }
// New connection - need password for secured networks // New connection - need password for secured networks
if (isSecured(security)) { if (isSecured(security)) {
// Password will be provided through submitPassword // Password will be provided through submitPassword
return return
} }
// Open network - connect directly // Open network - connect directly
createAndConnect(ssid, "", security) createAndConnect(ssid, "", security)
} }
@ -296,7 +305,7 @@ Singleton {
function createAndConnect(ssid, password, security) { function createAndConnect(ssid, password, security) {
connectingSsid = ssid connectingSsid = ssid
connectProcess.ssid = ssid connectProcess.ssid = ssid
connectProcess.password = password connectProcess.password = password
connectProcess.isSecured = isSecured(security) connectProcess.isSecured = isSecured(security)
@ -315,7 +324,7 @@ Singleton {
property string password: "" property string password: ""
property bool isSecured: false property bool isSecured: false
running: false running: false
command: { command: {
const cmd = ["nmcli", "device", "wifi", "connect", ssid] const cmd = ["nmcli", "device", "wifi", "connect", ssid]
if (isSecured && password) { if (isSecured && password) {
@ -323,13 +332,13 @@ Singleton {
} }
return cmd return cmd
} }
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
handleConnectionSuccess(connectProcess.ssid) handleConnectionSuccess(connectProcess.ssid)
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
handleConnectionError(connectProcess.ssid, text) handleConnectionError(connectProcess.ssid, text)
@ -342,13 +351,13 @@ Singleton {
property string profileName: "" property string profileName: ""
running: false running: false
command: ["nmcli", "connection", "up", "id", profileName] command: ["nmcli", "connection", "up", "id", profileName]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
handleConnectionSuccess(upConnectionProcess.profileName) handleConnectionSuccess(upConnectionProcess.profileName)
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
handleConnectionError(upConnectionProcess.profileName, text) handleConnectionError(upConnectionProcess.profileName, text)
@ -361,7 +370,7 @@ Singleton {
property string ssid: "" property string ssid: ""
running: false running: false
command: ["nmcli", "connection", "down", "id", ssid] command: ["nmcli", "connection", "down", "id", ssid]
onRunningChanged: { onRunningChanged: {
if (!running) { if (!running) {
connectingSsid = "" connectingSsid = ""
@ -371,7 +380,7 @@ Singleton {
refreshNetworks() refreshNetworks()
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
if (text.trim()) { if (text.trim()) {
@ -387,18 +396,18 @@ Singleton {
connectStatus = "success" connectStatus = "success"
connectStatusSsid = ssid connectStatusSsid = ssid
connectError = "" connectError = ""
// Update cache // Update cache
let known = adapter.knownNetworks let known = adapter.knownNetworks
known[ssid] = { known[ssid] = {
profileName: ssid, "profileName": ssid,
lastConnected: Date.now(), "lastConnected": Date.now(),
autoConnect: true "autoConnect": true
} }
adapter.knownNetworks = known adapter.knownNetworks = known
adapter.lastConnected = ssid adapter.lastConnected = ssid
saveTimer.restart() saveTimer.restart()
Logger.log("Network", `Successfully connected to ${ssid}`) Logger.log("Network", `Successfully connected to ${ssid}`)
refreshNetworks() refreshNetworks()
} }
@ -408,7 +417,7 @@ Singleton {
connectStatus = "error" connectStatus = "error"
connectStatusSsid = ssid connectStatusSsid = ssid
connectError = parseError(error) connectError = parseError(error)
Logger.warn("Network", `Failed to connect to ${ssid}: ${error}`) Logger.warn("Network", `Failed to connect to ${ssid}: ${error}`)
} }
@ -435,24 +444,29 @@ Singleton {
id: existingNetworkProcess id: existingNetworkProcess
running: false running: false
command: ["nmcli", "-t", "-f", "NAME,TYPE", "connection", "show"] command: ["nmcli", "-t", "-f", "NAME,TYPE", "connection", "show"]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
const profiles = {} const profiles = {}
const lines = text.split("\n").filter(l => l.trim()) const lines = text.split("\n").filter(l => l.trim())
for (const line of lines) { for (const line of lines) {
const [name, type] = line.split(":") const parts = line.split(":")
const name = parts[0]
const type = parts[1]
if (name && type === "802-11-wireless") { if (name && type === "802-11-wireless") {
profiles[name] = { ssid: name, type: type } profiles[name] = {
"ssid": name,
"type": type
}
} }
} }
scanProcess.existingProfiles = profiles scanProcess.existingProfiles = profiles
scanProcess.running = true scanProcess.running = true
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
if (text.trim()) { if (text.trim()) {
@ -468,49 +482,54 @@ Singleton {
property var existingProfiles: ({}) property var existingProfiles: ({})
running: false running: false
command: ["nmcli", "-t", "-f", "SSID,SECURITY,SIGNAL,IN-USE", "device", "wifi", "list"] command: ["nmcli", "-t", "-f", "SSID,SECURITY,SIGNAL,IN-USE", "device", "wifi", "list"]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
const networksMap = {} const networksMap = {}
const lines = text.split("\n").filter(l => l.trim()) const lines = text.split("\n").filter(l => l.trim())
for (const line of lines) { for (const line of lines) {
const parts = line.split(":") const parts = line.split(":")
if (parts.length < 4) continue if (parts.length < 4)
continue
const [ssid, security, signalStr, inUse] = parts
if (!ssid) continue const ssid = parts[0]
const security = parts[1]
const signalStr = parts[2]
const inUse = parts[3]
if (!ssid)
continue
const signal = parseInt(signalStr) || 0 const signal = parseInt(signalStr) || 0
const connected = inUse === "*" const connected = inUse === "*"
// Update last connected if we find the connected network // Update last connected if we find the connected network
if (connected && adapter.lastConnected !== ssid) { if (connected && adapter.lastConnected !== ssid) {
adapter.lastConnected = ssid adapter.lastConnected = ssid
saveTimer.restart() saveTimer.restart()
} }
// Merge with existing or create new // Merge with existing or create new
if (!networksMap[ssid] || signal > networksMap[ssid].signal) { if (!networksMap[ssid] || signal > networksMap[ssid].signal) {
networksMap[ssid] = { networksMap[ssid] = {
ssid: ssid, "ssid": ssid,
security: security || "--", "security": security || "--",
signal: signal, "signal": signal,
connected: connected, "connected": connected,
existing: ssid in scanProcess.existingProfiles, "existing": ssid in scanProcess.existingProfiles,
cached: ssid in adapter.knownNetworks "cached": ssid in adapter.knownNetworks
} }
} }
} }
root.networks = networksMap root.networks = networksMap
root.isLoading = false root.isLoading = false
scanProcess.existingProfiles = {} scanProcess.existingProfiles = {}
Logger.log("Network", `Found ${Object.keys(networksMap).length} networks`) Logger.log("Network", `Found ${Object.keys(networksMap).length} networks`)
} }
} }
stderr: StdioCollector { stderr: StdioCollector {
onStreamFinished: { onStreamFinished: {
if (text.trim()) { if (text.trim()) {
@ -525,13 +544,13 @@ Singleton {
id: checkEthernet id: checkEthernet
running: false running: false
command: ["nmcli", "-t", "-f", "DEVICE,TYPE,STATE", "device"] command: ["nmcli", "-t", "-f", "DEVICE,TYPE,STATE", "device"]
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
root.ethernet = text.split("\n").some(line => { root.ethernet = text.split("\n").some(line => {
const parts = line.split(":") const parts = line.split(":")
return parts[1] === "ethernet" && parts[2] === "connected" return parts[1] === "ethernet" && parts[2] === "connected"
}) })
} }
} }
} }
@ -545,7 +564,7 @@ Singleton {
// Only refresh if we should // Only refresh if we should
const now = Date.now() const now = Date.now()
const timeSinceLastRefresh = now - adapter.lastRefresh const timeSinceLastRefresh = now - adapter.lastRefresh
// Refresh if: connected, or it's been more than 30 seconds // Refresh if: connected, or it's been more than 30 seconds
if (hasActiveConnection || timeSinceLastRefresh > 30000) { if (hasActiveConnection || timeSinceLastRefresh > 30000) {
refreshNetworks() refreshNetworks()
@ -569,4 +588,4 @@ Singleton {
connectStatus = "" connectStatus = ""
connectError = "" connectError = ""
} }
} }