(+ Install ^ Uninstall) of versioned packages

Author: buresdv

Cork/Logic/Installation & Removal/Removal/Uninstall Packages.swift

@@ -37,16 +37,16 @@ extension BrewDataStorage
             }
         }
 
-        AppConstants.shared.logger.info("Will try to remove package \(package.name, privacy: .auto)")
+        AppConstants.shared.logger.info("Will try to remove package \(package.fullName, privacy: .auto)")
         var uninstallCommandOutput: TerminalOutput
 
         if !shouldRemoveAllAssociatedFiles
         {
-            uninstallCommandOutput = await shell(AppConstants.shared.brewExecutablePath, ["uninstall", package.name])
+            uninstallCommandOutput = await shell(AppConstants.shared.brewExecutablePath, ["uninstall", package.fullName])
         }
         else
         {
-            uninstallCommandOutput = await shell(AppConstants.shared.brewExecutablePath, ["uninstall", "--zap", package.name])
+            uninstallCommandOutput = await shell(AppConstants.shared.brewExecutablePath, ["uninstall", "--zap", package.fullName])
         }
 
         AppConstants.shared.logger.warning("Uninstall process Standard error: \(uninstallCommandOutput.standardError)")
@@ -116,7 +116,7 @@ extension BrewDataStorage
         AppConstants.shared.logger.info("Package uninstallation process output:\nStandard output: \(uninstallCommandOutput.standardOutput, privacy: .public)\nStandard error: \(uninstallCommandOutput.standardError, privacy: .public)")
 
         /// If the user removed a package that was outdated, remove it from the outdated package tracker
-        if let index = outdatedPackageTracker.displayableOutdatedPackages.firstIndex(where: { $0.package.name == package.name })
+        if let index = outdatedPackageTracker.displayableOutdatedPackages.firstIndex(where: { $0.package.name == package.fullName })
         {
             outdatedPackageTracker.outdatedPackages.remove(at: index)
         }

Cork/Models/Package Installation/Installation Progress Tracker.swift

@@ -5,36 +5,36 @@
 //  Created by David Bureš on 22.02.2023.
 //
 
-import Foundation
 import CorkShared
+import Foundation
 
 class InstallationProgressTracker: ObservableObject
 {
     @Published var installationStage: PackageInstallationStage = .downloadingCask
     @Published var installationProgress: Double = 0
-    
+
     @Published var realTimeTerminalOutput: [RealTimeTerminalLine] = .init()
-    
+
     @Published var numberOfPackageDependencies: Int = 0
     @Published var numberInLineOfPackageCurrentlyBeingFetched: Int = 0
     @Published var numberInLineOfPackageCurrentlyBeingInstalled: Int = 0
-    
+
     private var installationProcess: Process?
 
     private var showRealTimeTerminalOutputs: Bool
     {
         UserDefaults.standard.bool(forKey: "showRealTimeTerminalOutputOfOperations")
     }
-    
+
     deinit
     {
         cancel()
     }
-    
+
     @discardableResult
     func cancel() -> Bool
     {
-        guard let installationProcess else {return false}
+        guard let installationProcess else { return false }
         installationProcess.terminate()
         self.installationProcess = nil
         return true
@@ -87,7 +87,7 @@ class InstallationProgressTracker: ObservableObject
 
         AppConstants.shared.logger.info("Package \(packageToInstall.name, privacy: .public) is Formula")
 
-        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", packageToInstall.name])
+        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", packageToInstall.fullName])
         installationProcess = process
         for await output in stream
         {
@@ -107,7 +107,7 @@ class InstallationProgressTracker: ObservableObject
                 if outputLine.contains("Fetching dependencies")
                 {
                     // First, we have to get a list of all the dependencies
-                    var matchedDependencies: String = try outputLine.regexMatch("(?<=\(packageToInstall.name): ).*?(.*)")
+                    var matchedDependencies: String = try outputLine.regexMatch("(?<=\(packageToInstall.fullName): ).*?(.*)")
                     matchedDependencies = matchedDependencies.replacingOccurrences(of: " and", with: ",") // The last dependency is different, because it's preceded by "and" instead of "," so let's replace that "and" with "," so we can split it nicely
 
                     AppConstants.shared.logger.debug("Matched Dependencies: \(matchedDependencies, privacy: .auto)")
@@ -170,7 +170,7 @@ class InstallationProgressTracker: ObservableObject
 
                 installOutput.append(outputLine)
 
-                    AppConstants.shared.logger.debug("Current installation stage: \(self.installationStage.description, privacy: .public)")
+                AppConstants.shared.logger.debug("Current installation stage: \(self.installationStage.description, privacy: .public)")
 
             case .standardError(let errorLine):
                 AppConstants.shared.logger.error("Errored out: \(errorLine, privacy: .public)")
@@ -202,7 +202,7 @@ class InstallationProgressTracker: ObservableObject
         AppConstants.shared.logger.info("Package is Cask")
         AppConstants.shared.logger.debug("Installing package \(packageToInstall.name, privacy: .public)")
 
-        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", "--no-quarantine", packageToInstall.name])
+        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", "--no-quarantine", packageToInstall.fullName])
         installationProcess = process
         for await output in stream
         {
@@ -213,7 +213,7 @@ class InstallationProgressTracker: ObservableObject
 
                 if showRealTimeTerminalOutputs
                 {
-                   realTimeTerminalOutput.append(RealTimeTerminalLine(line: outputLine))
+                    realTimeTerminalOutput.append(RealTimeTerminalLine(line: outputLine))
                 }
 
                 if outputLine.contains("Downloading")

Cork/Models/Packages/Brew Package.swift

@@ -14,7 +14,20 @@ import CorkShared
 struct BrewPackage: Identifiable, Equatable, Hashable, Codable
 {    
     var id: UUID = .init()
+    /// Display name for the package. Excludes Homebrew version
     let name: String
+    
+    /// Internal Homebrew name for the package. Includes Homebrew version
+    var fullName: String {
+        if let sanitizedHomewbrewVersion = self.homebrewVersion
+        {
+            return "\(self.name)@\(sanitizedHomewbrewVersion)"
+        }
+        else
+        {
+            return self.name
+        }
+    }
 
     lazy var sanitizedName: String? = {
         var packageNameWithoutTap: String

Cork/Views/Installation/Sub-Views/Initial.swift

@@ -118,7 +118,7 @@ struct InstallationInitialView: View
     {
         Button
         {
-            guard let packageToInstall: BrewPackage = foundPackageSelection?.package else
+            guard let packageToInstall: BrewPackage = foundPackageSelection?.constructPackageOfRelevantVersion() else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to install")
 

Cork/Views/Installation/Sub-Views/Presenting Search Results.swift

@@ -161,7 +161,7 @@ struct PresentingSearchResultsView: View
         // This has to be an AsyncButton so it shakes
         AsyncButton
         {
-            guard let packageToInstall = foundPackageSelection?.package
+            guard let packageToInstall = foundPackageSelection?.constructPackageOfRelevantVersion()
             else
             {
                 throw PackageInstallationInitializationError.couldNotStartInstallProcessWithPackage(package: nil)