Merge pull request #975 from rgoldberg/974-cleanup

Swift cleanup

Author: rgoldberg

Sources/MAS/Commands/Open.swift

@@ -43,9 +43,11 @@ extension MAS {
 				return
 			}
 
-			try await openInMacAppStore(
-				pageForAppID: AppID(from: appIDString, forceBundleID: forceBundleIDOptionGroup.forceBundleID),
-				searcher: searcher
+			try await openMacAppStorePage(
+				forURLString: try await searcher.lookup(
+					appID: AppID(from: appIDString, forceBundleID: forceBundleIDOptionGroup.forceBundleID)
+				)
+				.trackViewUrl
 			)
 		}
 	}
@@ -62,8 +64,7 @@ private func openMacAppStore() async throws {
 	try await NSWorkspace.shared.openApplication(at: appURL, configuration: NSWorkspace.OpenConfiguration())
 }
 
-private func openInMacAppStore(pageForAppID appID: AppID, searcher: AppStoreSearcher) async throws {
-	let urlString = try await searcher.lookup(appID: appID).trackViewUrl
+private func openMacAppStorePage(forURLString urlString: String) async throws {
 	guard var urlComponents = URLComponents(string: urlString) else {
 		throw MASError.urlParsing(urlString)
 	}

Sources/MAS/Models/SearchResult.swift

@@ -19,14 +19,10 @@ struct SearchResult: Decodable {
 	var version = ""
 }
 
-extension SearchResult {
-	var adamID: ADAMID {
-		trackId
-	}
-
-	var outputPrice: String {
-		formattedPrice ?? "?"
-	}
+extension SearchResult: AppIdentifying {
+	var adamID: ADAMID { trackId }
+	var bundleID: String { bundleId }
+	var outputPrice: String { formattedPrice ?? "?" }
 }
 
 extension SearchResult: Hashable {

Tests/MASTests/Commands/InfoTests.swift

@@ -19,7 +19,7 @@ func cannotFindAppInfoForUnknownAppID() async {
 
 @Test
 func outputsAppInfo() async {
-	let mockResult = SearchResult(
+	let result = SearchResult(
 		currentVersionReleaseDate: "2019-01-07T18:53:13Z",
 		fileSizeBytes: "1024",
 		formattedPrice: "$2.00",
@@ -32,8 +32,8 @@ func outputsAppInfo() async {
 	)
 	#expect(
 		await consequencesOf(
-			try await MAS.Info.parse([String(mockResult.trackId)]).run(
-				searcher: MockAppStoreSearcher([.adamID(mockResult.adamID): mockResult])
+			try await MAS.Info.parse([String(result.trackId)]).run(
+				searcher: MockAppStoreSearcher([.adamID(result.adamID): result])
 			)
 		)
 		== UnvaluedConsequences( // swiftformat:disable indent

Tests/MASTests/Commands/OutdatedTests.swift

@@ -11,7 +11,7 @@ internal import Testing
 
 @Test
 func outputsOutdatedApps() async {
-	let mockSearchResult =
+	let result =
 		SearchResult(
 			bundleId: "au.haroldchu.mac.Bandwidth",
 			currentVersionReleaseDate: "2024-09-02T00:27:00Z",
@@ -30,14 +30,14 @@ func outputsOutdatedApps() async {
 			try await MAS.Outdated.parse([]).run(
 				installedApps: [
 					InstalledApp(
-						adamID: mockSearchResult.trackId,
-						bundleID: mockSearchResult.bundleId,
-						name: mockSearchResult.trackName,
+						adamID: result.trackId,
+						bundleID: result.bundleId,
+						name: result.trackName,
 						path: "/Applications/Bandwidth+.app",
 						version: "1.27"
 					),
 				],
-				searcher: MockAppStoreSearcher([.bundleID(mockSearchResult.bundleId): mockSearchResult])
+				searcher: MockAppStoreSearcher([.bundleID(result.bundleId): result])
 			)
 		)
 		== UnvaluedConsequences(nil, "490461369 Bandwidth+ (1.27 -> 1.28)\n") // swiftformat:disable:this indent

Tests/MASTests/Commands/SearchTests.swift

@@ -11,11 +11,11 @@ internal import Testing
 
 @Test
 func searchesForSlack() async {
-	let mockResult = SearchResult(trackId: 1111, trackName: "slack", trackViewUrl: "mas preview url", version: "0.0")
+	let result = SearchResult(trackId: 1111, trackName: "slack", trackViewUrl: "mas preview url", version: "0.0")
 	#expect(
 		await consequencesOf(
 			try await MAS.Search.parse(["slack"]).run(
-				searcher: MockAppStoreSearcher([.adamID(mockResult.adamID): mockResult])
+				searcher: MockAppStoreSearcher([.adamID(result.adamID): result])
 			)
 		)
 		== UnvaluedConsequences(nil, "1111  slack  (0.0)\n") // swiftformat:disable:this indent