fix: Separate fields for setting the rule destination folder and file…

…name (#476)
inseven · Nov 22, 2022 · 904d084 · 904d084
1 parent 78e1fad
commit 904d084
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 12 deletions.
diff --git a/core/Sources/FileawayCore/Model/ComponentModel.swift b/core/Sources/FileawayCore/Model/ComponentModel.swift
@@ -28,7 +28,7 @@ public class ComponentModel: ObservableObject, Identifiable, Hashable {
     @Published public var type: ComponentType
     public var variable: VariableModel? = nil
 
-    public init(value: String, type: ComponentType, variable: VariableModel?) {
+    public init(value: String, type: ComponentType, variable: VariableModel? = nil) {
         self.id = UUID()
         self.value = value
         self.type = type

diff --git a/core/Sources/FileawayCore/Model/RuleModel.swift b/core/Sources/FileawayCore/Model/RuleModel.swift
@@ -41,6 +41,28 @@ public class RuleModel: ObservableObject, Identifiable, CustomStringConvertible,
         return self.name
     }
 
+    public var folder: ComponentModel {
+        get {
+            return destination.first ?? ComponentModel(value: "", type: .text)
+        }
+        set {
+            if destination.isEmpty {
+                destination.append(newValue)
+            } else {
+                destination[0] = newValue
+            }
+        }
+    }
+
+    public var filename: [ComponentModel] {
+        get {
+            return Array(destination[1...])
+        }
+        set {
+            destination = [destination[0]] + newValue
+        }
+    }
+
     public init(id: UUID, rootUrl: URL, name: String, variables: [VariableModel], destination: [ComponentModel]) {
         self.id = id
         self.rootUrl = rootUrl

diff --git a/ios/Fileaway/Views/Editor/RuleView.swift b/ios/Fileaway/Views/Editor/RuleView.swift
@@ -77,16 +77,20 @@ struct RuleView: View {
                     ErrorText(text: editingRuleModel.validate() ? nil : "Variable names must be unique.")
                 }
 
+                Section("Destination") {
+                    ComponentItem(ruleModel: self.editingRuleModel, component: self.editingRuleModel.folder)
+                }
+
                 Section {
-                    ForEach(editingRuleModel.destination) { component in
+                    ForEach(editingRuleModel.filename) { component in
                         ComponentItem(ruleModel: self.editingRuleModel, component: component)
                     }
                     .onMove { (fromOffsets, toOffset) in
-                        self.editingRuleModel.destination.move(fromOffsets: fromOffsets, toOffset: toOffset)
+                        self.editingRuleModel.filename.move(fromOffsets: fromOffsets, toOffset: toOffset)
                     }
-                    .onDelete { self.editingRuleModel.destination.remove(atOffsets: $0) }
+                    .onDelete { self.editingRuleModel.filename.remove(atOffsets: $0) }
                 } header: {
-                    Text("Destination")
+                    Text("Filename")
                 } footer: {
                     DestinationFooter(ruleModel: editingRuleModel)
                 }

diff --git a/macos/Fileaway/Views/Settings/DestinationTable.swift b/macos/Fileaway/Views/Settings/DestinationTable.swift
@@ -41,23 +41,20 @@ struct DestinationTable: View {
                 Table(selection: $selection) {
                     TableColumn("Component") { componentModel in
                         if componentModel.type == .text {
-                            HStack {
-                                ComponentValueTextField(componentModel: componentModel)
-                                SetFolderButton(ruleModel: ruleModel, componentModel: componentModel)
-                            }
+                            ComponentValueTextField(componentModel: componentModel)
                         } else {
                             Text(ruleModel.name(for: componentModel))
                                 .tokenAppearance()
                                 .tint(componentModel.variable!.color)
                         }
                     }
                 } rows: {
-                    ForEach(ruleModel.destination) { componentModel in
+                    ForEach(ruleModel.filename) { componentModel in
                         TableRow(componentModel)
                             .itemProvider(componentModel.id, as: .component)
                     }
                     .onInsert(ComponentModel.ID.self, as: .component) { index, ids in
-                        self.ruleModel.destination.move(ids: ids, toOffset: index)
+                        self.ruleModel.filename.move(ids: ids, toOffset: index)
                     }
                 }
                 .frame(minWidth: 500, minHeight: 200)

diff --git a/macos/Fileaway/Views/Settings/RuleDetailView.swift b/macos/Fileaway/Views/Settings/RuleDetailView.swift
@@ -34,8 +34,15 @@ struct RuleDetailView: View {
             VariablesTable(ruleModel: ruleModel)
             Text("Destination")
                 .font(.headline)
+            HStack {
+                TextField("", text: $ruleModel.folder.value)
+                SetFolderButton(ruleModel: ruleModel, componentModel: ruleModel.folder)
+            }
+            Text("Filename")
+                .font(.headline)
             DestinationTable(ruleModel: ruleModel)
             Spacer()
+                .layoutPriority(1)
         }
         .padding()
     }

diff --git a/macos/Fileaway/Views/Settings/VariablesTable.swift b/macos/Fileaway/Views/Settings/VariablesTable.swift
@@ -47,7 +47,7 @@ struct VariablesTable: View {
                 .onDeleteCommand {
                     ruleModel.remove(variableIds: selection)
                 }
-                .frame(minWidth: 500, minHeight: 200)
+                .frame(minWidth: 500, minHeight: 160)
 
                 VStack {
                     VStack {