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.

Count only an appcast's own items when checking for updates

Țugui Dragoșdb155ed2c555
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift b/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
index ddaab25f..e6c5c7b6 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/Appcast.swift
@@ -51,12 +51,13 @@ enum Appcast {
return releases.max(by: isOlder).map(Reading.latest) ?? .nothingForThisMac
}
- /// Every release in the feed that runs on `systemVersion`, in feed order. Nil for a feed that cannot be read.
+ /// Every release in the feed that runs on `systemVersion`, in feed order. Nil for a feed that cannot be read or
+ /// is no appcast: like Sparkle, only the items of `/rss/channel` count.
static func releases(in data: Data, systemVersion: String, isAppleSilicon: Bool) -> [AppcastItem]? {
let delegate = ParserDelegate()
let parser = XMLParser(data: data)
parser.delegate = delegate
- guard parser.parse() else { return nil }
+ guard parser.parse(), delegate.root == "rss" else { return nil }
return delegate.items.filter { item in
guard item.channel == nil, item.displayVersion != nil, item.system == nil || item.system == "macos" else {
@@ -109,6 +110,9 @@ enum Appcast {
private final class ParserDelegate: NSObject, XMLParserDelegate {
private(set) var items: [AppcastItem] = []
+ private(set) var root: String?
+ /// The elements open around the one being read, outermost first.
+ private var path: [String] = []
private var current: AppcastItem?
private var text = ""
/// The item's `sparkle:version` and `sparkle:shortVersionString` elements, kept apart until the item ends.
@@ -130,9 +134,11 @@ enum Appcast {
qualifiedName: String?,
attributes: [String: String] = [:]
) {
+ if path.isEmpty { root = elementName }
+ defer { path.append(elementName) }
text = ""
switch elementName {
- case "item":
+ case "item" where path == ["rss", "channel"]:
current = AppcastItem()
(elementVersion, elementShortVersion, notes, descriptions) = (nil, nil, [:], [])
case "sparkle:releaseNotesLink", "releaseNotesLink", "sparkle:fullReleaseNotesLink", "link":
@@ -167,9 +173,10 @@ enum Appcast {
namespaceURI: String?,
qualifiedName: String?
) {
+ path.removeLast()
let value = text.trimmingCharacters(in: .whitespacesAndNewlines)
switch elementName {
- case "item":
+ case "item" where path == ["rss", "channel"]:
if var item = current {
item.version = item.version ?? elementVersion
item.shortVersion = item.shortVersion ?? elementShortVersion
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
index c3ac3ccd..5f6f3e9d 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
@@ -256,6 +256,12 @@ private final class DroppedProtocol: URLProtocol, @unchecked Sendable {
reply("feed.example.com", "<html>Sign in to continue</html")
#expect(await checker.status(for: sparkleApp()) == .failed)
+
+ reply("feed.example.com", "<html><body><p>Sign in to continue</p></body></html>")
+ #expect(await checker.status(for: sparkleApp()) == .failed)
+
+ reply("feed.example.com", "<plist version=\"1.0\"><dict><key>SUFeedEntries</key><array><dict><key>SUFeedEntryShortVersionString</key><string>16.0.3</string></dict></array></dict></plist>")
+ #expect(await checker.status(for: sparkleApp()) == .failed)
}
/// A working feed whose every release needs a newer macOS is not a feed that is down. Counted as a failure,
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
index a67503c8..d56476e8 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
@@ -110,6 +110,17 @@ struct AppcastTests {
#expect(Appcast.read(Data("<rss><channel>".utf8), systemVersion: "26.7.0", isAppleSilicon: true) == .unreadable)
}
+ @Test func readsOnlyTheItemsSparkleReads() throws {
+ let feed = """
+ <rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"><channel>
+ <item><sparkle:version>300</sparkle:version></item>
+ <extra><item><sparkle:version>900</sparkle:version></item></extra>
+ </channel><item><sparkle:version>800</sparkle:version></item></rss>
+ """
+ #expect(try #require(latestItem(in: feed)).version == "300")
+ #expect(Appcast.read(Data("<plist><array/></plist>".utf8), systemVersion: "26.7.0", isAppleSilicon: true) == .unreadable)
+ }
+
/// Sparkle reads the version from the enclosure's attribute first, and from the element only when there is
/// none. An item's `<link>` is usually the product page, not the release notes.
@Test func followsSparklesOrderForVersionsAndNotes() throws {