git: Fixes progress notification bug

thebaselab · Jan 22, 2024 · 12940a8 · 12940a8
1 parent 79e3278
commit 12940a8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CodeApp/Containers/SourceControlContainer.swift b/CodeApp/Containers/SourceControlContainer.swift
@@ -178,6 +178,7 @@ struct SourceControlContainer: View {
                     App.loadFolder(url: dirURL)
                 }, primaryTitle: "common.open_folder", source: repo)
         } catch {
+            progress.cancel()
             let error = error as NSError
             if error.code == LibGit2ErrorClass._GIT_ERROR_HTTP {
                 App.notificationManager.postActionNotification(

diff --git a/CodeApp/Managers/FileSystem/Local/LocalGitServiceProvider.swift b/CodeApp/Managers/FileSystem/Local/LocalGitServiceProvider.swift
@@ -157,16 +157,20 @@ class LocalGitServiceProvider: GitServiceProvider {
             let checkoutProgressBlock: CheckoutProgressBlock = { (message, current, total) in
                 DispatchQueue.main.async {
                     progress?.localizedDescription = "Updating files"
-                    progress?.totalUnitCount = Int64(total)
+                    progress?.fileOperationKind = .copying
                     progress?.completedUnitCount = Int64(current)
+                    progress?.totalUnitCount = Int64(total)
                 }
             }
             let fetchProgressBlock: FetchProgressBlock = { current, total in
                 DispatchQueue.main.async {
                     progress?.localizedDescription = "Receiving objects"
-                    progress?.fileOperationKind = .downloading
-                    progress?.totalUnitCount = Int64(total)
-                    progress?.completedUnitCount = Int64(current)
+                    progress?.fileOperationKind = .receiving
+                    if current != total {
+                        // Avoid triggering isFinished
+                        progress?.completedUnitCount = Int64(current)
+                        progress?.totalUnitCount = Int64(total)
+                    }
                 }
             }
             if let credentials = try? self.credentialsHelper.credentialsForRemoteURL(url: from) {

diff --git a/CodeApp/Views/NotificationCentreView.swift b/CodeApp/Views/NotificationCentreView.swift
@@ -105,7 +105,7 @@ private struct NotificationItemWtihProgress: View {
             }
         }
         .onReceive(timer) { _ in
-            if data.progress!.isFinished {
+            if data.progress!.isCancelled || data.progress!.isFinished {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
                     withAnimation {
                         isRemoved = true