Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Never let a feed's maximum system that is no version hide an update

Țugui Dragoșc15d1be00d03
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift b/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
index 0f4351dc..75c85d1a 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
@@ -63,7 +63,9 @@ enum Appcast {
if let minimum = item.minimumSystemVersion, VersionComparison.isNewer(minimum, than: systemVersion) {
return false
}
- if let maximum = item.maximumSystemVersion, VersionComparison.isNewer(systemVersion, than: maximum) {
+ // A maximum that is no version, such as a release's name, reads as zero and would hold back every Mac.
+ if let maximum = item.maximumSystemVersion, VersionComparison.isAVersion(maximum),
+ VersionComparison.isNewer(systemVersion, than: maximum) {
return false
}
if !isAppleSilicon, item.hardwareRequirements.contains("arm64") { return false }
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/VersionComparison.swift b/Packages/PeelCore/Sources/PeelCore/Updates/VersionComparison.swift
index 3641ef3e..8987a747 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/VersionComparison.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/VersionComparison.swift
@@ -1,6 +1,11 @@
import Foundation
enum VersionComparison {
+ /// True when `text` begins with a number, as a version does. A release's name, or anything else, is no version.
+ static func isAVersion(_ text: String) -> Bool {
+ !components(of: text).numbers.isEmpty
+ }
+
static func isNewer(_ candidate: String, than installed: String) -> Bool {
compare(candidate, installed) == .orderedDescending
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
index 7344b433..6367864e 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
@@ -177,6 +177,29 @@ struct AppcastTests {
#expect(item.displayVersion == "3.1")
}
+ @Test func readsTheSystemBoundsOfAnyMacOSAndIgnoresOnesItCannotRead() throws {
+ func offered(minimum: String? = nil, maximum: String? = nil, on system: String) -> Bool {
+ let bounds = [minimum.map { "<sparkle:minimumSystemVersion>\($0)</sparkle:minimumSystemVersion>" },
+ maximum.map { "<sparkle:maximumSystemVersion>\($0)</sparkle:maximumSystemVersion>" }]
+ let feed = """
+ <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"><channel>
+ <item><sparkle:version>2</sparkle:version>\(bounds.compactMap(\.self).joined())</item>
+ <item><sparkle:version>1</sparkle:version></item>
+ </channel></rss>
+ """
+ return latestItem(in: feed, systemVersion: system)?.version == "2"
+ }
+
+ #expect(!offered(minimum: "27", on: "26.7.1"))
+ #expect(offered(minimum: "27", on: "27.0"))
+ #expect(offered(minimum: "27.0", on: "28.0"))
+ #expect(offered(minimum: "28.2", on: "30.1"))
+ #expect(!offered(maximum: "27.9", on: "28.0"))
+ #expect(offered(maximum: "28", on: "28.0"))
+ #expect(offered(minimum: "Golden Gate", on: "26.7.1"))
+ #expect(offered(maximum: "Golden Gate", on: "28.0"))
+ }
+
@Test func skipsChannelsAndItemsForNewerSystems() throws {
let feed = """
<rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"><channel>