+ Selection struct * Unchecked when changing version

Author: buresdv

Cork/Views/Installation/Install Package.swift

@@ -12,6 +12,14 @@ import SwiftUI
 
 struct AddFormulaView: View
 {
+    struct PackageSelectedToBeInstalled: Identifiable, Equatable, Hashable
+    {
+        var id: UUID = .init()
+        
+        var package: BrewPackage?
+        var version: String?
+    }
+    
     @Environment(\.dismiss) var dismiss: DismissAction
 
     @State private var packageRequested: String = ""
@@ -21,7 +29,7 @@ struct AddFormulaView: View
 
     @EnvironmentObject var cachedDownloadsTracker: CachedPackagesTracker
 
-    @State private var foundPackageSelection: BrewPackage?
+    @State private var foundPackageSelection: PackageSelectedToBeInstalled?
 
     @ObservedObject var searchResultTracker: SearchResultTracker = .init()
     @ObservedObject var installationProgressTracker: InstallationProgressTracker = .init()

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

@@ -243,7 +243,7 @@ struct SearchResultRow: View, Sendable
                 }
             }
         }
-        .tag(searchedForPackage)
+        .tag(AddFormulaView.PackageSelectedToBeInstalled(package: searchedForPackage, version: selectedVersion.isEmpty ? nil : selectedVersion))
         .task
         {
             if showDescriptionsInSearchResults

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

@@ -29,7 +29,7 @@ struct InstallationInitialView: View
 
     @Binding var packageRequested: String
 
-    @Binding var foundPackageSelection: BrewPackage?
+    @Binding var foundPackageSelection: AddFormulaView.PackageSelectedToBeInstalled?
 
     @ObservedObject var installationProgressTracker: InstallationProgressTracker
 
@@ -101,7 +101,7 @@ struct InstallationInitialView: View
     {
         PreviewPackageButtonWithCustomAction
         {
-            guard let packageToPreview: BrewPackage = foundPackageSelection else
+            guard let packageToPreview: BrewPackage = foundPackageSelection?.package else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to preview")
 
@@ -118,7 +118,7 @@ struct InstallationInitialView: View
     {
         Button
         {
-            guard let packageToInstall: BrewPackage = foundPackageSelection else
+            guard let packageToInstall: BrewPackage = foundPackageSelection?.package else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to install")
 

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

@@ -11,6 +11,11 @@ import ButtonKit
 
 struct PresentingSearchResultsView: View
 {
+    enum PackageInstallationInitializationError: Error
+    {
+        case couldNotStartInstallProcessWithPackage(package: BrewPackage?)
+    }
+    
     @Environment(\.dismiss) var dismiss: DismissAction
     @Environment(\.openWindow) var openWindow: OpenWindowAction
 
@@ -19,7 +24,7 @@ struct PresentingSearchResultsView: View
     @ObservedObject var searchResultTracker: SearchResultTracker
 
     @Binding var packageRequested: String
-    @Binding var foundPackageSelection: BrewPackage?
+    @Binding var foundPackageSelection: AddFormulaView.PackageSelectedToBeInstalled?
 
     @Binding var packageInstallationProcessStep: PackageInstallationProcessSteps
 
@@ -121,7 +126,7 @@ struct PresentingSearchResultsView: View
     {
         PreviewPackageButtonWithCustomAction
         {
-            guard let selectedPackage = foundPackageSelection else
+            guard let selectedPackage = foundPackageSelection?.package else
             {
                 AppConstants.shared.logger.error("Failed to preview package")
 
@@ -153,7 +158,7 @@ struct PresentingSearchResultsView: View
         // This has to be an AsyncButton so it shakes
         AsyncButton
         {
-            guard let packageToInstall = foundPackageSelection else
+            guard let packageToInstall = foundPackageSelection?.package else
             {
                 throw PackageInstallationInitializationError.couldNotStartInstallProcessWithPackage(package: nil)
             }

Tests/Cork Itself/Setup/Top Packages.swift

@@ -39,11 +39,11 @@ struct TestTopPackageHandling
         // MARK: - Confirm the top packages are sorted correctly
         mockedTopPackageTracker.sortTopPackagesBy = .mostDownloads
 
-        #expect(mockedTopPackageTracker.sortedTopFormulae[0].packageDownloads > mockedTopPackageTracker.sortedTopFormulae[1].packageDownloads)
+        #expect(mockedTopPackageTracker.sortedTopFormulae[0].downloadCount ?? 0 > mockedTopPackageTracker.sortedTopFormulae[1].downloadCount ?? 0)
 
         mockedTopPackageTracker.sortTopPackagesBy = .fewestDownloads
 
-        #expect(mockedTopPackageTracker.sortedTopFormulae[0].packageDownloads < mockedTopPackageTracker.sortedTopFormulae[1].packageDownloads)
+        #expect(mockedTopPackageTracker.sortedTopFormulae[0].downloadCount ?? 0 < mockedTopPackageTracker.sortedTopFormulae[1].downloadCount ?? 0)
 
         mockedTopPackageTracker.sortTopPackagesBy = .mostDownloads
     }