morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: added a new way to obtain the WiFi network SSID (thanks to @fjh658)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2025-10-03 17:50:51 +02:00
parent f40b5dd12a
commit 6465d9ab58
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Net/readers.swift
View File

@@ -332,6 +332,10 @@ internal class UsageReader: Reader<Network_Usage>, CWEventDelegate {
guard self.usage.interface != nil else { return } guard self.usage.interface != nil else { return }
if self.usage.wifiDetails.ssid != nil && (self.usage.wifiDetails.ssid == "" || self.usage.wifiDetails.ssid == "<redacted>") {
self.usage.wifiDetails.ssid = nil
}
if self.usage.connectionType == .wifi && self.usage.wifiDetails.ssid == nil || self.usage.wifiDetails.ssid == "" { if self.usage.connectionType == .wifi && self.usage.wifiDetails.ssid == nil || self.usage.wifiDetails.ssid == "" {
self.getWiFiDetails() self.getWiFiDetails()
} }
@@ -341,6 +345,11 @@ internal class UsageReader: Reader<Network_Usage>, CWEventDelegate {
if let interface = CWWiFiClient.shared().interface(withName: self.interfaceID) { if let interface = CWWiFiClient.shared().interface(withName: self.interfaceID) {
if let ssid = interface.ssid() { if let ssid = interface.ssid() {
self.usage.wifiDetails.ssid = ssid self.usage.wifiDetails.ssid = ssid
} else if let cfg = interface.configuration(),
let set = (cfg.value(forKey: "networkProfiles") as? NSOrderedSet),
let first = set.firstObject as? CWNetworkProfile,
let raw = first.ssid, !raw.isEmpty {
self.usage.wifiDetails.ssid = raw.replacingOccurrences(of: "’", with: "'").replacingOccurrences(of: "‘", with: "'").trimmingCharacters(in: .whitespacesAndNewlines)
} }
if let bssid = interface.bssid() { if let bssid = interface.bssid() {
self.usage.wifiDetails.bssid = bssid self.usage.wifiDetails.bssid = bssid