^ Loading state of taps

Author: buresdv

Cork/Localizable.xcstrings

@@ -16419,7 +16419,15 @@
     },
     "add-package.search.failed" : {
       "comment" : "Label for an inline content unavailable view that indicates that a search for packages failed.",
-      "isCommentAutoGenerated" : true
+      "isCommentAutoGenerated" : true,
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Couldn’t find anything"
+          }
+        }
+      }
     },
     "add-package.search.prompt" : {
       "localizations" : {

Cork/Views/Taps/Tap Details/Tap Details.swift

@@ -30,8 +30,6 @@ struct TapDetailView: View, Sendable
 
     @InjectedObservable(\.appState) var appState: AppState
     @Environment(TapTracker.self) var tapTracker: TapTracker
-    
-    @State var tapInfo: TapInfo?
 
     @State private var loadingState: TapDetailsLoadingState = .loading
 
@@ -81,9 +79,13 @@ struct TapDetailView: View, Sendable
         .frame(minWidth: 450, minHeight: 400, alignment: .topLeading)
         .task(id: tap.id)
         {
+            loadingState = .loading
+            
             do
             {
-                tapInfo = try await tap.loadDetails()
+                let loadedTapInfo: TapInfo = try await tap.loadDetails()
+                
+                loadingState = .loaded(info: loadedTapInfo)
             } catch let tapDetailsLoadingError {
                 loadingState = .erroredOut(withErrorText: tapDetailsLoadingError.localizedDescription)
             }

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

@@ -13,20 +13,55 @@ public extension BrewTap
 {
     enum TapInfoLoadingError: LocalizedError
     {
+        case noJsonReturned
         case couldNotReadJson
         case couldNotDecodeJson(error: TapInfo.JSONParsingError)
+        
+        public var errorDescription: String?
+        {
+            switch self
+            {
+            case .noJsonReturned:
+                return String(localized: "error.tap-info-loading.json-output-empty")
+            case .couldNotReadJson:
+                return String(localized: "error.tap-info-loading.could-not-read-json")
+            case .couldNotDecodeJson(let error):
+                return error.localizedDescription
+            }
+        }
     }
 
     func loadDetails() async throws(BrewTap.TapInfoLoadingError) -> TapInfo
     {
+        
+        appConstants.logger.info("Will start loading tap details for tap \(self.name(withPrecision: .full))")
+        
+        defer
+        {
+            appConstants.logger.info("Finished loading of tap info")
+            
+            self.setBeingLoadedStatus(to: false)
+        }
+        
         self.setBeingLoadedStatus(to: true)
 
-        guard let tapInfoRaw: Data = await shell(AppConstants.shared.brewExecutablePath, ["tap-info", "--json", self.name(withPrecision: .full)]).getJsonFromOutput(failOnAnyErrorsPresent: false)
+        let tapInfoLoadingResult: [TerminalOutput] = await shell(AppConstants.shared.brewExecutablePath, ["tap-info", "--json", self.name(withPrecision: .full)])
+        
+        appConstants.logger.info("Result of tap info: \(tapInfoLoadingResult)")
+        
+        guard !tapInfoLoadingResult.isEmpty else
+        {
+            appConstants.logger.error("There was no JSON in tap info call for tap \(self.name(withPrecision: .full))")
+            
+            throw .noJsonReturned
+        }
+        
+        guard let tapInfoRaw: Data = tapInfoLoadingResult.getJsonFromOutput(failOnAnyErrorsPresent: false)
         else
         {
             throw .couldNotReadJson
         }
-
+        
         do
         {
             self.setBeingLoadedStatus(to: false)

Modules/Packages/PackagesModels/Models/Brew Tap.swift

@@ -24,6 +24,8 @@ public extension BrewTap
 
 public final actor BrewTap: Identifiable, Hashable, ModifiableActor, LoadableActor
 {
+    @Injected(\.appConstants) var appConstants: AppConstants
+    
     public struct BrewTapName: Hashable, Equatable, Comparable, Sendable
     {
         public static func < (lhs: BrewTap.BrewTapName, rhs: BrewTap.BrewTapName) -> Bool

Project.swift

@@ -210,6 +210,13 @@ let corkFeature_brewfiles: ProjectDescription.Target = .target(
     sources: [
         "Modules/Features/Brewfiles/**/*.swift"
     ],
+    dependencies: [
+        .target(corkSharedTarget),
+        .target(corkModelsTarget),
+        .external(name: "FactoryKit"),
+        .external(name: "Defaults"),
+        .external(name: "DefaultsMacros"),
+    ],
     settings: .settings(configurations: [
         .debug(
             name: "Debug",