~ More rewrites * Maintenance doesn't work

Author: buresdv

Cork/ContentView.swift

@@ -447,7 +447,7 @@ private extension View
                     case false:
                         MaintenanceView()
                     case true:
-                        MaintenanceView(shouldPurgeCache: false, shouldUninstallOrphans: false, shouldPerformHealthCheck: false, forcedOptions: true)
+                        MaintenanceView(forcedOptions: true)
                     }
                 }
             }

Cork/Localizable.xcstrings

@@ -39257,6 +39257,22 @@
         }
       }
     },
+    "maintenance.results.health-check.problems.show-list" : {
+      "comment" : "A button to show a list of health check problems.",
+      "isCommentAutoGenerated" : true,
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Show problems"
+          }
+        }
+      }
+    },
+    "maintenance.results.orphans-count-%@" : {
+      "comment" : "A label that describes the number of orphaned packages. The argument is the number of orphaned packages.",
+      "isCommentAutoGenerated" : true
+    },
     "maintenance.results.orphans-count-%lld" : {
       "extractionState" : "manual",
       "localizations" : {

Cork/Views/Maintenance/Maintenance View.swift

@@ -51,17 +51,23 @@ struct MaintenanceView: View
         case problemsFound(problems: [String])
     }
 
+    @Observable
+    class SelectedMaintenanceStepsTracker
+    {
+        var shouldPurgeCache: Bool = true
+        var shouldDeleteDownloads: Bool = true
+        var shouldUninstallOrphans: Bool = true
+        var shouldPerformHealthCheck: Bool = false
+    }
+
     @Environment(\.dismiss) var dismiss: DismissAction
 
     @Environment(BrewPackagesTracker.self) var brewPackagesTracker: BrewPackagesTracker
     @InjectedObservable(\.appState) var appState: AppState
 
     @State var maintenanceSteps: MaintenanceStage = .ready
 
-    @State var shouldPurgeCache: Bool = true
-    @State var shouldDeleteDownloads: Bool = true
-    @State var shouldUninstallOrphans: Bool = true
-    @State var shouldPerformHealthCheck: Bool = false
+    @State private var selectedMaintenanceStepsTracker: SelectedMaintenanceStepsTracker = .init()
 
     @State var numberOfOrphansRemoved: Int = 0
 
@@ -107,60 +113,53 @@ struct MaintenanceView: View
         {
             SheetTemplate(isShowingTitle: maintenanceSteps.shouldShowTitle)
             {
-                Group
-                {
-                    switch maintenanceSteps
+                maintenanceStepsViews
+                    .navigationTitle(sheetTitle)
+                    .toolbar
                     {
-                    case .ready:
-                        MaintenanceReadyView(
-                            shouldUninstallOrphans: $shouldUninstallOrphans,
-                            shouldPurgeCache: $shouldPurgeCache,
-                            shouldDeleteDownloads: $shouldDeleteDownloads,
-                            shouldPerformHealthCheck: $shouldPerformHealthCheck,
-                            maintenanceSteps: $maintenanceSteps,
-                            isShowingControlButtons: true,
-                            forcedOptions: forcedOptions!
-                        )
-
-                    case .maintenanceRunning:
-                        MaintenanceRunningView(
-                            shouldUninstallOrphans: shouldUninstallOrphans,
-                            shouldPurgeCache: shouldPurgeCache,
-                            shouldDeleteDownloads: shouldDeleteDownloads,
-                            shouldPerformHealthCheck: shouldPerformHealthCheck,
-                            numberOfOrphansRemoved: $numberOfOrphansRemoved,
-                            packagesHoldingBackCachePurge: $packagesHoldingBackCachePurge,
-                            reclaimedSpaceAfterCachePurge: $reclaimedSpaceAfterCachePurge,
-                            healthCheckStatus: $brewHealthCheckStatus,
-                            maintenanceSteps: $maintenanceSteps
-                        )
-
-                    case .finished(let results):
-                        MaintenanceFinishedView(
-                            maintenanceResults: results
-                        )
-                    }
-                }
-                .navigationTitle(sheetTitle)
-                .toolbar
-                {
-                    if maintenanceSteps.isDismissable
-                    {
-                        ToolbarItem(placement: .cancellationAction)
+                        if maintenanceSteps.isDismissable
                         {
-                            Button
+                            ToolbarItem(placement: .cancellationAction)
                             {
-                                dismiss()
-                            } label: {
-                                Text(dismissButtonTitle)
+                                Button
+                                {
+                                    dismiss()
+                                } label: {
+                                    Text(dismissButtonTitle)
+                                }
+                                .keyboardShortcut(.cancelAction)
                             }
-                            .keyboardShortcut(.cancelAction)
                         }
                     }
-                }
             }
         }
     }
