~ More work on the install process

Author: buresdv

Cork/Localizable.xcstrings

@@ -17430,6 +17430,10 @@
         }
       }
     },
+    "add-package.top-packages.list-item-%@" : {
+      "comment" : "A label that shows the number of downloads for a package. The argument is the number of downloads.",
+      "isCommentAutoGenerated" : true
+    },
     "add-package.top-packages.list-item-%lld" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -27650,6 +27654,10 @@
     },
     "cleaningUp" : {
 
+    },
+    "DEBUG: Hello" : {
+      "comment" : "A description of the download count of a package.",
+      "isCommentAutoGenerated" : true
     },
     "DEBUG: Log packages to be adopted" : {
       "localizations" : {

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

@@ -68,7 +68,7 @@ struct GetInstalledFormulaeIntent: AppIntent
 
             if getOnlyManuallyInstalledPackages
             {
-                minimalPackages = minimalPackages.filter({ $0.installedIntentionally })
+                minimalPackages = minimalPackages.filter({ $0.installedIntentionally ?? false })
             }
 
             return .result(value: minimalPackages)

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

@@ -17,50 +17,58 @@ struct SearchResultRow: View, Sendable
 
     @Environment(BrewPackagesTracker.self) var brewPackagesTracker: BrewPackagesTracker
     @Environment(TopPackagesTracker.self) var topPackagesTracker: TopPackagesTracker
-
-    let searchedForPackage: MinimalHomebrewPackage
+    
     let context: Self.Context
 
     @State private var description: String?
     @State private var isCompatible: Bool?
 
     @State private var isLoadingDescription: Bool = true
     @State private var descriptionParsingFailed: Bool = false
+    
+    /// Get the relevant package from the context
+    var relevantPackage: MinimalHomebrewPackage
+    {
+        switch self.context
+        {
+        case .topPackage(let package, _):
+            return package
+        case .searchResult(let searchedForPackage):
+            return searchedForPackage
+        }
+    }
 
     var body: some View
     {
         VStack(alignment: .leading)
         {
             HStack(alignment: .center)
             {
-                searchedForPackage.nameView(withComponents: .boundVersion)
+                relevantPackage.nameView(withComponents: .boundVersion)
 
                 switch context
                 {
-                case .topPackages:
+                case .topPackage(_, let downloadCount):
                     Spacer()
 
-                    // TODO: Reimplement download counts
-                    /*
-                    if let downloadCount = searchedForPackage.downloadCount
+                    if let downloadCount
                     {
                         Text("add-package.top-packages.list-item-\(downloadCount)")
                             .foregroundStyle(.secondary)
                             .font(.caption)
                     }
-                     */
-                    
-                case .searchResults:
-                    if searchedForPackage.type == .formula
+                                        
+                case .searchResult(let package):
+                    if package.type == .formula
                     {
-                        if brewPackagesTracker.successfullyLoadedFormulae.contains(where: { $0.getCompletePackageName() == searchedForPackage.internalName })
+                        if brewPackagesTracker.successfullyLoadedFormulae.contains(where: { $0.getCompletePackageName() == package.internalName })
                         {
                             PillTextWithLocalizableText(localizedText: "add-package.result.already-installed")
                         }
                     }
                     else
                     {
-                        if brewPackagesTracker.successfullyLoadedCasks.contains(where: { $0.getCompletePackageName() == searchedForPackage.internalName })
+                        if brewPackagesTracker.successfullyLoadedCasks.contains(where: { $0.getCompletePackageName() == package.internalName })
                         {
                             PillTextWithLocalizableText(localizedText: "add-package.result.already-installed")
                         }
@@ -113,12 +121,12 @@ struct SearchResultRow: View, Sendable
                 }
             }
         }
-        .tag(searchedForPackage)
+        .tag(relevantPackage)
         .task
         {
             if showDescriptionsInSearchResults
             {
-                AppConstants.shared.logger.info("\(searchedForPackage.name(withPrecision: .precise), privacy: .auto) came into view")
+                AppConstants.shared.logger.info("\(relevantPackage.name(withPrecision: .precise), privacy: .auto) came into view")
 
                 if description == nil
                 {
@@ -127,11 +135,11 @@ struct SearchResultRow: View, Sendable
                         isLoadingDescription = false
                     }
 
-                    AppConstants.shared.logger.info("\(searchedForPackage.name(withPrecision: .precise), privacy: .auto) does not have its description loaded")
+                    AppConstants.shared.logger.info("\(relevantPackage.name(withPrecision: .precise), privacy: .auto) does not have its description loaded")
 
                     do
                     {
-                        guard let searchedForPackageConvertedForDetailLoading: BrewPackage = .init(using: searchedForPackage) else
+                        guard let searchedForPackageConvertedForDetailLoading: BrewPackage = .init(using: relevantPackage) else
                         {
                             AppConstants.shared.logger.error("Failed to convert minimal package to actual package")
 
@@ -156,14 +164,17 @@ struct SearchResultRow: View, Sendable
                 }
                 else
                 {
-                    AppConstants.shared.logger.info("\(searchedForPackage.name(withPrecision: .precise), privacy: .auto) already has its description loaded")
+                    AppConstants.shared.logger.info("\(relevantPackage.name(withPrecision: .precise), privacy: .auto) already has its description loaded")
                 }
             }
         }
     }
 
     enum Context {
-        case searchResults
-        case topPackages
+        case searchResult(searchedForPackage: MinimalHomebrewPackage)
+        case topPackage(
+            package: MinimalHomebrewPackage,
+            downloadCount: Int?
+        )
     }
 }

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

@@ -48,7 +48,7 @@ struct TopPackagesSection: View
 
                     let convertedPackage: MinimalHomebrewPackage = .init(fromFullPackage: topPackage)
 
-                    SearchResultRow(searchedForPackage: convertedPackage, context: .topPackages)
+                    SearchResultRow(context: .topPackage(package: convertedPackage, downloadCount: topPackage.downloadCount))
                 }
             }
         } header: {

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

@@ -26,46 +26,53 @@ struct InstallingPackageView: View
 
     @State var isShowingRealTimeOutput: Bool = false
 
-    @State private var installationProgressTracker: InstallationProgressTracker?
+    @State private var installationProgressTracker: InstallationProgressTracker
+
+        init(packageToInstall: MinimalHomebrewPackage)
+        {
+            self.packageToInstall = packageToInstall
+            self._installationProgressTracker = State(
+                initialValue: InstallationProgressTracker(packageToInstall: packageToInstall)
+            )
+        }
 
     var body: some View
     {
         VStack(alignment: .leading)
         {
-            if let installationProgressTracker
+            ProgressView(installationProgressTracker.installProgress)
+            
+            switch installationProgressTracker.installStage
             {
-                ProgressView(installationProgressTracker.installProgress)
-                
-                switch installationProgressTracker.installStage
-                {
-                case .formula(let standardCases):
-                    Text(standardCases.stageDescription)
-                case .cask(let standardCases):
-                    standardCases.view([packageToInstall])
-                }
-                
-                installationProgressTracker.streamedOutputsDisplay
+            case .formula(let standardCases):
+                Text(standardCases.stageDescription)
+            case .cask(let standardCases):
+                standardCases.view([packageToInstall])
             }
+            
+            installationProgressTracker.streamedOutputsDisplay
         }
         .task
         {
-            installationProgressTracker = .init(packageToInstall: packageToInstall)
-            
             do throws(InstallationProgressTracker.InstallationError)
             {
-                try await installationProgressTracker!.installPackage(
+                try await installationProgressTracker.installPackage(
                     packageToInstall,
                     using: brewPackagesTracker,
                     cachedDownloadsTracker: cachedDownloadsTracker
                 )
+                
+                packageInstallationProcessStepTracker.advanceStep(to: .finished)
             } catch let installationError
             {
                 switch installationError
                 {
                 case .implemented(let implementedError):
                     packageInstallationProcessStepTracker.advanceStep(to: .erroredOut(withError: implementedError))
                 case .unimplemented(let rawOutput):
-                    packageInstallationProcessStepTracker.advanceStep(to: .unexpectedTerminalOutput())
+                    packageInstallationProcessStepTracker.advanceStep(to:
+                            .unexpectedTerminalOutput(rawOutput.containsErrors ? .containedErrors(rawOutput: rawOutput) : .didNotContainErrors(rawOutput: rawOutput))
+                    )
                 }
             }
         }

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

@@ -18,25 +18,26 @@ struct PresentingSearchResultsView: View
     @InjectedObservable(\.appState) var appState: AppState
 
     @Environment(PackageInstallationProcessStepTracker.self) var packageInstallationProcessStepTracker
-    
+
     @State private var searchString: String = ""
-    
+
     @Binding var selectedPackage: MinimalHomebrewPackage?
-    
+
     let foundFormulae: [MinimalHomebrewPackage]
     let foundCasks: [MinimalHomebrewPackage]
 
     @State private var isFormulaeSectionCollapsed: Bool = false
     @State private var isCasksSectionCollapsed: Bool = false
 
     @State var isSearchFieldFocused: Bool = true
-    
+
     init(
         oldSearchString: String,
         selectedPackage: Binding<MinimalHomebrewPackage?> = .constant(nil),
         foundFormulae: [MinimalHomebrewPackage],
         foundCasks: [MinimalHomebrewPackage]
-    ) {
+    )
+    {
         _searchString = State(initialValue: oldSearchString)
         _selectedPackage = selectedPackage
         self.foundFormulae = foundFormulae
@@ -160,7 +161,7 @@ struct PresentingSearchResultsView: View
             {
                 AppConstants.shared.logger.error("Impossible case")
             }
-            
+
         } label: {
             Text("add-package.install.action")
         }
@@ -194,25 +195,12 @@ private struct SearchResultsSection: View
         {
             Group
             {
-                if #available(macOS 14.0, *)
-                {
-                    switch sectionType
-                    {
-                    case .formula:
-                        SmallerContentUnavailableView(label: "add-package.search.results.formulae.none-found", image: "custom.apple.terminal.badge.magnifyingglass")
-                    case .cask:
-                        SmallerContentUnavailableView(label: "add-package.search.results.casks.none-found", image: "custom.macwindow.badge.magnifyingglass")
-                    }
-                }
-                else
+                switch sectionType
                 {
-                    switch sectionType
-                    {
-                    case .formula:
-                        Text("add-package.search.results.formulae.none-found")
-                    case .cask:
-                        Text("add-package.search.results.casks.none-found")
-                    }
+                case .formula:
+                    SmallerContentUnavailableView(label: "add-package.search.results.formulae.none-found", image: "custom.apple.terminal.badge.magnifyingglass")
+                case .cask:
+                    SmallerContentUnavailableView(label: "add-package.search.results.casks.none-found", image: "custom.macwindow.badge.magnifyingglass")
                 }
             }
             .frame(minWidth: 0, maxWidth: .infinity, alignment: .center)
@@ -225,15 +213,15 @@ private struct SearchResultsSection: View
                 {
                     ForEach(packageList)
                     { package in
-                        SearchResultRow(searchedForPackage: package, context: .searchResults)
+                        SearchResultRow(context: .searchResult(searchedForPackage: package))
                     }
                 }
             } header: {
                 CollapsibleSectionHeader(headerText: sectionType == .formula ? "add-package.search.results.formulae" : "add-package.search.results.casks", isCollapsed: $isSectionCollapsed)
             }
         }
     }
-    
+
     @ViewBuilder
     private var searchFailed: some View
     {

Cork/Views/Sidebar/Components/Sidebar Package Row.swift

@@ -31,7 +31,10 @@ struct SidebarPackageRow: View
         }
         .contextMenu
         {
-            SidebarContextMenu(package: package)
+            package.contextMenu(using: package)
+            {
+                SidebarContextMenu(package: package)
+            }
         }
         .modify
         { viewProxy in

Modules/Packages/PackagesModels/Logic/Installation & Removal/Synchnorize Installed Packages.swift

@@ -18,6 +18,9 @@ public extension BrewPackagesTracker
     {
         AppConstants.shared.logger.debug("Will start synchronization process")
 
+        /// Save the old casks, we will compare them to see if we need to reload adoptable apps later
+        let oldLoadedCasks: Set<BrewPackage> = self.successfullyLoadedCasks
+        
         async let updatedFormulaeTracker: BrewPackages? = await self.loadInstalledPackages(packageTypeToLoad: .formula, appState: AppState())
         async let updatedCasksTracker: BrewPackages? = await self.loadInstalledPackages(packageTypeToLoad: .cask, appState: AppState())
 
@@ -34,11 +37,21 @@ public extension BrewPackagesTracker
 
         await cachedDownloadsTracker.loadCachedDownloadedPackages(brewPackagesTracker: self)
 
-        do
+        AppConstants.shared.logger.debug("Number of old packages: \(oldLoadedCasks.count), Number of new packages: \(self.successfullyLoadedCasks.count)")
+        
+        if self.successfullyLoadedCasks.count != oldLoadedCasks.count
+        {
+            do
+            {
+                
+                self.adoptableApps = try await self.getAdoptableCasks(cacheUsePolicy: .useCachedData)
+            } catch let adoptableCasksSynchronizationError {
+                AppConstants.shared.logger.error("Failed while synchronizing adoptable casks: \(adoptableCasksSynchronizationError)")
+            }
+        }
+        else
         {
-            self.adoptableApps = try await self.getAdoptableCasks(cacheUsePolicy: .useCachedData)
-        } catch let adoptableCasksSynchronizationError {
-            AppConstants.shared.logger.error("Failed while synchronizing adoptable casks: \(adoptableCasksSynchronizationError)")
+            AppConstants.shared.logger.error("No changes to packages. No need to reload the adoptable apps.")
         }
     }
 }

Modules/Packages/PackagesModels/Logic/Taps/Load Tap Details.swift

@@ -59,11 +59,15 @@ public extension BrewTap
         guard let tapInfoRaw: Data = tapInfoLoadingResult.getJsonFromOutput(failOnAnyErrorsPresent: false)
         else
         {
+            appConstants.logger.info("Couldn't get any data from JSON output")
+            
             throw .couldNotReadJson
         }
 
         do
         {
+            appConstants.logger.info("got valid data from JSON output: \(tapInfoRaw)")
+            
             self.setBeingLoadedStatus(to: false)
 
             return try await .init(from: tapInfoRaw)