~ Consolidated version UI

Cork/Localizable.xcstrings

@@ -5962,6 +5962,9 @@
           }
         }
       }
+    },
+    "add-package.error.could-not-construct-version-string.%@" : {
+
     },
     "add-package.error.timed-out.title" : {
       "localizations" : {

Cork/Logic/Search/Search for Package.swift

@@ -53,11 +53,11 @@ private func processSearchResults(packageNameArray: [String], packageType: Packa
             {
                 if finalArray[indexOfPreviouslyFoundPackage].additionalVersions == nil
                 {
-                    finalArray[indexOfPreviouslyFoundPackage].additionalVersions = [additionalVersion]
+                    finalArray[indexOfPreviouslyFoundPackage].additionalVersions = [.init(versionIdentifier: additionalVersion)]
                 }
                 else
                 {
-                    finalArray[indexOfPreviouslyFoundPackage].additionalVersions?.append(additionalVersion)
+                    finalArray[indexOfPreviouslyFoundPackage].additionalVersions?.append(.init(versionIdentifier: additionalVersion))
                 }
             }
         }
@@ -69,7 +69,7 @@ private func processSearchResults(packageNameArray: [String], packageType: Packa
                     .init(
                         packageName: splitPackageNameAndVersion.packageName,
                         packageType: packageType,
-                        additionalVersions: [additionalVersion]
+                        additionalVersions: [.init(versionIdentifier: additionalVersion)]
                     )
                 )
             }

Cork/Models/Package Installation/Search Result.swift

@@ -15,19 +15,52 @@ struct SearchResult: Identifiable, Hashable, Codable
     let packageName: String
     let packageType: PackageType
 
-    var additionalVersions: [String]?
+    var additionalVersions: [PackageVersion]?
+
+}
+
+enum SearchResultConstructionError: LocalizedError
+{
+    case couldNotCreateHomebrewVersionString
+
+    var errorDescription: String?
+    {
+        switch self {
+            case .couldNotCreateHomebrewVersionString:
+                "error.package-install.could-not-create-homebrew-version-string"
+        }
+    }
 }
 
 extension SearchResult
 {
+    func createHomebrewVersionString(fromVersion additionalVersion: PackageVersion?) throws(SearchResultConstructionError) -> String
+    {
+        if let additionalVersion
+        {
+            return "\(self.packageName)@\(additionalVersion.versionIdentifier)"
+        }
+        else
+        {
+            if self.additionalVersions == nil
+            {
+                return "\(self.packageName)"
+            }
+            else
+            {
+                throw .couldNotCreateHomebrewVersionString
+            }
+        }
+    }
+
     /// Convert the search result to a primitive ``BrewPackage``
     func convertToPackage() -> BrewPackage
     {
         return .init(
             name: self.packageName,
             type: self.packageType,
             installedOn: nil,
-            versions: self.additionalVersions ?? .init(),
+            versions: .init(),
             sizeInBytes: nil
         )
     }

Cork/Models/Packages/Package Version.swift

@@ -0,0 +1,18 @@
+//
+//  Package Version.swift
+//  Cork
+//
+//  Created by David Bureš on 11.10.2024.
+//
+
+import Foundation
+
+/// A version for a package
+struct PackageVersion: Identifiable, Hashable, Codable
+{
+    let id: UUID = .init()
+
+    /// Identifier for the version
+    /// For most packages, a number (like "14" or "16") is used. Some packages also use different identifiers, such as "develop".
+    let versionIdentifier: String
+}

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

@@ -22,6 +22,8 @@ struct SearchResultRow: View, Sendable
 
     @State private var isLoadingDescription: Bool = true
     @State private var descriptionParsingFailed: Bool = false
+
+    var descriptionLoadingForciblyDisabled: Bool = false
 
     var body: some View
     {
@@ -64,7 +66,7 @@ struct SearchResultRow: View, Sendable
                 }
             }
 
-            if showDescriptionsInSearchResults
+            if showDescriptionsInSearchResults && !descriptionLoadingForciblyDisabled
             {
                 if !descriptionParsingFailed
                 { // Show this if the description got properly parsed
@@ -97,7 +99,7 @@ struct SearchResultRow: View, Sendable
         }
         .task
         {
-            if showDescriptionsInSearchResults
+            if showDescriptionsInSearchResults && !descriptionLoadingForciblyDisabled
             {
                 AppConstants.shared.logger.info("\(searchedForPackage.name, privacy: .auto) came into view")
 
@@ -138,3 +140,13 @@ struct SearchResultRow: View, Sendable
         }
     }
 }
+
+extension SearchResultRow
+{
+    func packageDescriptionsAlwaysDisabled() -> SearchResultRow
+    {
+        var modifiedView: SearchResultRow = self
+        modifiedView.descriptionLoadingForciblyDisabled = true
+        return modifiedView
+    }
+}

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

@@ -153,13 +153,22 @@ private struct SearchResultsSection: View
                     {
                         DisclosureGroup
                         {
-                            ForEach(additionalVersions, id: \.self)
+                            ForEach(additionalVersions)
                             { additionalVersion in
-                                SearchResultRow(
-                                    searchResult: .init(
-                                        packageName: "\(package.packageName)@\(additionalVersion)",
-                                        packageType: package.packageType)
-                                )
+                                if let versionString = try? package.createHomebrewVersionString(fromVersion: additionalVersion)
+                                {
+                                    SearchResultRow(
+                                        searchResult: .init(
+                                            packageName: versionString,
+                                            packageType: package.packageType)
+                                    )
+                                    .packageDescriptionsAlwaysDisabled()
+                                }
+                                else
+                                {
+                                    Text("add-package.error.could-not-construct-version-string.\(additionalVersion.versionIdentifier)")
+                                }
+
                             }
                         } label: {
                             SearchResultRow(searchResult: package)

Cork/Views/Shared/Sanitized Package Name.swift

@@ -46,7 +46,7 @@ struct SanitizedPackageName: View
                     {
                         /// The version is the length of the package name, + 1 due to the @ character
                         Text("v. \(String(packageNameWithoutTapName.dropFirst(sanitizedName.count + 1)))")
-                            .foregroundColor(.gray)
+                            .foregroundColor(.secondary)
                             .font(.subheadline)
                     }
                 }