~ Matcher enum structure

buresdv · buresdv · commit 5a48dfec3945 · 2026-05-04T22:58:27.000+02:00
diff --git a/Cork/Enums/Package Installation/Package Installation Steps.swift b/Cork/Enums/Package Installation/Package Installation Steps.swift
@@ -12,6 +12,15 @@ import CorkTerminalFunctions
 
 enum PackageInstallationProcessSteps: Equatable
 {
+    enum UnexpectedTerminalOutputType: Equatable
+    {
+        /// The unexpected outputs did NOT contain any STDERR outputs
+        case containedErrors(rawOutput: [TerminalOutput])
+        
+        /// The unexpected outputs DID contain some STDERR outputs
+        case didNotContainErrors(rawOutput: [TerminalOutput])
+    }
+    
     case ready
     case searching(forSearchString: String)
     case presentingSearchResults(
@@ -21,8 +30,8 @@ enum PackageInstallationProcessSteps: Equatable
     )
     case installing(package: MinimalHomebrewPackage)
     case finished
-    case unexpectedTerminalOutput(rawOutput: [TerminalOutput])
-    case erroredOut(withError: InstallationProgressTracker.InstallationError)
+    case unexpectedTerminalOutput(UnexpectedTerminalOutputType)
+    case erroredOut(withError: InstallationProgressTracker.InstallationError.ImplementedError)
     
     var isDismissable: Bool
     {
diff --git a/Cork/Views/Installation/Install Package.swift b/Cork/Views/Installation/Install Package.swift
@@ -82,8 +82,15 @@ struct AddFormulaView: View
                         InstallingPackageView(packageToInstall: package)
                     case .finished:
                         InstallationFinishedSuccessfullyView()
-                    case .unexpectedTerminalOutput(let rawOutput):
-                        EmptyView()
+                    case .unexpectedTerminalOutput(let unexpectedOutputType):
+                        // TODO: Implement the unexpected output views
+                        switch unexpectedOutputType
+                        {
+                        case .containedErrors(let rawOutputThatContainsErrors):
+                            EmptyView()
+                        case .didNotContainErrors(let rawOutputThatDidNotContainErrors):
+                            EmptyView()
+                        }
                     case .erroredOut(let withError):
                         EmptyView()
                     }
diff --git a/Cork/Views/Installation/Sub-Views/Initial.swift b/Cork/Views/Installation/Sub-Views/Initial.swift
@@ -32,7 +32,7 @@ struct InstallationInitialView: View
 
     @State private var packageRequested: String = ""
 
-    @State private var foundPackageSelection: BrewPackage?
+    @State private var foundPackageSelection: MinimalHomebrewPackage?
 
     @State var isSearchFieldFocused: Bool = true
 
@@ -100,19 +100,15 @@ struct InstallationInitialView: View
     {
         PreviewPackageButtonWithCustomAction
         {
-            guard let packageToPreview: BrewPackage = foundPackageSelection
+            guard let packageToPreview: MinimalHomebrewPackage = foundPackageSelection
             else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to preview")
 
                 return
             }
 
-            openWindow(value: MinimalHomebrewPackage(
-                name: packageToPreview.name(withPrecision: .precise),
-                type: packageToPreview.type,
-                installedIntentionally: packageToPreview.installedIntentionally
-            ))
+            openWindow(value: packageToPreview)
         }
         .disabled(foundPackageSelection == nil)
         .labelStyle(.titleOnly)
@@ -123,19 +119,15 @@ struct InstallationInitialView: View
     {
         Button
         {
-            guard let packageToInstall: BrewPackage = foundPackageSelection
+            guard let packageToInstall: MinimalHomebrewPackage = foundPackageSelection
             else
             {
                 AppConstants.shared.logger.error("Could not retrieve top package to install")
 
                 return
             }
 
-            packageInstallationProcessStepTracker.advanceStep(to: .installing(package: .init(
-                name: packageToInstall.name(withPrecision: .precise),
-                type: packageToInstall.type,
-                installedIntentionally: false
-            )))
+            packageInstallationProcessStepTracker.advanceStep(to: .installing(package: packageToInstall))
 
         } label: {
             Text("add-package.install.action")
diff --git a/Cork/Views/Installation/Sub-Views/Installing.swift b/Cork/Views/Installation/Sub-Views/Installing.swift
@@ -17,41 +17,57 @@ struct InstallingPackageView: View
 
     @InjectedObservable(\.appState) var appState: AppState
     @Environment(BrewPackagesTracker.self) var brewPackagesTracker: BrewPackagesTracker
+    
+    @Environment(PackageInstallationProcessStepTracker.self) var packageInstallationProcessStepTracker: PackageInstallationProcessStepTracker
 
     @Environment(CachedDownloadsTracker.self) var cachedDownloadsTracker: CachedDownloadsTracker
 
     let packageToInstall: MinimalHomebrewPackage
 
     @State var isShowingRealTimeOutput: Bool = false
 
-    @State private var installationProgressTracker: InstallationProgressTracker
-
-    init(packageToInstall: MinimalHomebrewPackage)
-    {
-        self.packageToInstall = packageToInstall
-        self._installationProgressTracker = State(
-            initialValue: InstallationProgressTracker(packageToInstall: packageToInstall)
-        )
-    }
+    @State private var installationProgressTracker: InstallationProgressTracker?
 
     var body: some View
     {
         VStack(alignment: .leading)
         {
-            ProgressView(installationProgressTracker.installProgress)
-
-            switch installationProgressTracker.installStage
+            if let installationProgressTracker
             {
-            case .formula(let standardCases):
-                Text(standardCases.stageDescription)
-            case .cask(let standardCases):
-                Text(standardCases.stageDescription)
+                ProgressView(installationProgressTracker.installProgress)
+                
+                switch installationProgressTracker.installStage
+                {
+                case .formula(let standardCases):
+                    Text(standardCases.stageDescription)
+                case .cask(let standardCases):
+                    standardCases.view([packageToInstall])
+                }
+                
+                installationProgressTracker.streamedOutputsDisplay
             }
         }
         .task
         {
-            do
-            {}
+            installationProgressTracker = .init(packageToInstall: packageToInstall)
+            
+            do throws(InstallationProgressTracker.InstallationError)
+            {
+                try await installationProgressTracker!.installPackage(
+                    packageToInstall,
+                    using: brewPackagesTracker,
+                    cachedDownloadsTracker: cachedDownloadsTracker
+                )
+            } catch let installationError
+            {
+                switch installationError
+                {
+                case .implemented(let implementedError):
+                    packageInstallationProcessStepTracker.advanceStep(to: .erroredOut(withError: implementedError))
+                case .unimplemented(let rawOutput):
+                    packageInstallationProcessStepTracker.advanceStep(to: .unexpectedTerminalOutput())
+                }
+            }
         }
     }
 }
diff --git a/Modules/Packages/PackagesModels/Logic/Installation & Removal/Install Package/Install Cask.swift b/Modules/Packages/PackagesModels/Logic/Installation & Removal/Install Package/Install Cask.swift
@@ -19,14 +19,16 @@ extension InstallationProgressTracker
         AppConstants.shared.logger.info("Package is Cask")
         AppConstants.shared.logger.debug("Installing package \(caskToInstall.name(withPrecision: .precise), privacy: .public)")
 
-        let (stream, process): (AsyncStream<TerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", caskToInstall.name(withPrecision: .precise)])
+        let (stream, process): (AsyncStream<TerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", "--cask", caskToInstall.name(withPrecision: .precise)])
         installationProcess = process
         
         var consolidatedUnimplementedOutput: [TerminalOutput] = .init()
         var installError: InstallationError.ImplementedError.CaskInstallError?
         
         for await output in stream
         {
+            print("Raw cask install output: \(output)")
+            
             self.insertOutput(output)
 
             output.match(as: CaskInstallMatcher.self) { standardCase in
@@ -48,9 +50,6 @@ extension InstallationProgressTracker
             } onUnimplementedOutput: { unimplementedCase in
                 consolidatedUnimplementedOutput.append(unimplementedCase)
             }
-
-            installationProcess?.terminate()
-            break
         }
         
         if let installError
@@ -62,5 +61,7 @@ extension InstallationProgressTracker
         {
             throw .implemented(.containsUnexpectedOutputs(rawOutput: consolidatedUnimplementedOutput))
         }
+        
+        
     }
 }
diff --git a/Modules/Packages/PackagesModels/Logic/Installation & Removal/Install Package/Install Package.swift b/Modules/Packages/PackagesModels/Logic/Installation & Removal/Install Package/Install Package.swift
@@ -30,8 +30,17 @@ extension InstallationProgressTracker
                 try await installCask(packageToInstall)
             }
         }