+
+    @ViewBuilder
+    var maintenanceStepsViews: some View
+    {
+        switch maintenanceSteps
+        {
+        case .ready:
+            MaintenanceReadyView(
+                selectedMaintenanceStepsTracker: selectedMaintenanceStepsTracker,
+                maintenanceSteps: $maintenanceSteps,
+                isShowingControlButtons: true,
+                forcedOptions: forcedOptions!
+            )
+
+        case .maintenanceRunning:
+            MaintenanceRunningView(
+                maintenanceSteps: $maintenanceSteps,
+                selectedMaintenanceStepsTracker: selectedMaintenanceStepsTracker
+            )
+
+        case .finished(let results):
+            MaintenanceFinishedView(
+                maintenanceResults: results
+            )
+        }
+    }
 }
 
 extension MaintenanceView

Cork/Views/Maintenance/Sub-Views/Maintenance Finished View.swift

@@ -189,11 +189,20 @@ struct MaintenanceFinishedView: View
                             .lineLimit(nil)
                             .fixedSize(horizontal: false, vertical: true)
                     case .problemsFound(let problems):
-                        HStack
+                        VStack
                         {
                             Text("maintenance.results.health-check.problems")
                                 .lineLimit(nil)
                                 .fixedSize(horizontal: false, vertical: true)
+                            
+                            DisclosureGroup {
+                                List(problems, id: \.self) { problem in
+                                    Text(problem)
+                                }
+                            } label: {
+                                Text("maintenance.results.health-check.problems.show-list")
+                            }
+
                         }
                     }
                 }

Cork/Views/Maintenance/Sub-Views/Maintenance Running View.swift

@@ -22,10 +22,7 @@ struct MaintenanceRunningView: View
 
     @Binding var maintenanceSteps: MaintenanceView.MaintenanceStage
 
-    let shouldUninstallOrphans: Bool
-    let shouldPurgeCache: Bool
-    let shouldDeleteDownloads: Bool
-    let shouldPerformHealthCheck: Bool
+    let selectedMaintenanceStepsTracker: MaintenanceView.SelectedMaintenanceStepsTracker
 
     @State private var cachePurgeResults: MaintenanceResults.CachePurgeResults?
     @State private var orphanRemovalResults: MaintenanceResults.OrphanRemovalResults?
