Merge branch 'release/0.10.3'

Author: mangerlahn

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Unreleased Changes
 
+# 0.10.3
+Fixes a crash that may occur after updating to 0.10.2.
+
 # 0.10.2
 This update fixes more issues with the Homebrew check introduced in a recent update. Thank you for your continued reports, [please keep them coming][1]!
 
@@ -35,7 +38,7 @@ This update fixes many issues with the Homebrew check introduced in the last upd
 # 0.10
 #### New and Improved:
 - Added update checking via Homebrew Cask, which should allow for many more updates to be found
-- The app list is now sorted by recently updated apps. Sort by app name can be restored via the main menu: View > Sort By > Name
+- The app list is now sorted by recently updated apps. Sort by app name can be restored via the main menu: View \> Sort By \> Name
 - Improved messages when no release notes are available
 - Interface improvements for macOS Sonoma
 

Latest.xcodeproj/project.pbxproj

@@ -1226,7 +1226,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.2;
+				MARKETING_VERSION = 0.10.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1260,7 +1260,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.10.2;
+				MARKETING_VERSION = 0.10.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.max-langer.Latest";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

Latest/Model/Update Repository/UpdateRepository.swift

@@ -57,48 +57,58 @@ class UpdateRepository {
 		}
 
 		/// Entries are still being fetched, add the request to the queue.
-		queue.async {
-			if self.entries == nil {
-				self.pendingRequests.append(checkApp)
+		queue.async { [weak self] in
+			guard let self else { return }
+			
+			if self.pendingRequests != nil {
+				self.pendingRequests?.append(checkApp)
 			} else {
 				checkApp()
 			}
 		}
 	}
 
 	/// List of entries stored within the repository.
-	private var entries: [Entry]?
+	private var entries: [Entry]!
 
 	/// A list of requests being performed while the repository was still fetching data.
-	private var pendingRequests: [() -> Void] = []
+	///
+	/// It also acts as a flag for whether initialization finished. The array is initialized when the repository is created. It will be set to nil once `finalize()` is being called.
+	private var pendingRequests: [() -> Void]? = []
 
 	/// A set of bundle identifiers for which update checking is currently not supported.
 	private var unsupportedBundleIdentifiers: Set<String>!
 
 	/// Sets the given entries and performs pending requests.
 	private func finalize() {
-		queue.async {
+		queue.async { [weak self] in
+			guard let self else { return }
+			guard let pendingRequests else {
+				fatalError("Finalize must only be called once!")
+			}
+			
 			// Perform any pending requests
-			self.pendingRequests.forEach { request in
+			pendingRequests.forEach { request in
 				request()
 			}
-			self.pendingRequests.removeAll()
+			
+			// Mark repository as loaded.
+			self.pendingRequests = nil
 		}
 	}
 
 	/// Returns a repository entry for the given name, if available.
 	private func entry(for bundle: App.Bundle) -> Entry? {
-		let name = bundle.fileURL.lastPathComponent
-
 		// Don't return an entry for unsupported apps
-		guard let entries, !unsupportedBundleIdentifiers.contains(bundle.bundleIdentifier) else { return nil }
+		guard !unsupportedBundleIdentifiers.contains(bundle.bundleIdentifier) else { return nil }
 
 		// Finding the correct entry is not trivial as there is no bundle identifier stored in an entry. We have a list of app names (could be ambiguous) and a list of bundle identifier guesses.
 		// However, both app names and bundle identifiers may occur in more than one entry:
 		// - App Names: Might occur multiple times for similar apps (Telegram.app for Desktop vs. Telegram.app for Mac)
 		// - Bundle Identifiers: Might occur multiple times for apps in bundles (com.microsoft.word in Word.app and Office bundle)
 		//
 		// Strategy: Find all entries that point to the given app name. If only one entry comes up, return that. Otherwise, try to match bundle identifiers to narrow it down.
+		let name = bundle.fileURL.lastPathComponent
 		var possibleEntries = entries.filter { entry in
 			return entry.names.contains { n in
 				return n.caseInsensitiveCompare(name) == .orderedSame

Latest/Model/Version/VersionParser.swift

@@ -20,6 +20,9 @@ enum VersionParser {
 		// Version Number / Build Number (1.2/1234)
 		.init(pattern: "(.*)/(.*)", components: [.buildNumber: 2]),
 
+		// Build number postfix (1.2 (r1234))
+		.init(pattern: ".* \\(r(.*)\\)", components: [.buildNumber: 1]),
+		
 		// Catch all
 		.init(pattern: ".*", components: [.buildNumber: 0])
 	]

Tests/VersionParserTest.swift

@@ -17,6 +17,7 @@ final class VersionParserTest: XCTestCase {
 		XCTAssertEqual(VersionParser.parse(buildNumber: "IU-1234"), "1234")
 		XCTAssertEqual(VersionParser.parse(buildNumber: "WS-1234"), "1234")
 		XCTAssertEqual(VersionParser.parse(buildNumber: "1.2/1234"), "1234")
+		XCTAssertEqual(VersionParser.parse(buildNumber: "1.2 (r1234)"), "1234")
 		XCTAssertEqual(VersionParser.parse(buildNumber: "ab-1234"), "ab-1234")
 	}