-        catch let unexpectedError
-        {}
+        catch let formulaInstallError as InstallationError.ImplementedError.FormulaInstallError
+        {
+            print("Formula install error: \(formulaInstallError)")
+        }
+        catch let caskInstallError as InstallationError.ImplementedError.CaskInstallError
+        {
+            print("Cask install lerror: \(caskInstallError)")
+        }
+        catch let unexpectedError {
+            print("Unexpected install error: \(unexpectedError)")
+        }
 
         do
         {
diff --git a/Modules/Packages/PackagesModels/Models/Package Installation/Installation Progress Tracker.swift b/Modules/Packages/PackagesModels/Models/Package Installation/Installation Progress Tracker.swift
@@ -6,9 +6,9 @@
 //
 
 import BetterProgress
+import CorkShared
 import CorkTerminalFunctions
 import Foundation
-import CorkShared
 import SwiftUI
 
 @Observable
@@ -52,8 +52,9 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
 
     public enum FormulaInstallMatcher: TerminalOutputMatchable
     {
-        public enum StandardCases: TerminalOutputCase, StageDisplayable, Sendable
+        public enum StandardCases: TerminalOutputCase, Sendable
         {
+            
             public static let allCases: [InstallationProgressTracker.FormulaInstallMatcher.StandardCases] = [
                 .findingDependencies,
                 .downloadingDependencies(
@@ -71,7 +72,7 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
                     package: .init(createEmpty: true)
                 )
             ]
-            
+
             case findingDependencies
             case downloadingDependencies(
                 dependencyName: String
@@ -104,10 +105,11 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
                     ["Installing \(package.name)"]
                 }
             }
-            
+
             public var stageDescription: LocalizedStringKey
             {
-                switch self {
+                switch self
+                {
                 case .findingDependencies:
                     return "add-package.install.loading-dependencies"
                 case .downloadingDependencies(let dependencyName):
@@ -143,24 +145,19 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
     {
         public enum StandardCases: TerminalOutputCase, StageDisplayable, Sendable
         {
-            public static let allCases: [InstallationProgressTracker.CaskInstallMatcher.StandardCases] = [
-                .downloadingCask(.init(createEmpty: true)),
-                .installingCask(.init(createEmpty: true)),
-                .movingCask(.init(createEmpty: true)),
-                .linkingAppToCask(.init(createEmpty: true))
-            ]
+            public typealias Argument = MinimalHomebrewPackage
             
-            case downloadingCask(MinimalHomebrewPackage)
-            case installingCask(MinimalHomebrewPackage)
-            case movingCask(MinimalHomebrewPackage)
-            case linkingAppToCask(MinimalHomebrewPackage)
+            case downloadingCask
+            case installingCask
+            case movingCask
+            case linkingAppToCask
 
             public var patterns: [String]
             {
                 switch self
                 {
                 case .downloadingCask:
-                    ["Downloading"]
+                    ["Downloading", "Fetching downloads"]
                 case .installingCask:
                     ["Installing Cask", "Purging files"]
                 case .movingCask:
@@ -169,19 +166,25 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
                     ["Linking binary"]
                 }
             }
-            
-            public var stageDescription: LocalizedStringKey
-            {
-                switch self
+
+            @ViewBuilder
+            public func view(_ arguments: [MinimalHomebrewPackage]) -> some View {
+                if let caskToInstall = arguments.first(where: { $0.type == .cask })
                 {
-                case .downloadingCask(let caskToInstall):
-                    return "add-package.install.downloading-cask-\(caskToInstall.name)"
-                case .installingCask(let caskToInstall):
-                    return "add-package.install.installing-cask-\(caskToInstall.name)"
-                case .movingCask(let caskToInstall):
-                    return "add-package.install.moving-cask-\(caskToInstall.name)"
-                case .linkingAppToCask(let caskToInstall):
-                    return "add-package.install.linking-cask-binary.\(caskToInstall.name)"
+                    switch self
+                    {
+                    case .downloadingCask:
+                        Text("add-package.install.downloading-cask-\(caskToInstall.name(withPrecision: .precise))")
+                    case .installingCask:
+                        Text("add-package.install.installing-cask-\(caskToInstall.name(withPrecision: .precise))")
+                    case .movingCask:
+                        Text("add-package.install.moving-cask-\(caskToInstall.name(withPrecision: .precise))")
+                    case .linkingAppToCask:
+                        Text("add-package.install.linking-cask-binary.\(caskToInstall.name(withPrecision: .precise))")
+                    }
+                } else
+                {
+                    EmptyView()
                 }
             }
         }
@@ -214,7 +217,7 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
         case formula(FormulaInstallMatcher.StandardCases)
         case cask(CaskInstallMatcher.StandardCases)
     }
-    
+
     public func insertOutput(_ output: CorkTerminalFunctions.TerminalOutput)
     {
         self.outputs.append(output)
@@ -251,13 +254,14 @@ public class InstallationProgressTracker: @MainActor TerminalOutputStreamable
                 return .init(totalItems: Self.CaskInstallMatcher.StandardCases.allCases.count)
             }
         }()
-        
+
         let installStageType: InstallStageType = {
-            switch packageToInstall.type {
+            switch packageToInstall.type
+            {
             case .formula:
                 return .formula(.findingDependencies)
             case .cask:
-                return .cask(.downloadingCask(packageToInstall))
+                return .cask(.downloadingCask)
             }
         }()
 
diff --git a/Modules/Shared/Protocols/Stage Displayable.swift b/Modules/Shared/Protocols/Stage Displayable.swift
@@ -11,18 +11,10 @@ import SwiftUI
 /// Attach a displayable view to an enum
 public protocol StageDisplayable
 {
-    /// Text for the stage
-    var stageDescription: LocalizedStringKey { get }
+    associatedtype DisplayableView: View
+    associatedtype Argument
     
-    /// Optional to display
-    var view: (any View)? { get set }
-}
-
-public extension StageDisplayable
-{
-    var view: (any View)?
-        {
-            get { nil }
-            set { }
-        }
+    /// View to describe the stage with
+    @ViewBuilder
+    func view(_ arguments: [Argument]) -> DisplayableView
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct InstallationInitialView: View`
`32`	`32`
`33`	`33`	`@State private var packageRequested: String = ""`
`34`	`34`
`35`		`- @State private var foundPackageSelection: BrewPackage?`
	`35`	`+ @State private var foundPackageSelection: MinimalHomebrewPackage?`
`36`	`36`
`37`	`37`	`@State var isSearchFieldFocused: Bool = true`
`38`	`38`
`@@ -100,19 +100,15 @@ struct InstallationInitialView: View`
`100`	`100`	`{`
`101`	`101`	`PreviewPackageButtonWithCustomAction`
`102`	`102`	`{`
`103`		`- guard let packageToPreview: BrewPackage = foundPackageSelection`
	`103`	`+ guard let packageToPreview: MinimalHomebrewPackage = foundPackageSelection`
`104`	`104`	`else`
`105`	`105`	`{`
`106`	`106`	`AppConstants.shared.logger.error("Could not retrieve top package to preview")`
`107`	`107`
`108`	`108`	`return`
`109`	`109`	`}`
`110`	`110`
`111`		`- openWindow(value: MinimalHomebrewPackage(`
`112`		`- name: packageToPreview.name(withPrecision: .precise),`
`113`		`- type: packageToPreview.type,`
`114`		`- installedIntentionally: packageToPreview.installedIntentionally`
`115`		`- ))`
	`111`	`+ openWindow(value: packageToPreview)`
`116`	`112`	`}`
`117`	`113`	`.disabled(foundPackageSelection == nil)`
`118`	`114`	`.labelStyle(.titleOnly)`
`@@ -123,19 +119,15 @@ struct InstallationInitialView: View`
`123`	`119`	`{`
`124`	`120`	`Button`
`125`	`121`	`{`
`126`		`- guard let packageToInstall: BrewPackage = foundPackageSelection`
	`122`	`+ guard let packageToInstall: MinimalHomebrewPackage = foundPackageSelection`
`127`	`123`	`else`
`128`	`124`	`{`
`129`	`125`	`AppConstants.shared.logger.error("Could not retrieve top package to install")`
`130`	`126`
`131`	`127`	`return`
`132`	`128`	`}`
`133`	`129`
`134`		`- packageInstallationProcessStepTracker.advanceStep(to: .installing(package: .init(`
`135`		`- name: packageToInstall.name(withPrecision: .precise),`
`136`		`- type: packageToInstall.type,`
`137`		`- installedIntentionally: false`
`138`		`- )))`
	`130`	`+ packageInstallationProcessStepTracker.advanceStep(to: .installing(package: packageToInstall))`
`139`	`131`
`140`	`132`	`} label: {`
`141`	`133`	`Text("add-package.install.action")`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,16 @@ extension InstallationProgressTracker`
`19`	`19`	`AppConstants.shared.logger.info("Package is Cask")`
`20`	`20`	`AppConstants.shared.logger.debug("Installing package \(caskToInstall.name(withPrecision: .precise), privacy: .public)")`
`21`	`21`
`22`		`- let (stream, process): (AsyncStream<TerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", caskToInstall.name(withPrecision: .precise)])`
	`22`	`+ let (stream, process): (AsyncStream<TerminalOutput>, Process) = shell(AppConstants.shared.brewExecutablePath, ["install", "--cask", caskToInstall.name(withPrecision: .precise)])`
`23`	`23`	`installationProcess = process`
`24`	`24`
`25`	`25`	`var consolidatedUnimplementedOutput: [TerminalOutput] = .init()`
`26`	`26`	`var installError: InstallationError.ImplementedError.CaskInstallError?`
`27`	`27`
`28`	`28`	`for await output in stream`
`29`	`29`	`{`
	`30`	`+ print("Raw cask install output: \(output)")`
	`31`	`+`
`30`	`32`	`self.insertOutput(output)`
`31`	`33`
`32`	`34`	`output.match(as: CaskInstallMatcher.self) { standardCase in`
`@@ -48,9 +50,6 @@ extension InstallationProgressTracker`
`48`	`50`	`} onUnimplementedOutput: { unimplementedCase in`
`49`	`51`	`consolidatedUnimplementedOutput.append(unimplementedCase)`
`50`	`52`	`}`
`51`		`-`
`52`		`- installationProcess?.terminate()`
`53`		`- break`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`if let installError`
`@@ -62,5 +61,7 @@ extension InstallationProgressTracker`
`62`	`61`	`{`
`63`	`62`	`throw .implemented(.containsUnexpectedOutputs(rawOutput: consolidatedUnimplementedOutput))`
`64`	`63`	`}`
	`64`	`+`
	`65`	`+`
`65`	`66`	`}`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,17 @@ extension InstallationProgressTracker`
`30`	`30`	`try await installCask(packageToInstall)`
`31`	`31`	`}`
`32`	`32`	`}`
`33`		`- catch let unexpectedError`
`34`		`- {}`
	`33`	`+ catch let formulaInstallError as InstallationError.ImplementedError.FormulaInstallError`
	`34`	`+ {`
	`35`	`+ print("Formula install error: \(formulaInstallError)")`
	`36`	`+ }`
	`37`	`+ catch let caskInstallError as InstallationError.ImplementedError.CaskInstallError`
	`38`	`+ {`
	`39`	`+ print("Cask install lerror: \(caskInstallError)")`
	`40`	`+ }`
	`41`	`+ catch let unexpectedError {`
	`42`	`+ print("Unexpected install error: \(unexpectedError)")`
	`43`	`+ }`
`35`	`44`
`36`	`45`	`do`
`37`	`46`	`{`