From cb744f8e99de802eab1ab38b00c4f80d07610ee1 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Thu, 13 Nov 2025 17:37:46 +0100 Subject: [PATCH] feat: unlocked widgets updates since the `chronod` was fixed in macOS 26.1 (#2733) --- .swiftlint.yml | 2 +- Kit/plugins/Charts.swift | 1 - Modules/CPU/main.swift | 10 ++++------ Modules/CPU/readers.swift | 6 +++--- Modules/Disk/main.swift | 10 ++++------ Modules/GPU/main.swift | 10 ++++------ Modules/Net/main.swift | 8 +++----- Modules/RAM/main.swift | 10 ++++------ 8 files changed, 23 insertions(+), 34 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index afd09fbc..ce3a13e0 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -5,7 +5,7 @@ disabled_rules: - trailing_whitespace - opening_brace - implicit_getter - - redundant_optional_initialization + - implicit_optional_initialization - large_tuple - function_body_length diff --git a/Kit/plugins/Charts.swift b/Kit/plugins/Charts.swift index 1ee0de3b..c0dfa782 100644 --- a/Kit/plugins/Charts.swift +++ b/Kit/plugins/Charts.swift @@ -852,7 +852,6 @@ public class BarChartView: NSView { let blocks: Int = 16 let spacing: CGFloat = 2 let count: CGFloat = CGFloat(values.count) - // swiftlint:disable:next empty_count guard count > 0, self.frame.width > 0, self.frame.height > 0 else { return } let partitionSize: CGSize = CGSize(width: (self.frame.width - (count*spacing)) / count, height: self.frame.height) diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift index 3d13ef64..3df16b76 100644 --- a/Modules/CPU/main.swift +++ b/Modules/CPU/main.swift @@ -234,12 +234,10 @@ public class CPU: Module { } if #available(macOS 11.0, *) { - if #unavailable(macOS 26.0) { - guard let blobData = try? JSONEncoder().encode(value) else { return } - self.userDefaults?.set(blobData, forKey: "CPU@LoadReader") - WidgetCenter.shared.reloadTimelines(ofKind: CPU_entry.kind) - WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") - } + guard let blobData = try? JSONEncoder().encode(value) else { return } + self.userDefaults?.set(blobData, forKey: "CPU@LoadReader") + WidgetCenter.shared.reloadTimelines(ofKind: CPU_entry.kind) + WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") } } } diff --git a/Modules/CPU/readers.swift b/Modules/CPU/readers.swift index e822fbca..6b803e2e 100644 --- a/Modules/CPU/readers.swift +++ b/Modules/CPU/readers.swift @@ -113,9 +113,9 @@ internal class LoadReader: Reader { let niceDiff = Double(cpuInfo!.cpu_ticks.3 - self.previousInfo.cpu_ticks.3) let totalTicks = sysDiff + userDiff + niceDiff + idleDiff - let system = sysDiff / totalTicks - let user = userDiff / totalTicks - let idle = idleDiff / totalTicks + let system = sysDiff / totalTicks + let user = userDiff / totalTicks + let idle = idleDiff / totalTicks if !system.isNaN { self.response.systemLoad = system diff --git a/Modules/Disk/main.swift b/Modules/Disk/main.swift index e8059a76..68209c3d 100644 --- a/Modules/Disk/main.swift +++ b/Modules/Disk/main.swift @@ -330,12 +330,10 @@ public class Disk: Module { } if #available(macOS 11.0, *) { - if #unavailable(macOS 26.0) { - guard let blobData = try? JSONEncoder().encode(d) else { return } - self.userDefaults?.set(blobData, forKey: "Disk@CapacityReader") - WidgetCenter.shared.reloadTimelines(ofKind: Disk_entry.kind) - WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") - } + guard let blobData = try? JSONEncoder().encode(d) else { return } + self.userDefaults?.set(blobData, forKey: "Disk@CapacityReader") + WidgetCenter.shared.reloadTimelines(ofKind: Disk_entry.kind) + WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") } } diff --git a/Modules/GPU/main.swift b/Modules/GPU/main.swift index e59f35ff..9cb099a9 100644 --- a/Modules/GPU/main.swift +++ b/Modules/GPU/main.swift @@ -192,12 +192,10 @@ public class GPU: Module { } if #available(macOS 11.0, *) { - if #unavailable(macOS 26.0) { - guard let blobData = try? JSONEncoder().encode(selectedGPU) else { return } - self.userDefaults?.set(blobData, forKey: "GPU@InfoReader") - WidgetCenter.shared.reloadTimelines(ofKind: GPU_entry.kind) - WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") - } + guard let blobData = try? JSONEncoder().encode(selectedGPU) else { return } + self.userDefaults?.set(blobData, forKey: "GPU@InfoReader") + WidgetCenter.shared.reloadTimelines(ofKind: GPU_entry.kind) + WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") } } } diff --git a/Modules/Net/main.swift b/Modules/Net/main.swift index 52b218d6..f3b16301 100644 --- a/Modules/Net/main.swift +++ b/Modules/Net/main.swift @@ -326,11 +326,9 @@ public class Network: Module { } if #available(macOS 11.0, *) { - if #unavailable(macOS 26.0) { - guard let blobData = try? JSONEncoder().encode(raw) else { return } - self.userDefaults?.set(blobData, forKey: "Network@UsageReader") - WidgetCenter.shared.reloadTimelines(ofKind: Network_entry.kind) - } + guard let blobData = try? JSONEncoder().encode(raw) else { return } + self.userDefaults?.set(blobData, forKey: "Network@UsageReader") + WidgetCenter.shared.reloadTimelines(ofKind: Network_entry.kind) } } diff --git a/Modules/RAM/main.swift b/Modules/RAM/main.swift index 291ce401..f5df70de 100644 --- a/Modules/RAM/main.swift +++ b/Modules/RAM/main.swift @@ -233,12 +233,10 @@ public class RAM: Module { } if #available(macOS 11.0, *) { - if #unavailable(macOS 26.0) { - guard let blobData = try? JSONEncoder().encode(value) else { return } - self.userDefaults?.set(blobData, forKey: "RAM@UsageReader") - WidgetCenter.shared.reloadTimelines(ofKind: RAM_entry.kind) - WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") - } + guard let blobData = try? JSONEncoder().encode(value) else { return } + self.userDefaults?.set(blobData, forKey: "RAM@UsageReader") + WidgetCenter.shared.reloadTimelines(ofKind: RAM_entry.kind) + WidgetCenter.shared.reloadTimelines(ofKind: "UnitedWidget") } } }