Refactor AppLibrary.installedApp(…) as AppLibrary.installedApps(…)

because multiple installed apps can have the same app ID or app name.

Partial #313

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

Sources/mas/Commands/Install.swift

@@ -29,8 +29,8 @@ extension Mas {
         func run(appLibrary: AppLibrary) throws {
             // Try to download applications with given identifiers and collect results
             let appIDs = appIDs.filter { appID in
-                if let product = appLibrary.installedApp(withAppID: appID), !force {
+                if let appName = appLibrary.installedApps(withAppID: appID).first?.appName, !force {
-                    printWarning("\(product.appName) is already installed")
+                    printWarning("\(appName) is already installed")
                     return false
                 }
 

Sources/mas/Commands/Lucky.swift

@@ -58,8 +58,8 @@ extension Mas {
         /// - Throws: Any error that occurs while attempting to install the app.
         private func install(appID: AppID, appLibrary: AppLibrary) throws {
             // Try to download applications with given identifiers and collect results
-            if let product = appLibrary.installedApp(withAppID: appID), !force {
+            if let appName = appLibrary.installedApps(withAppID: appID).first?.appName, !force {
-                printWarning("\(product.appName) is already installed")
+                printWarning("\(appName) is already installed")
             } else {
                 do {
                     try downloadAll([appID]).wait()

Sources/mas/Commands/Purchase.swift

@@ -26,8 +26,8 @@ extension Mas {
         func run(appLibrary: AppLibrary) throws {
             // Try to download applications with given identifiers and collect results
             let appIDs = appIDs.filter { appID in
-                if let product = appLibrary.installedApp(withAppID: appID) {
+                if let appName = appLibrary.installedApps(withAppID: appID).first?.appName {
-                    printWarning("\(product.appName) has already been purchased.")
+                    printWarning("\(appName) has already been purchased.")
                     return false
                 }
 

Sources/mas/Commands/Uninstall.swift

@@ -7,8 +7,7 @@
 //
 
 import ArgumentParser
-import CommerceKit
+import Foundation
-import StoreFoundation
 
 extension Mas {
     /// Command which uninstalls apps managed by the Mac App Store.
@@ -29,16 +28,21 @@ extension Mas {
         }
 
         func run(appLibrary: AppLibrary) throws {
-            guard let product = appLibrary.installedApp(withAppID: appID) else {
+            let installedApps = appLibrary.installedApps(withAppID: appID)
+            guard !installedApps.isEmpty else {
                 throw MASError.notInstalled
             }
 
             if dryRun {
-                printInfo("\(product.appName) \(product.bundlePath)")
+                for installedApp in installedApps {
+                    printInfo("\(installedApp.appName) \(installedApp.bundlePath)")
+                }
                 printInfo("(not removed, dry run)")
             } else {
                 do {
-                    try appLibrary.uninstallApp(app: product)
+                    for installedApp in installedApps {
+                        try appLibrary.uninstallApp(app: installedApp)
+                    }
                 } catch {
                     throw MASError.uninstallFailed
                 }

Sources/mas/Commands/Upgrade.swift

@@ -58,14 +58,14 @@ extension Mas {
             let apps =
                 appIDs.isEmpty
                 ? appLibrary.installedApps
-                : appIDs.compactMap { appID in
+                : appIDs.flatMap { appID in
                     if let appID = AppID(appID) {
-                        // argument is an AppID, lookup app by id using argument
+                        // argument is an AppID, lookup apps by id using argument
-                        return appLibrary.installedApp(withAppID: appID)
+                        return appLibrary.installedApps(withAppID: appID)
                     }
 
-                    // argument is not an AppID, lookup app by name using argument
+                    // argument is not an AppID, lookup apps by name using argument
-                    return appLibrary.installedApp(named: appID)
+                    return appLibrary.installedApps(named: appID)
                 }
 
             let promises = apps.map { installedApp in

Sources/mas/Controllers/AppLibrary.swift

@@ -22,20 +22,20 @@ protocol AppLibrary {
 
 /// Common logic
 extension AppLibrary {
-    /// Finds an app for appID.
+    /// Finds all installed instances of apps whose app ID is `appID`.
     ///
-    /// - Parameter appID: app ID for app.
+    /// - Parameter appID: app ID for app(s).
-    /// - Returns: SoftwareProduct of app if found; nil otherwise.
+    /// - Returns: [SoftwareProduct] of matching apps.
-    func installedApp(withAppID appID: AppID) -> SoftwareProduct? {
+    func installedApps(withAppID appID: AppID) -> [SoftwareProduct] {
         let appID = NSNumber(value: appID)
-        return installedApps.first { $0.itemIdentifier == appID }
+        return installedApps.filter { $0.itemIdentifier == appID }
     }
 
-    /// Finds an app by name.
+    /// Finds all installed instances of apps whose name is `appName`.
     ///
-    /// - Parameter appName: Full title of an app.
+    /// - Parameter appName: Full name of app(s).
-    /// - Returns: Software Product of app if found; nil otherwise.
+    /// - Returns: [SoftwareProduct] of matching apps.
-    func installedApp(named appName: String) -> SoftwareProduct? {
+    func installedApps(named appName: String) -> [SoftwareProduct] {
-        installedApps.first { $0.appName == appName }
+        installedApps.filter { $0.appName == appName }
     }
 }