~ Internals of package names

Author: buresdv

Cork/ContentView.swift

@@ -660,7 +660,7 @@ private extension View
                             shouldRemoveAllAssociatedFiles: false
                         )
                     } label: {
-                        Text("action.uninstall-\(packageToUninstall.name)")
+                        Text("action.uninstall-\(packageToUninstall.getPackageName(withPrecision: .precise))")
                     }
                     .keyboardShortcut(.defaultAction)
                     .asyncButtonStyle(.plainStyle)
@@ -676,7 +676,7 @@ private extension View
                             shouldRemoveAllAssociatedFiles: true
                         )
                     } label: {
-                        Text("action.purge-\(packageToPurge.name)")
+                        Text("action.purge-\(packageToPurge.getPackageName(withPrecision: .precise))")
                     }
                 }
             }, message: { dialogType in

Cork/CorkApp.swift

@@ -706,7 +706,7 @@ struct CorkApp: App
                         let differentPackages: Set<OutdatedPackage> = await newOutdatedPackages.subtracting(outdatedPackagesTracker.allDisplayableOutdatedPackages)
                         AppConstants.shared.logger.debug("Changed packages: \(differentPackages, privacy: .auto)")
 
-                        sendNotification(title: String(localized: "notification.new-outdated-packages-found.title"), subtitle: differentPackages.map{$0.package.name}.formatted(.list(type: .and)))
+                        sendNotification(title: String(localized: "notification.new-outdated-packages-found.title"), subtitle: differentPackages.map{$0.package.getPackageName(withPrecision: .precise)}.formatted(.list(type: .and)))
 
                         await outdatedPackagesTracker.setOutdatedPackages(to: newOutdatedPackages)
 

Cork/Logic/App Intents/Currently Installed Packages/Get Installed Casks Intent.swift

@@ -49,7 +49,7 @@ public struct GetInstalledCasksIntent: AppIntent
 
             let minimalPackages: [MinimalHomebrewPackage] = validInstalledCasks.map
             { package in
-                .init(name: package.name, type: .cask, installDate: package.installedOn, installedIntentionally: true)
+                .init(name: package.getPackageName(withPrecision: .precise), type: .cask, installDate: package.installedOn, installedIntentionally: true)
             }
 
             return .result(value: minimalPackages)

Cork/Logic/App Intents/Currently Installed Packages/Get Installed Formulae Intent.swift

@@ -63,7 +63,7 @@ struct GetInstalledFormulaeIntent: AppIntent
 
             var minimalPackages: [MinimalHomebrewPackage] = validInstalledFormulae.map
             { package in
-                .init(name: package.name, type: .formula, installedIntentionally: package.installedIntentionally)
+                .init(name: package.getPackageName(withPrecision: .precise), type: .formula, installedIntentionally: package.installedIntentionally)
             }
 
             if getOnlyManuallyInstalledPackages

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

@@ -45,13 +45,13 @@ class InstallationProgressTracker
     {
         let package: BrewPackage = packageBeingInstalled.package
 
-        AppConstants.shared.logger.debug("Installing package \(package.name, privacy: .auto)")
+        AppConstants.shared.logger.debug("Installing package \(package.getPackageName(withPrecision: .precise), privacy: .auto)")
 
         var installationResult: TerminalOutput = .init(standardOutput: "", standardError: "")
 
         if package.type == .formula
         {
-            AppConstants.shared.logger.info("Package \(package.name, privacy: .public) is Formula")
+            AppConstants.shared.logger.info("Package \(package.getPackageName(withPrecision: .precise), privacy: .public) is Formula")
 
             let output: String = try await installFormula(using: brewPackagesTracker).joined(separator: "")
 
@@ -88,9 +88,9 @@ class InstallationProgressTracker
         var hasAlreadyMatchedLineAboutInstallingPackageItself: Bool = false
         var installOutput: [String] = .init()
 
-        AppConstants.shared.logger.info("Package \(package.name, privacy: .public) is Formula")
+        AppConstants.shared.logger.info("Package \(package.getPackageName(withPrecision: .precise), privacy: .public) is Formula")
 
-        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", package.name])
+        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", package.getPackageName(withPrecision: .precise)])
         installationProcess = process
         for await output in stream
         {
@@ -110,7 +110,7 @@ class InstallationProgressTracker
                 if outputLine.contains("Fetching dependencies")
                 {
                     // First, we have to get a list of all the dependencies
-                    var matchedDependencies: String = try outputLine.regexMatch("(?<=\(package.name): ).*?(.*)")
+                    var matchedDependencies: String = try outputLine.regexMatch("(?<=\(package.getPackageName(withPrecision: .precise)): ).*?(.*)")
                     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)")
@@ -126,7 +126,7 @@ class InstallationProgressTracker
                     packageBeingInstalled.packageInstallationProgress = 1
                 }
 
-                else if outputLine.contains("Installing dependencies") || outputLine.contains("Installing \(package.name) dependency")
+                else if outputLine.contains("Installing dependencies") || outputLine.contains("Installing \(package.getPackageName(withPrecision: .precise)) dependency")
                 {
                     AppConstants.shared.logger.info("Will install dependencies!")
                     packageBeingInstalled.installationStage = .installingDependencies
@@ -151,7 +151,7 @@ class InstallationProgressTracker
                     packageBeingInstalled.packageInstallationProgress = packageBeingInstalled.packageInstallationProgress + Double(Double(10) / (Double(3) * (Double(numberOfPackageDependencies) * Double(5))))
                 }
 
-                else if outputLine.contains("Fetching \(package.name)") || outputLine.contains("Installing \(package.name)")
+                else if outputLine.contains("Fetching \(package.getPackageName(withPrecision: .precise))") || outputLine.contains("Installing \(package.getPackageName(withPrecision: .precise))")
                 {
                     if hasAlreadyMatchedLineAboutInstallingPackageItself
                     { /// Only the second line about the package being installed is valid
@@ -205,9 +205,9 @@ class InstallationProgressTracker
         let package: BrewPackage = packageBeingInstalled.package
 
         AppConstants.shared.logger.info("Package is Cask")
-        AppConstants.shared.logger.debug("Installing package \(package.name, privacy: .public)")
+        AppConstants.shared.logger.debug("Installing package \(package.getPackageName(withPrecision: .precise), privacy: .public)")
 
-        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", package.name])
+        let (stream, process): (AsyncStream<StreamedTerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", package.getPackageName(withPrecision: .precise)])
         installationProcess = process
         for await output in stream
         {
@@ -255,7 +255,7 @@ class InstallationProgressTracker
                 }
                 else if outputLine.contains("Purging files")
                 {
-                    AppConstants.shared.logger.info("Purging old version of cask \(package.name)")
+                    AppConstants.shared.logger.info("Purging old version of cask \(package.getPackageName(withPrecision: .precise))")
 
                     packageBeingInstalled.installationStage = .installingCask
 

Cork/Views/Installation/Reusables/Search Result Row.swift

@@ -49,14 +49,14 @@ struct SearchResultRow: View, Sendable
                 case .searchResults:
                     if searchedForPackage.type == .formula
                     {
-                        if brewPackagesTracker.successfullyLoadedFormulae.contains(where: { $0.name == searchedForPackage.name })
+                        if brewPackagesTracker.successfullyLoadedFormulae.contains(where: { $0.getCompletePackageName() == searchedForPackage.getCompletePackageName() })
                         {
                             PillTextWithLocalizableText(localizedText: "add-package.result.already-installed")
                         }
                     }
                     else
                     {
-                        if brewPackagesTracker.successfullyLoadedCasks.contains(where: { $0.name == searchedForPackage.name })
+                        if brewPackagesTracker.successfullyLoadedCasks.contains(where: { $0.getCompletePackageName() == searchedForPackage.getCompletePackageName() })
                         {
                             PillTextWithLocalizableText(localizedText: "add-package.result.already-installed")
                         }
@@ -114,7 +114,7 @@ struct SearchResultRow: View, Sendable
         {
             if showDescriptionsInSearchResults
             {
-                AppConstants.shared.logger.info("\(searchedForPackage.name, privacy: .auto) came into view")
+                AppConstants.shared.logger.info("\(searchedForPackage.getPackageName(withPrecision: .precise), privacy: .auto) came into view")
 
                 if description == nil
                 {
@@ -123,11 +123,11 @@ struct SearchResultRow: View, Sendable
                         isLoadingDescription = false
                     }
 
-                    AppConstants.shared.logger.info("\(searchedForPackage.name, privacy: .auto) does not have its description loaded")
+                    AppConstants.shared.logger.info("\(searchedForPackage.getPackageName(withPrecision: .precise), privacy: .auto) does not have its description loaded")
 
                     do
                     {
-                        let searchedForPackage: BrewPackage = .init(name: searchedForPackage.name, type: searchedForPackage.type, installedOn: Date(), versions: [], url: nil, sizeInBytes: nil, downloadCount: nil)
+                        let searchedForPackage: BrewPackage = .init(name: searchedForPackage.getPackageName(withPrecision: .precise), type: searchedForPackage.type, installedOn: Date(), versions: [], url: nil, sizeInBytes: nil, downloadCount: nil)
 
                         do
                         {
@@ -147,7 +147,7 @@ struct SearchResultRow: View, Sendable
                 }
                 else
                 {
-                    AppConstants.shared.logger.info("\(searchedForPackage.name, privacy: .auto) already has its description loaded")
+                    AppConstants.shared.logger.info("\(searchedForPackage.getPackageName(withPrecision: .precise), privacy: .auto) already has its description loaded")
                 }
             }
         }

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

@@ -111,7 +111,7 @@ struct InstallationInitialView: View
             }
 
             openWindow(value: MinimalHomebrewPackage(
-                name: packageToPreview.name,
+                name: packageToPreview.getPackageName(withPrecision: .precise),
                 type: packageToPreview.type,
                 installedIntentionally: packageToPreview.installedIntentionally
             ))
@@ -134,7 +134,7 @@ struct InstallationInitialView: View
 
             installationProgressTracker.packageBeingInstalled = PackageInProgressOfBeingInstalled(package: packageToInstall, installationStage: .ready, packageInstallationProgress: 0)
 
-            AppConstants.shared.logger.debug("Packages to install: \(installationProgressTracker.packageBeingInstalled.package.name, privacy: .public)")
+            AppConstants.shared.logger.debug("Packages to install: \(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise), privacy: .public)")
 
             packageInstallationProcessStep = .installing
 

Cork/Views/Installation/Sub-Views/Initial/Top Packages Section.swift

@@ -25,12 +25,12 @@ struct TopPackagesSection: View
         case .formula:
             packageTracker.sortedTopFormulae.filter
             {
-                !brewPackagesTracker.successfullyLoadedFormulae.map(\.name).contains($0.name)
+                !brewPackagesTracker.successfullyLoadedFormulae.map{$0.getCompletePackageName()}.contains($0.getCompletePackageName())
             }
         case .cask:
             packageTracker.sortedTopCasks.filter
             {
-                !brewPackagesTracker.successfullyLoadedCasks.map(\.name).contains($0.name)
+                !brewPackagesTracker.successfullyLoadedCasks.map{$0.getCompletePackageName()}.contains($0.getCompletePackageName())
             }
         }
     }

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

@@ -58,19 +58,19 @@ struct InstallingPackageView: View
 
                         // CASKS
                         case .downloadingCask:
-                            Text("add-package.install.downloading-cask-\(installationProgressTracker.packageBeingInstalled.package.name)")
+                            Text("add-package.install.downloading-cask-\(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise))")
 
                         case .installingCask:
-                            Text("add-package.install.installing-cask-\(installationProgressTracker.packageBeingInstalled.package.name)")
+                            Text("add-package.install.installing-cask-\(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise))")
 
                         case .linkingCaskBinary:
                             Text("add-package.install.linking-cask-binary")
 
                         case .movingCask:
-                            Text("add-package.install.moving-cask-\(installationProgressTracker.packageBeingInstalled.package.name)")
+                            Text("add-package.install.moving-cask-\(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise))")
 
                         case .requiresSudoPassword:
-                            Text("add-package.install.requires-sudo-password-\(installationProgressTracker.packageBeingInstalled.package.name)")
+                            Text("add-package.install.requires-sudo-password-\(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise))")
                                 .onAppear
                                 {
                                     packageInstallationProcessStep = .requiresSudoPassword
@@ -84,7 +84,7 @@ struct InstallingPackageView: View
                                 }
 
                         case .binaryAlreadyExists:
-                            Text("add-package.install.binary-already-exists-\(installationProgressTracker.packageBeingInstalled.package.name)")
+                            Text("add-package.install.binary-already-exists-\(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise))")
                                 .onAppear
                                 {
                                     packageInstallationProcessStep = .binaryAlreadyExists

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

@@ -122,12 +122,12 @@ struct PresentingSearchResultsView: View
                 return
             }
             openWindow(value: MinimalHomebrewPackage(
-                name: selectedPackage.name,
+                name: selectedPackage.getPackageName(withPrecision: .precise),
                 type: selectedPackage.type,
                 installedIntentionally: selectedPackage.installedIntentionally
             ))
 
-            AppConstants.shared.logger.debug("Would preview package \(selectedPackage.name)")
+            AppConstants.shared.logger.debug("Would preview package \(selectedPackage.getPackageName(withPrecision: .precise))")
         }
         .disabled(foundPackageSelection == nil)
         .labelStyle(.titleOnly)
@@ -179,7 +179,7 @@ struct PresentingSearchResultsView: View
             installationProgressTracker.packageBeingInstalled = PackageInProgressOfBeingInstalled(package: foundPackageSelection, installationStage: .ready, packageInstallationProgress: 0)
 
             #if DEBUG
-                AppConstants.shared.logger.info("Packages to install: \(installationProgressTracker.packageBeingInstalled.package.name, privacy: .public)")
+                AppConstants.shared.logger.info("Packages to install: \(installationProgressTracker.packageBeingInstalled.package.getPackageName(withPrecision: .precise), privacy: .public)")
             #endif
         }
     }