^ Merge fixes

Author: buresdv

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

@@ -151,9 +151,7 @@ struct PresentingSearchResultsView: View
     {
         Button
         {
-            getRequestedPackages()
-
-            // packageInstallationProcessStep = .installing
+            packageInstallationProcessStep = .installing
         } label: {
             Text("add-package.install.action")
         }
@@ -171,35 +169,6 @@ struct PresentingSearchResultsView: View
             Text("action.search-again")
         }
     }
-    
-    private func getRequestedPackages()
-    {
-        if let foundPackageSelection
-        {
-            do
-            {
-                let packageToInstall: BrewPackage = try foundPackageSelection.getPackage(tracker: searchResultTracker)
-
-                AppConstants.shared.logger.debug("Got package to install: \(packageToInstall.name), version \(packageToInstall.versions.formatted(.list(type: .and)))")
-                
-                installationProgressTracker.packageBeingInstalled = PackageInProgressOfBeingInstalled(package: packageToInstall, installationStage: .ready, packageInstallationProgress: 0)
-
-                #if DEBUG
-                    AppConstants.shared.logger.info("Packages to install: \(installationProgressTracker.packageBeingInstalled.package.name, privacy: .public)")
-                #endif
-            }
-            catch let packageByUUIDRetrievalError
-            {
-                #if DEBUG
-                    AppConstants.shared.logger.error("Failed while associating package with its ID: \(packageByUUIDRetrievalError, privacy: .public)")
-                #endif
-
-                dismiss()
-
-                appState.showAlert(errorToShow: .couldNotAssociateAnyPackageWithProvidedPackageUUID)
-            }
-        }
-    }
 }
 
 private struct SearchResultsSection: View

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

@@ -47,11 +47,11 @@ struct InstallationSearchingView: View, Sendable
 
         for formula in await foundFormulae
         {
-            foundFormulaeTracker.append(BrewPackage(name: formula, type: .formula, installedOn: nil, versions: [], sizeInBytes: nil))
+            foundFormulaeTracker.append(BrewPackage(name: formula, type: .formula, installedOn: nil, versions: [], sizeInBytes: nil, downloadCount: nil))
         }
         for cask in await foundCasks
         {
-            foundCasksTracker.append(BrewPackage(name: cask, type: .cask, installedOn: nil, versions: [], sizeInBytes: nil))
+            foundCasksTracker.append(BrewPackage(name: cask, type: .cask, installedOn: nil, versions: [], sizeInBytes: nil, downloadCount: nil))
         }
 
         return (foundFormulaeTracker, foundCasksTracker)
@@ -95,7 +95,7 @@ struct InstallationSearchingView: View, Sendable
                 else
                 { /// If it doesn't match, it's not in the array yet. Let's add it to the array
                     tempArray.append(
-                        .init(name: packageNameWithoutItsVersion, type: unprocessedFoundPackage.type, installedOn: nil, versions: [packageVersionWithoutItsName], sizeInBytes: nil)
+                        .init(name: packageNameWithoutItsVersion, type: unprocessedFoundPackage.type, installedOn: nil, versions: [packageVersionWithoutItsName], sizeInBytes: nil, downloadCount: nil)
                     )
                 }
             }