Fix issues regarding progress display of ongoing syncs

leolost2605 · Oct 14, 2023 · f0b7e84 · f0b7e84
1 parent aa86eb8
commit f0b7e84
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/Core/Module.vala b/src/Core/Module.vala
@@ -14,12 +14,6 @@ public abstract class Syncher.Module : Object {
     construct {
         cancellable = new Cancellable ();
 
-        notify["progress"].connect (() => {
-            if (progress == 0) {
-                cancellable.reset ();
-            }
-        });
-
         fatal_error.connect ((msg, details) => {
             var app = (Application) GLib.Application.get_default ();
 
@@ -32,6 +26,14 @@ public abstract class Syncher.Module : Object {
 
             app.send_notification (null, notification);
         });
+
+        var syncher_service = SyncherService.get_default ();
+        syncher_service.notify["working"].connect (() => {
+            if (!syncher_service.working) {
+                progress = 0;
+                cancellable.reset ();
+            }
+        });
     }
 
     public abstract async void import (File file);

diff --git a/src/Core/SyncherService.vala b/src/Core/SyncherService.vala
@@ -45,10 +45,6 @@ public class Syncher.SyncherService : Object {
         });
 
         fatal_error.connect ((step, msg) => warning ("An error occured during %s: %s", step.to_string (), msg));
-
-        modules.append (new DconfModule ());
-        modules.append (new RepoModule ());
-        modules.append (new AppModule ());
     }
 
     public void setup_saved_synchronization () {
@@ -57,6 +53,10 @@ public class Syncher.SyncherService : Object {
             var dir = File.new_for_uri (saved_location);
             setup_synchronization (dir);
         }
+
+        modules.append (new DconfModule ());
+        modules.append (new RepoModule ());
+        modules.append (new AppModule ());
     }
 
     public void setup_synchronization (File dir) {

diff --git a/src/ProgressWidget.vala b/src/ProgressWidget.vala
@@ -115,12 +115,12 @@ public class Syncher.ProgressWidget : Object {
     }
 
     private void update_progress () {
-        progress_bar.fraction = (double) module.progress / 100;
-
-        if (stack.visible_child_name == "fatal") {
+        if (stack.visible_child_name == "fatal" || stack.visible_child_name == "image") {
             return;
         }
 
+        progress_bar.fraction = (double) module.progress / 100;
+
         if (module.progress == 100) {
             stack.set_visible_child_name ("image");
         } else if (module.progress > 0) {