@@ -38,14 +35,14 @@ struct MaintenanceRunningView: View
             Text(currentMaintenanceStepText)
                 .task
                 {
-                    
+                    await performMaintenance()
                 }
         }
     }
 
     func performMaintenance() async
     {
-        if shouldUninstallOrphans
+        if selectedMaintenanceStepsTracker.shouldUninstallOrphans
         {
             currentMaintenanceStepText = "maintenance.step.removing-orphans"
 
@@ -63,7 +60,7 @@ struct MaintenanceRunningView: View
             AppConstants.shared.logger.info("Will not uninstall orphans")
         }
 
-        if shouldPurgeCache
+        if selectedMaintenanceStepsTracker.shouldPurgeCache
         {
             currentMaintenanceStepText = "maintenance.step.purging-cache"
 
@@ -92,7 +89,7 @@ struct MaintenanceRunningView: View
             AppConstants.shared.logger.info("Will not purge cache")
         }
 
-        if shouldDeleteDownloads
+        if selectedMaintenanceStepsTracker.shouldDeleteDownloads
         {
             AppConstants.shared.logger.info("Will delete downloads")
 
@@ -123,7 +120,7 @@ struct MaintenanceRunningView: View
             AppConstants.shared.logger.info("Will not delete downloads")
         }
 
-        if shouldPerformHealthCheck
+        if selectedMaintenanceStepsTracker.shouldPerformHealthCheck
         {
             currentMaintenanceStepText = "maintenance.step.running-health-check"
 

Cork/Views/Maintenance/Sub-Views/Ready View.swift

@@ -16,10 +16,7 @@ struct MaintenanceReadyView: View
     @Default(.default_shouldDeleteDownloads) var default_shouldDeleteDownloads: Bool
     @Default(.default_shouldPerformHealthCheck) var default_shouldPerformHealthCheck: Bool
 
-    @Binding var shouldUninstallOrphans: Bool
-    @Binding var shouldPurgeCache: Bool
-    @Binding var shouldDeleteDownloads: Bool
-    @Binding var shouldPerformHealthCheck: Bool
+    @Bindable var selectedMaintenanceStepsTracker: MaintenanceView.SelectedMaintenanceStepsTracker
 
     @Binding var maintenanceSteps: MaintenanceView.MaintenanceStage
 
@@ -39,7 +36,7 @@ struct MaintenanceReadyView: View
                 {
                     VStack(alignment: .leading)
                     {
-                        Toggle(isOn: $shouldUninstallOrphans)
+                        Toggle(isOn: $selectedMaintenanceStepsTracker.shouldUninstallOrphans)
                         {
                             Text("maintenance.steps.packages.uninstall-orphans")
                         }
@@ -50,11 +47,11 @@ struct MaintenanceReadyView: View
                 {
                     VStack(alignment: .leading)
                     {
-                        Toggle(isOn: $shouldPurgeCache)
+                        Toggle(isOn: $selectedMaintenanceStepsTracker.shouldPurgeCache)
                         {
                             Text("maintenance.steps.downloads.purge-cache")
                         }
-                        Toggle(isOn: $shouldDeleteDownloads)
+                        Toggle(isOn: $selectedMaintenanceStepsTracker.shouldDeleteDownloads)
                         {
                             Text("maintenance.steps.downloads.delete-cached-downloads")
                         }
@@ -63,7 +60,7 @@ struct MaintenanceReadyView: View
 
                 LabeledContent("maintenance.steps.other")
                 {
-                    Toggle(isOn: $shouldPerformHealthCheck)
+                    Toggle(isOn: $selectedMaintenanceStepsTracker.shouldPerformHealthCheck)
                     {
                         Text("maintenance.steps.other.health-check")
                     }
@@ -85,7 +82,7 @@ struct MaintenanceReadyView: View
                         Text("maintenance.steps.start")
                     }
                     .keyboardShortcut(.defaultAction)
-                    .disabled(isStartDisabled)
+                    //.disabled(isStartDisabled)
                 }
             }
         }
@@ -95,19 +92,21 @@ struct MaintenanceReadyView: View
             {
                 /// Replace the provided values with those from AppStorage
                 /// I have to do this because I don't want the settings in the sheet itself to affect those in the defaults
-                shouldUninstallOrphans = default_shouldUninstallOrphans
-                shouldPurgeCache = default_shouldPurgeCache
-                shouldDeleteDownloads = default_shouldDeleteDownloads
-                shouldPerformHealthCheck = default_shouldPerformHealthCheck
+                selectedMaintenanceStepsTracker.shouldUninstallOrphans = default_shouldUninstallOrphans
+                selectedMaintenanceStepsTracker.shouldPurgeCache = default_shouldPurgeCache
+                selectedMaintenanceStepsTracker.shouldDeleteDownloads = default_shouldDeleteDownloads
+                selectedMaintenanceStepsTracker.shouldPerformHealthCheck = default_shouldPerformHealthCheck
             }
         }
     }
 
+    /*
     private var isStartDisabled: Bool
     {
         [shouldUninstallOrphans, shouldPurgeCache, shouldDeleteDownloads, shouldPerformHealthCheck].allSatisfy
         {
             !$0
         }
     }
+     */
 }

Cork/Views/Reusables/Sheets/Sheet Template.swift

@@ -11,18 +11,11 @@ struct SheetTemplate<Content: View>: View
 {
     var isShowingTitle: Bool
 
-    // Store a closure that builds the content rather than a stored @ViewBuilder property
-    private let content: () -> Content
-
-    // Provide a @ViewBuilder initializer so call sites can pass trailing closure content naturally
-    init(isShowingTitle: Bool, @ViewBuilder content: @escaping () -> Content) {
-        self.isShowingTitle = isShowingTitle
-        self.content = content
-    }
+    @ViewBuilder var sheetContent: Content
 
     var body: some View
     {
-        content()
+        sheetContent
             .toolbar(.hidden, for: isShowingTitle ? .automatic : .windowToolbar)
             .padding()
             .frame(minWidth: 300)

Cork/Views/Settings/Panes/Maintenance Pane.swift

@@ -21,6 +21,8 @@ struct MaintenancePane: View
     {
         SettingsPaneTemplate
         {
+            EmptyView()
+            /*
             VStack(alignment: .leading, spacing: 10)
             {
                 Text("settings.maintenance.default-steps")
@@ -36,6 +38,7 @@ struct MaintenancePane: View
                     enablePadding: false
                 )
             }
+             */
         }
     }
 }