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

feat: moved network country code from wifi adapter to IP address based (#2375)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2025-02-03 18:44:46 +01:00
parent 04993c1e6a
commit e3e149a255
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Net/main.swift
View File

@@ -30,6 +30,7 @@ public struct Network_interface: Codable {
public struct Network_addr: Codable {
var v4: String? = nil
var v6: String? = nil
var countryCode: String? = nil
}
public struct Network_wifi: Codable {

11
Modules/Net/popup.swift
View File

@@ -388,7 +388,11 @@ internal class Popup: PopupWrapper {
}
if let interface = value.interface {
self.interfaceField?.stringValue = "\(interface.displayName) (\(interface.BSDName))"
self.interfaceField?.stringValue = "\(interface.displayName) (\(interface.BSDName)"
if let cc = value.wifiDetails.countryCode {
self.interfaceField?.stringValue += ", \(cc)"
}
self.interfaceField?.stringValue += ")"
self.macAddressField?.stringValue = interface.address
} else {
self.interfaceField?.stringValue = localizedString("Unknown")
@@ -462,7 +466,10 @@ internal class Popup: PopupWrapper {
self.recalculateHeight()
}
if self.publicIPv4Field?.stringValue != addr {
self.publicIPv4Field?.stringValue = (value.wifiDetails.countryCode != nil) ? "\(addr) (\(value.wifiDetails.countryCode!))" : addr
self.publicIPv4Field?.stringValue = addr
if let cc = value.raddr.countryCode {
self.publicIPv4Field?.stringValue += " (\(cc))"
}
}
} else if view.superview != nil {
view.removeFromSuperview()

7
Modules/Net/readers.swift
View File

@@ -416,6 +416,7 @@ internal class UsageReader: Reader<Network_Usage>, CWEventDelegate {
struct Addr_s: Decodable {
let ipv4: String?
let ipv6: String?
let country: String?
}
DispatchQueue.global(qos: .userInitiated).async {
@@ -425,6 +426,9 @@ internal class UsageReader: Reader<Network_Usage>, CWEventDelegate {
if let ip = addr.ipv4, self.isIPv4(ip) {
self.usage.raddr.v4 = ip
}
if let countryCode = addr.country {
self.usage.raddr.countryCode = countryCode
}
}
}
DispatchQueue.global(qos: .userInitiated).async {
@@ -434,6 +438,9 @@ internal class UsageReader: Reader<Network_Usage>, CWEventDelegate {
if let ip = addr.ipv6, !self.isIPv4(ip) {
self.usage.raddr.v6 = ip
}
if let countryCode = addr.country {
self.usage.raddr.countryCode = countryCode
}
}
}
}