Merge branch 'main' into feature/start_watcher

NanoSector · Mar 13, 2021 · 5dbec90 · 5dbec90
2 parents 1cee8a4 + 0d004ec
commit 5dbec90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Brewed/Model/ManagedServices.swift b/Brewed/Model/ManagedServices.swift
@@ -10,6 +10,8 @@ import Foundation
 class ManagedServices: ObservableObject, FileMonitorDelegate, FolderMonitorDelegate {
     @Published var services: [Service] = []
 
+    @Published var refreshing = false
+
     private var monitors: [URL: FilesystemMonitor] = [:]
 
     func update(service: Service) {
@@ -25,6 +27,7 @@ class ManagedServices: ObservableObject, FileMonitorDelegate, FolderMonitorDeleg
     }
 
     func refresh() {
+        refreshing = true
         ListServicesCommand().exec()
             .done { services in
                 self.monitors.removeAll()
@@ -48,6 +51,8 @@ class ManagedServices: ObservableObject, FileMonitorDelegate, FolderMonitorDeleg
                         monitor.delegate = self
                     }
                 }
+            }.ensure {
+                self.refreshing = false
             }.cauterize()
     }
 

diff --git a/Brewed/View/ContentView.swift b/Brewed/View/ContentView.swift
@@ -34,6 +34,10 @@ struct ContentView: View {
             )
         }
         .toolbar {
+            if managedServices.refreshing {
+                ProgressView().controlSize(.small)
+            }
+
             Button(action: {
                 managedServices.refresh()
             }) {

diff --git a/Brewed/View/ServiceRow.swift b/Brewed/View/ServiceRow.swift
@@ -67,7 +67,7 @@ struct ServiceRow: View {
                     }
                 }
             }
-        }.disabled(executingCommand)
+        }.disabled(executingCommand || managedServices.refreshing)
     }
 
     func run() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ struct ServiceRow: View { @@
                         }
                     }
                 }
-            }.disabled(executingCommand)
+            }.disabled(executingCommand || managedServices.refreshing)
         }
         func run() {
@@ Expand Down @@