Simplify Outdated.run(…).

Resolve mas-cli#542 Signed-off-by: Ross Goldberg <[email protected]>
rgoldberg · Oct 14, 2024 · 0efd73a · 0efd73a
1 parent cd42176
commit 0efd73a
Showing 1 changed file with 28 additions and 32 deletions.
diff --git a/Sources/mas/Commands/Outdated.swift b/Sources/mas/Commands/Outdated.swift
@@ -29,40 +29,36 @@ extension Mas {
         }
 
         func run(appLibrary: AppLibrary, storeSearch: StoreSearch) throws {
-            let promises = appLibrary.installedApps.map { installedApp in
-                firstly {
-                    storeSearch.lookup(app: installedApp.itemIdentifier.intValue)
-                }.done { storeApp in
-                    guard let storeApp else {
-                        if verbose {
-                            printWarning(
-                                """
-                                Identifier \(installedApp.itemIdentifier) not found in store. \
-                                Was expected to identify \(installedApp.appName).
-                                """
-                            )
-                        }
-                        return
-                    }
+            _ = try when(
+                fulfilled:
+                    appLibrary.installedApps.map { installedApp in
+                        firstly {
+                            storeSearch.lookup(app: installedApp.itemIdentifier.intValue)
+                        }.done { storeApp in
+                            guard let storeApp else {
+                                if verbose {
+                                    printWarning(
+                                        """
+                                        Identifier \(installedApp.itemIdentifier) not found in store. \
+                                        Was expected to identify \(installedApp.appName).
+                                        """
+                                    )
+                                }
+                                return
+                            }
 
-                    if installedApp.isOutdatedWhenComparedTo(storeApp) {
-                        print(
-                            """
-                            \(installedApp.itemIdentifier) \(installedApp.appName) \
-                            (\(installedApp.bundleVersion) -> \(storeApp.version))
-                            """
-                        )
+                            if installedApp.isOutdatedWhenComparedTo(storeApp) {
+                                print(
+                                    """
+                                    \(installedApp.itemIdentifier) \(installedApp.appName) \
+                                    (\(installedApp.bundleVersion) -> \(storeApp.version))
+                                    """
+                                )
+                            }
+                        }
                     }
-                }
-            }
-
-            _ = firstly {
-                when(fulfilled: promises)
-            }.map {
-                Result<Void, MASError>.success(())
-            }.recover { error in
-                .value(Result<Void, MASError>.failure(error as? MASError ?? .searchFailed))
-            }.wait()
+            )
+            .wait()
         }
     }
 }