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

feat: added flag emoji instead of country code in the popup view, and countryCode and flag options to the Text widget (#2916)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2026-02-23 19:26:00 +01:00
parent 3812657460
commit dec8f08749
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Kit/helpers.swift
View File

@@ -1848,3 +1848,10 @@ public func isWidgetActive(_ defaults: UserDefaults?, _ widgets: [String]) -> Bo
}
return false
}
public func countryFlag(_ code: String) -> String? {
let uppercased = code.uppercased()
guard uppercased.count == 2 else { return nil }
let scalars = uppercased.unicodeScalars.compactMap { UnicodeScalar(127397 + $0.value) }
return scalars.count == 2 ? String(String.UnicodeScalarView(scalars)) : nil
}

2
Modules/Net/main.swift
View File

@@ -275,6 +275,8 @@ public class Network: Module {
case "private": replacement = value.laddr.v4 ?? value.laddr.v6 ?? "-"
case "privateV4": replacement = value.laddr.v4 ?? "-"
case "privateV6": replacement = value.laddr.v6 ?? "-"
case "countryCode": replacement = value.raddr.countryCode ?? "-"
case "flag": replacement = value.raddr.countryCode != nil ? countryFlag(value.raddr.countryCode!) : "-"
default: return
}
case "$interface":

14
Modules/Net/popup.swift
View File

@@ -525,7 +525,12 @@ internal class Popup: PopupWrapper {
}
var ip = addr
if let cc = value.raddr.countryCode, !cc.isEmpty {
ip += " (\(cc))"
if let flag = countryFlag(cc) {
ip += " \(flag)"
} else {
ip += " (\(cc))"
}
self.publicIPv4Field?.toolTip = cc
}
if self.publicIPv4Field?.stringValue != ip {
self.publicIPv4Field?.stringValue = ip
@@ -545,7 +550,12 @@ internal class Popup: PopupWrapper {
}
var ip = addr
if let cc = value.raddr.countryCode {
ip += " (\(cc))"
if let flag = countryFlag(cc) {
ip += " \(flag)"
} else {
ip += " (\(cc))"
}
self.publicIPv6Field?.toolTip = cc
}
if self.publicIPv6Field?.stringValue != ip {
self.publicIPv6Field?.stringValue = ip

2
Modules/Net/settings.swift
View File

@@ -29,6 +29,8 @@ You can use a combination of any of the variables. There is only one limitation:
<li><b>$addr.private</b>: <small>Private/local IP address.</small></li>
<li><b>$addr.privateV4</b>: <small>Private/local IPv4 address.</small></li>
<li><b>$addr.privateV6</b>: <small>Private/local IPv6 address.</small></li>
<li><b>$addr.countryCode</b>: <small>Country code based on the public IP address.</small></li>
<li><b>$addr.flag</b>: <small>Emoji flag based on the country code.</small></li>
<li><b>$interface.displayName</b>: <small>Network interface name.</small></li>
<li><b>$interface.BSDName</b>: <small>BSD name of the network interface.</small></li>
<li><b>$interface.address</b>: <small>MAC address of the network interface.</small></li>

2
Stats.xcodeproj/project.pbxproj
View File

@@ -1717,7 +1717,7 @@
New,
);
LastSwiftUpdateCheck = 1540;
LastUpgradeCheck = 2610;
LastUpgradeCheck = 2620;
ORGANIZATIONNAME = "Serhiy Mytrovtsiy";
TargetAttributes = {
5C22299C29CCB3C400F00E69 = {