~ Refactoring of partial update sheet

buresdv · buresdv · commit c5570a5e1644 · 2025-04-16T12:02:40.000+02:00
diff --git a/Cork/ContentView.swift b/Cork/ContentView.swift
@@ -498,8 +498,8 @@ private extension View
                 case .fullUpdate:
                     UpdatePackagesView()
 
-                case .partialUpdate:
-                    UpdateSomePackagesView()
+                case .partialUpdate(let packagesToUpdate):
+                    UpdateSomePackagesView(packagesToUpdate: packagesToUpdate)
 
                 case .corruptedPackageFix(let corruptedPackage):
                     ReinstallCorruptedPackageView(corruptedPackageToReinstall: corruptedPackage)
diff --git a/Cork/Enums/Sheets/Main Window/Sheets - Main Window.swift b/Cork/Enums/Sheets/Main Window/Sheets - Main Window.swift
@@ -14,7 +14,7 @@ enum DisplayableSheet: Identifiable, Equatable
     
     case tapAddition
     
-    case fullUpdate, partialUpdate
+    case fullUpdate, partialUpdate(packagesToUpdate: [OutdatedPackage])
     
     case corruptedPackageFix(corruptedPackage: CorruptedPackage)
     
diff --git a/Cork/Views/Menu Bar/Sub-Views/Menu Bar - Package Updating.swift b/Cork/Views/Menu Bar/Sub-Views/Menu Bar - Package Updating.swift
@@ -25,7 +25,7 @@ struct MenuBar_PackageUpdating: View
             {
                 if let sanitizedSheetState = appState.sheetToShow
                 {
-                    if sanitizedSheetState != .fullUpdate || sanitizedSheetState != .partialUpdate
+                    if sanitizedSheetState != .fullUpdate || sanitizedSheetState != .partialUpdate(packagesToUpdate: .init())
                     {
                         Menu
                         {
diff --git a/Cork/Views/Start Page/Sub-Views/Outdated Packages/Outdated Package List Box.swift b/Cork/Views/Start Page/Sub-Views/Outdated Packages/Outdated Package List Box.swift
@@ -108,7 +108,7 @@ struct OutdatedPackageListBox: View
                                 {
                                     Button
                                     {
-                                        appState.showSheet(ofType: .partialUpdate)
+                                        appState.showSheet(ofType: .partialUpdate(packagesToUpdate: packagesMarkedForUpdating))
                                     } label: {
                                         Text("start-page.update-incremental.package-count-\(packagesMarkedForUpdating.count)")
                                     }
diff --git a/Cork/Views/Updating/Incremental Updating/Update Some Packages View.swift b/Cork/Views/Updating/Incremental Updating/Update Some Packages View.swift
@@ -20,9 +20,11 @@ struct UpdateSomePackagesView: View
 
     @State private var packageUpdatingErrors: [String] = .init()
 
-    var selectedPackages: [OutdatedPackage]
+    let packagesToUpdate: [OutdatedPackage]
+    
+    var numberOfPackagesToUpdate: Int
     {
-        return outdatedPackageTracker.displayableOutdatedPackages.filter { $0.isMarkedForUpdating }
+        packagesToUpdate.count
     }
 
     var body: some View
@@ -32,14 +34,14 @@ struct UpdateSomePackagesView: View
             switch packageUpdatingStage
             {
             case .updating:
-                ProgressView(value: updateProgress, total: Double(selectedPackages.count))
+                ProgressView(value: updateProgress, total: Double(packagesToUpdate.count))
                 {
                     Text("update-packages.incremental.update-in-progress-\(packageBeingCurrentlyUpdated.name)")
                 }
                 .frame(width: 200)
                 .task
                 {
-                    for (index, outdatedPackage) in selectedPackages.enumerated()
+                    for (index, outdatedPackage) in packagesToUpdate.enumerated()
                     {
                         packageBeingCurrentlyUpdated = outdatedPackage.package
 
@@ -62,11 +64,11 @@ struct UpdateSomePackagesView: View
                             {
                             case .standardOutput(let outputLine):
                                 AppConstants.shared.logger.info("Individual package updating output: \(outputLine)")
-                                updateProgress = updateProgress + (Double(selectedPackages.count) / 100)
+                                updateProgress = updateProgress + (Double(numberOfPackagesToUpdate) / 100)
 
                             case .standardError(let errorLine):
                                 AppConstants.shared.logger.info("Individual package updating error: \(errorLine)")
-                                updateProgress = updateProgress + (Double(selectedPackages.count) / 100)
+                                updateProgress = updateProgress + (Double(numberOfPackagesToUpdate) / 100)
 
                                 if !errorLine.contains("The post-install step did not complete successfully")
                                 {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ struct MenuBar_PackageUpdating: View`
`25`	`25`	`{`
`26`	`26`	`if let sanitizedSheetState = appState.sheetToShow`
`27`	`27`	`{`
`28`		`- if sanitizedSheetState != .fullUpdate \|\| sanitizedSheetState != .partialUpdate`
	`28`	`+ if sanitizedSheetState != .fullUpdate \|\| sanitizedSheetState != .partialUpdate(packagesToUpdate: .init())`
`29`	`29`	`{`
`30`	`30`	`Menu`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ struct OutdatedPackageListBox: View`
`108`	`108`	`{`
`109`	`109`	`Button`
`110`	`110`	`{`
`111`		`- appState.showSheet(ofType: .partialUpdate)`
	`111`	`+ appState.showSheet(ofType: .partialUpdate(packagesToUpdate: packagesMarkedForUpdating))`
`112`	`112`	`} label: {`
`113`	`113`	`Text("start-page.update-incremental.package-count-\(packagesMarkedForUpdating.count)")`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,11 @@ struct UpdateSomePackagesView: View`
`20`	`20`
`21`	`21`	`@State private var packageUpdatingErrors: [String] = .init()`
`22`	`22`
`23`		`- var selectedPackages: [OutdatedPackage]`
	`23`	`+ let packagesToUpdate: [OutdatedPackage]`
	`24`	`+`
	`25`	`+ var numberOfPackagesToUpdate: Int`
`24`	`26`	`{`
`25`		`- return outdatedPackageTracker.displayableOutdatedPackages.filter { $0.isMarkedForUpdating }`
	`27`	`+ packagesToUpdate.count`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`var body: some View`
`@@ -32,14 +34,14 @@ struct UpdateSomePackagesView: View`
`32`	`34`	`switch packageUpdatingStage`
`33`	`35`	`{`
`34`	`36`	`case .updating:`
`35`		`- ProgressView(value: updateProgress, total: Double(selectedPackages.count))`
	`37`	`+ ProgressView(value: updateProgress, total: Double(packagesToUpdate.count))`
`36`	`38`	`{`
`37`	`39`	`Text("update-packages.incremental.update-in-progress-\(packageBeingCurrentlyUpdated.name)")`
`38`	`40`	`}`
`39`	`41`	`.frame(width: 200)`
`40`	`42`	`.task`
`41`	`43`	`{`
`42`		`- for (index, outdatedPackage) in selectedPackages.enumerated()`
	`44`	`+ for (index, outdatedPackage) in packagesToUpdate.enumerated()`
`43`	`45`	`{`
`44`	`46`	`packageBeingCurrentlyUpdated = outdatedPackage.package`
`45`	`47`
`@@ -62,11 +64,11 @@ struct UpdateSomePackagesView: View`
`62`	`64`	`{`
`63`	`65`	`case .standardOutput(let outputLine):`
`64`	`66`	`AppConstants.shared.logger.info("Individual package updating output: \(outputLine)")`
`65`		`- updateProgress = updateProgress + (Double(selectedPackages.count) / 100)`
	`67`	`+ updateProgress = updateProgress + (Double(numberOfPackagesToUpdate) / 100)`
`66`	`68`
`67`	`69`	`case .standardError(let errorLine):`
`68`	`70`	`AppConstants.shared.logger.info("Individual package updating error: \(errorLine)")`
`69`		`- updateProgress = updateProgress + (Double(selectedPackages.count) / 100)`
	`71`	`+ updateProgress = updateProgress + (Double(numberOfPackagesToUpdate) / 100)`
`70`	`72`
`71`	`73`	`if !errorLine.contains("The post-install step did not complete successfully")`
`72`	`74`	`{`