Merge pull request #122 from rsyncOSX/version-3.0.0

Version 3.0.0

Author: rsyncOSX

RsyncUI/Model/Global/ObservableAddConfigurations.swift

@@ -42,6 +42,7 @@ final class ObservableAddConfigurations {
 
     var showsaveurls: Bool = false
 
+    /// THE BUG IS HERE
     func addConfig(_ profile: String?, _ configurations: [SynchronizeConfiguration]?) async -> [SynchronizeConfiguration]? {
         let getdata = NewTask(selectedrsynccommand.rawValue,
                               localcatalog.replacingOccurrences(of: "\"", with: ""),

RsyncUI/Model/Storage/Userconfiguration/ReadUserConfigurationJSON.swift

@@ -26,10 +26,10 @@ struct ReadUserConfigurationJSON {
 
             UserConfiguration(importeddata).setuserconfigdata()
             Logger.process.debugThreadOnly("ReadUserConfigurationJSON: Reading user configurations")
-        } catch let err {
+        } catch {
             Logger.process.errorMessageOnly("ReadUserConfigurationJSON: some ERROR reading user configurations from permanent storage")
-            let error = err
-            path.propagateError(error: error)
+            // let error = err
+            // path.propagateError(error: error)
         }
     }
 }

RsyncUI/Views/Detailsview/EstimateTableView.swift

@@ -22,7 +22,7 @@ struct EstimateTableView: View {
                         HStack {
                             Image(systemName: "arrowshape.right.fill")
                                 .foregroundStyle(Color(.blue))
-                            
+
                             if data.backupID.isEmpty == true {
                                 Text("No ID set")
                                     .foregroundStyle(color(uuid: data.id))
@@ -40,7 +40,7 @@ struct EstimateTableView: View {
                                 .foregroundStyle(color(uuid: data.id))
                         }
                     }
-                    
+
                     ConfigurationTaskBadge(task: data.task)
                 }
             }

RsyncUI/Views/Detailsview/SummarizedDetailsContentView.swift

@@ -153,7 +153,7 @@ struct SummarizedDetailsContentView: View {
                             Text(data.backupID)
                         }
                     }
-                    
+
                     ConfigurationTaskBadge(task: data.task)
                 }
             }

RsyncUI/Views/InspectorViews/Add/extensionAddTaskView+BusinessLogic.swift

@@ -25,9 +25,20 @@ extension AddTaskView {
         case .localcatalogField: focusField = .remotecatalogField
         case .remotecatalogField: focusField = .remoteuserField
         case .remoteuserField: focusField = .remoteserverField
-        case .snapshotnumField: validateAndUpdate()
+        case .snapshotnumField:
+            Task { @MainActor in
+                _ = await validateAndUpdate()
+            }
         case .remoteserverField:
-            if newdata.selectedconfig == nil { addConfig() } else { validateAndUpdate() }
+            if newdata.selectedconfig == nil {
+                Task { @MainActor in
+                    _ = await addConfig()
+                }
+            } else {
+                Task { @MainActor in
+                    _ = await validateAndUpdate()
+                }
+            }
             focusField = nil
         default: return
         }
@@ -84,7 +95,7 @@ extension AddTaskView {
 
 extension AddTaskView {
     /// The verify returns true when data is OK
-    var disableadd: Bool {
+    var ddisableadd: Bool {
         VerifyObservableAddConfiguration(observed: newdata).verify()
     }
 }

RsyncUI/Views/InspectorViews/Add/extensionAddTaskView+ViewBuilders.swift

@@ -38,10 +38,12 @@ extension AddTaskView {
                 ConditionalGlassButton(systemImage: "plus",
                                        text: "Add",
                                        helpText: "Add task") {
-                    addConfig()
-                    showAddPopover = false
-                    newdata.resetForm()
-                }.disabled(!disableadd)
+                    Task { @MainActor in
+                        if await addConfig() {
+                            showAddPopover = false
+                        }
+                    }
+                }
 
                 Spacer()
 

RsyncUI/Views/InspectorViews/Add/extensionAddTaskView.swift

@@ -10,25 +10,29 @@ import SwiftUI
 // MARK: - Configuration Actions
 
 extension AddTaskView {
-    func addConfig() {
+    @MainActor
+    func addConfig() async -> Bool {
         let profile = rsyncUIdata.profile
-        Task { @MainActor in
-            rsyncUIdata.configurations = await newdata.addConfig(profile, rsyncUIdata.configurations)
-            if SharedReference.shared.duplicatecheck {
-                if let configurations = rsyncUIdata.configurations {
-                    VerifyDuplicates(configurations)
-                }
+        let beforeCount = rsyncUIdata.configurations?.count ?? 0
+        rsyncUIdata.configurations = await newdata.addConfig(profile, rsyncUIdata.configurations)
+        if SharedReference.shared.duplicatecheck {
+            if let configurations = rsyncUIdata.configurations {
+                VerifyDuplicates(configurations)
             }
         }
+        return (rsyncUIdata.configurations?.count ?? 0) > beforeCount
     }
 
-    func validateAndUpdate() {
+    @MainActor
+    func validateAndUpdate() async -> Bool {
         let profile = rsyncUIdata.profile
-        Task { @MainActor in
-            rsyncUIdata.configurations = await newdata.updateConfig(profile, rsyncUIdata.configurations)
-            // Reset after Update
+        let selectedHiddenID = newdata.selectedconfig?.hiddenID
+        rsyncUIdata.configurations = await newdata.updateConfig(profile, rsyncUIdata.configurations)
+        let didUpdate = selectedHiddenID != nil && newdata.selectedconfig == nil
+        if didUpdate {
             clearSelection()
         }
+        return didUpdate
     }
 }
 
@@ -37,7 +41,9 @@ extension AddTaskView {
 extension AddTaskView {
     var updateButton: some View {
         ConditionalGlassButton(systemImage: "arrow.down", text: "Update", helpText: "Update task") {
-            validateAndUpdate()
+            Task { @MainActor in
+                _ = await validateAndUpdate()
+            }
         }
     }
 

RsyncUI/Views/Profiles/ProfilesToUpdateView.swift

@@ -14,9 +14,7 @@ struct ProfilesToUpdateView: View {
     var body: some View {
         Table(allconfigurations) {
             TableColumn("Synchronize ID : profilename") { data in
-                
                 HStack(spacing: 4) {
-                    
                     let split = data.backupID.split(separator: " : ")
                     if split.count > 1 {
                         let left = Text(String(split[0]))
@@ -26,7 +24,7 @@ struct ProfilesToUpdateView: View {
                     } else {
                         Text(data.backupID)
                     }
-                    
+
                     ConfigurationTaskBadge(task: data.task)
                 }
             }

RsyncUI/Views/Sidebar/SidebarStatusMessagesView.swift

@@ -50,7 +50,6 @@ struct SidebarStatusMessagesView: View {
             Text(rsyncVersionShort)
                 .font(.caption2)
                 .foregroundStyle(.secondary).foregroundStyle(.secondary)
-            
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 6)