+ Versioned previewing

Author: buresdv

Cork/CorkApp.swift

@@ -407,10 +407,10 @@ struct CorkApp: App
         .windowResizability(.contentSize)
         .defaultPosition(.center)
 
-        WindowGroup(id: .previewWindowID, for: BrewPackage.self)
+        WindowGroup(id: .previewWindowID, for: AddFormulaView.PackageSelectedToBeInstalled.self)
         { $packageToPreview in
-            PackagePreview(packageToPreview: packageToPreview)
-                .navigationTitle(packageToPreview?.name ?? "")
+            PackagePreview(selectedPackageToPreview: packageToPreview)
+                .navigationTitle(packageToPreview?.package?.name ?? "")
                 .environmentObject(appDelegate.appState)
         }
         .windowResizability(.contentSize)

Cork/Views/Installation/Install Package.swift

@@ -12,7 +12,7 @@ import SwiftUI
 
 struct AddFormulaView: View
 {
-    struct PackageSelectedToBeInstalled: Identifiable, Equatable, Hashable
+    struct PackageSelectedToBeInstalled: Identifiable, Equatable, Hashable, Codable
     {
         var id: UUID
 
@@ -26,6 +26,32 @@ struct AddFormulaView: View
 
             self.id = package?.id ?? .init()
         }
+        
+        /// Create a package with the relevant version selected, for previewing and installing
+        func constructPackageOfRelevantVersion() -> BrewPackage?
+        {
+            /// First, see if there's a package to construct
+            guard var newPackage = self.package else
+            {
+                /// If not, just return nil and the process will fail
+                return nil
+            }
+            
+            /// Now that we have a package, let's see if there's a specific Homebrew version selected
+            if let selectedHomebrewVersion = self.version
+            {
+                /// If there is a version defined, construct a package that's identical, apart from its Homebrew version
+                newPackage.versions = .init()
+                newPackage.homebrewVersion = selectedHomebrewVersion
+                
+                return newPackage
+            }
+            else
+            {
+                /// If there's no Homebrew version defined, just return the package itself with no versions
+                return newPackage
+            }
+        }
     }
 
     @Environment(\.dismiss) var dismiss: DismissAction

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

@@ -101,7 +101,7 @@ struct InstallationInitialView: View
     {
         PreviewPackageButtonWithCustomAction
         {
-            guard let packageToPreview: BrewPackage = foundPackageSelection?.package else
+            guard let packageToPreview: AddFormulaView.PackageSelectedToBeInstalled = foundPackageSelection else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to preview")
 

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

@@ -129,16 +129,15 @@ struct PresentingSearchResultsView: View
     {
         PreviewPackageButtonWithCustomAction
         {
-            guard let selectedPackage = foundPackageSelection?.package
+            guard let selectedPackage: AddFormulaView.PackageSelectedToBeInstalled = foundPackageSelection
             else
             {
                 AppConstants.shared.logger.error("Failed to preview package")
 
                 return
             }
+            
             openWindow(value: selectedPackage)
-
-            AppConstants.shared.logger.debug("Would preview package \(selectedPackage.name)")
         }
         .disabled(foundPackageSelection == nil)
     }

Cork/Views/Package Previews/Package Preview.swift

@@ -10,13 +10,13 @@ import SwiftUI
 struct PackagePreview: View
 {
 
-    let packageToPreview: BrewPackage?
+    let selectedPackageToPreview: AddFormulaView.PackageSelectedToBeInstalled?
 
     var body: some View
     {
-        if let packageToPreview
+        if let finalPackageOfRelevantVersion = selectedPackageToPreview?.constructPackageOfRelevantVersion()
         {
-            PackageDetailView(package: packageToPreview)
+            PackageDetailView(package: finalPackageOfRelevantVersion)
                 .isPreview()
                 .fixedSize()
         }