Merge branch 'package-designation-rewrite.improved-adoptables-name-matching'

# Conflicts:
#	Modules/Packages/PackagesModels/Logic/Package Loading/Get Outdated Packages.swift

Author: buresdv

Cork/ContentView.swift

@@ -660,7 +660,7 @@ private extension View
                             shouldRemoveAllAssociatedFiles: false
                         )
                     } label: {
-                        Text("action.uninstall-\(packageToUninstall.name)")
+                        Text("action.uninstall-\(packageToUninstall.name(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.name(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.name(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.name(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.name(withPrecision: .precise), type: .formula, installedIntentionally: package.installedIntentionally)
             }
 
             if getOnlyManuallyInstalledPackages

Cork/Logic/Discoverability/Load up Top Packages.swift

@@ -101,7 +101,7 @@ extension TopPackagesTracker
                     if normalizedDownloadNumber > downloadsCutoff
                     {
                         return .init(
-                            name: rawTopFormula.formula,
+                            rawName: rawTopFormula.formula,
                             type: .formula,
                             installedOn: nil,
                             versions: .init(),
@@ -165,7 +165,7 @@ extension TopPackagesTracker
                     if normalizedDownloadNumber > downloadsCutoff
                     {
                         return .init(
-                            name: rawTopCask.cask,
+                            rawName: rawTopCask.cask,
                             type: .cask,
                             installedOn: nil,
                             versions: .init(),

Cork/Logic/Maintenance/Steps/Delete Cached Downloads.swift

@@ -8,10 +8,11 @@
 import Foundation
 import CorkShared
 import CorkModels
+import Defaults
 
 func deleteCachedDownloads() throws(CachedDownloadDeletionError)
 {
-    let shouldStrictlyCheckForHomebrewErrors: Bool = UserDefaults.standard.bool(forKey: "strictlyCheckForHomebrewErrors")
+    let shouldStrictlyCheckForHomebrewErrors: Bool = Defaults[.strictlyCheckForHomebrewErrors]
 
     /// This folder has the symlinks, so we have do **delete ONLY THE SYMLINKS**
     do

Cork/Logic/Submit System Version.swift

@@ -8,6 +8,7 @@
 import AppKit
 import CorkShared
 import Foundation
+import Defaults
 
 func submitSystemVersion() async throws
 {

Cork/Logic/Updating and Upgrading/Refresh Packages.swift

@@ -10,11 +10,12 @@ import SwiftUI
 import CorkShared
 import CorkTerminalFunctions
 import CorkModels
+import Defaults
 
 @MainActor
 func refreshPackages(_ updateProgressTracker: UpdateProgressTracker, outdatedPackagesTracker: OutdatedPackagesTracker) async -> PackageUpdateAvailability
 {
-    let showRealTimeTerminalOutputs: Bool = UserDefaults.standard.bool(forKey: "showRealTimeTerminalOutputOfOperations")
+    let showRealTimeTerminalOutputs: Bool = Defaults[.showRealTimeTerminalOutputOfOperations]
 
     for await output in shell(AppConstants.shared.brewExecutablePath, ["update"])
     {

Cork/Logic/Updating and Upgrading/Update Packages.swift

@@ -9,12 +9,13 @@ import Foundation
 import SwiftUI
 import CorkShared
 import CorkTerminalFunctions
+import Defaults
 
 @MainActor
 func updatePackages(updateProgressTracker: UpdateProgressTracker, detailStage: UpdatingProcessDetails) async
 {
-    let showRealTimeTerminalOutputs: Bool = UserDefaults.standard.bool(forKey: "showRealTimeTerminalOutputOfOperations")
-    let includeGreedyPackages: Bool = UserDefaults.standard.bool(forKey: "includeGreedyOutdatedPackages")
+    let showRealTimeTerminalOutputs: Bool = Defaults[.showRealTimeTerminalOutputOfOperations]
+    let includeGreedyPackages: Bool = Defaults[.includeGreedyOutdatedPackages]
 
     for await output in shell(AppConstants.shared.brewExecutablePath, ["upgrade", includeGreedyPackages ? "--greedy" : ""])
     {

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

@@ -9,11 +9,24 @@ import Foundation
 import CorkShared
 import CorkModels
 import CorkTerminalFunctions
+import Defaults
 
 @Observable
 class InstallationProgressTracker
 {
-    var packageBeingInstalled: PackageInProgressOfBeingInstalled = .init(package: .init(name: "", type: .formula, installedOn: nil, versions: [], url: nil, sizeInBytes: 0, downloadCount: nil), installationStage: .downloadingCask, packageInstallationProgress: 0)
+    var packageBeingInstalled: PackageInProgressOfBeingInstalled = .init(
+        package: .init(
+            rawName: "",
+            type: .formula,
+            installedOn: nil,
+            versions: [],
+            url: nil,
+            sizeInBytes: 0,
+            downloadCount: nil
+        ),
+        installationStage: .downloadingCask,
+        packageInstallationProgress: 0
+    )
 
     var numberOfPackageDependencies: Int = 0
     var numberInLineOfPackageCurrentlyBeingFetched: Int = 0
@@ -23,7 +36,7 @@ class InstallationProgressTracker
 
     private var showRealTimeTerminalOutputs: Bool
     {
-        UserDefaults.standard.bool(forKey: "showRealTimeTerminalOutputOfOperations")
+        Defaults[.showRealTimeTerminalOutputOfOperations]
     }
 
     deinit
@@ -45,13 +58,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.name(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.name(withPrecision: .precise), privacy: .public) is Formula")
 
             let output: String = try await installFormula(using: brewPackagesTracker).joined(separator: "")
 
@@ -88,9 +101,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.name(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.name(withPrecision: .precise)])
         installationProcess = process
         for await output in stream
         {
@@ -110,7 +123,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.name(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 +139,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.name(withPrecision: .precise)) dependency")
                 {
                     AppConstants.shared.logger.info("Will install dependencies!")
                     packageBeingInstalled.installationStage = .installingDependencies
@@ -151,7 +164,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.name(withPrecision: .precise))") || outputLine.contains("Installing \(package.name(withPrecision: .precise))")
                 {
                     if hasAlreadyMatchedLineAboutInstallingPackageItself
                     { /// Only the second line about the package being installed is valid
@@ -205,9 +218,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.name(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.name(withPrecision: .precise)])
         installationProcess = process
         for await output in stream
         {
@@ -255,7 +268,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.name(withPrecision: .precise))")
 
                     packageBeingInstalled.installationStage = .installingCask