fix: Refresh iOS folders when foregrounding the app (#482)

This change also includes a drive-by fix to a bug which led to duplicate `ApplicationModel` instances, causing unnecessary directory indexing.
inseven · Nov 26, 2022 · da5715e · da5715e
1 parent 68fd192
commit da5715e
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 26 deletions.
diff --git a/core/Sources/FileawayCore/Model/ApplicationModel.swift b/core/Sources/FileawayCore/Model/ApplicationModel.swift
@@ -26,19 +26,6 @@ import SwiftUI
 import AppKit
 #endif
 
-public struct ApplicationModelKey: EnvironmentKey {
-    @MainActor public static var defaultValue: ApplicationModel = ApplicationModel()
-}
-
-extension EnvironmentValues {
-
-    public var applicationModel: ApplicationModel {
-        get { self[ApplicationModelKey.self] }
-        set { self[ApplicationModelKey.self] = newValue }
-    }
-
-}
-
 public class ApplicationModel: ObservableObject {
 
     public let settings = Settings()

diff --git a/core/Sources/FileawayCore/Utilities/DirectoryMonitor.swift b/core/Sources/FileawayCore/Utilities/DirectoryMonitor.swift
@@ -18,20 +18,26 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import Combine
 import Foundation
 
 #if os(macOS)
 import EonilFSEvents
+#else
+import UIKit
 #endif
 
 public class DirectoryMonitor: ObservableObject {
 
     let locations: [URL]
     let syncQueue = DispatchQueue(label: "DirectoryMonitor.syncQueue")
 
+    var cancellables: Set<AnyCancellable> = []
+
     @MainActor @Published var files: Set<URL>? = nil
 
 #if os(macOS)
+
     lazy var stream: EonilFSEventStream = {
         let stream = try! EonilFSEventStream(
             pathsToWatch: self.locations.map { $0.path },
@@ -63,14 +69,27 @@ public class DirectoryMonitor: ObservableObject {
         stream.setDispatchQueue(syncQueue)
         return stream
     }()
+
 #endif
 
+
     public init(locations: [URL]) {
         self.locations = locations
     }
 
     public func start() {
         dispatchPrecondition(condition: .notOnQueue(syncQueue))
+
+#if os(iOS)
+        NotificationCenter.default
+            .publisher(for: UIApplication.willEnterForegroundNotification)
+            .sink { foreground in
+                print("Refreshing monitor for \(self.locations).")
+                self.refresh()
+            }
+            .store(in: &cancellables)
+#endif
+
         syncQueue.async {
 #if os(macOS)
             try! self.stream.start()
@@ -89,6 +108,7 @@ public class DirectoryMonitor: ObservableObject {
             self.stream.stop()
         }
 #endif
+        cancellables.removeAll()
     }
 
     public func refresh() {

diff --git a/core/Sources/FileawayCore/Views/Viewer/LocationMenuItems.swift b/core/Sources/FileawayCore/Views/Viewer/LocationMenuItems.swift
@@ -22,7 +22,7 @@ import SwiftUI
 
 public struct LocationMenuItems: View {
 
-    @Environment(\.applicationModel) private var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @EnvironmentObject private var sceneModel: SceneModel
 
     private var url: URL

diff --git a/core/Sources/FileawayCore/Views/Viewer/LocationRow.swift b/core/Sources/FileawayCore/Views/Viewer/LocationRow.swift
@@ -24,7 +24,7 @@ import FilePicker
 
 struct LocationRow: View {
 
-    @Environment(\.applicationModel) private var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @ObservedObject var directoryViewModel: DirectoryViewModel
 
     var body: some View {

diff --git a/core/Sources/FileawayCore/Views/Viewer/LocationSection.swift b/core/Sources/FileawayCore/Views/Viewer/LocationSection.swift
@@ -24,7 +24,7 @@ import FilePicker
 
 public struct LocationSection: View {
 
-    @Environment(\.applicationModel) private var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
 
 #if os(iOS)
     @Environment(\.editMode) private var editMode

diff --git a/core/Sources/FileawayCore/Views/Viewer/Sidebar.swift b/core/Sources/FileawayCore/Views/Viewer/Sidebar.swift
@@ -22,7 +22,7 @@ import SwiftUI
 
 public struct Sidebar: View {
 
-    @Environment(\.applicationModel) var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @ObservedObject var sceneModel: SceneModel
 
     public init(sceneModel: SceneModel) {

diff --git a/ios/Fileaway/FileawayApp.swift b/ios/Fileaway/FileawayApp.swift
@@ -31,7 +31,7 @@ struct AnytimeApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView(applicationModel: applicationModel)
-                .environment(\.applicationModel, applicationModel)
+                .environmentObject(applicationModel)
         }
     }
 

diff --git a/ios/Fileaway/Views/Wizard/RulePicker.swift b/ios/Fileaway/Views/Wizard/RulePicker.swift
@@ -25,8 +25,8 @@ import FileawayCore
 struct RulePicker: View {
 
     @Environment(\.dismiss) var dismiss
-    @Environment(\.applicationModel) var applicationModel
 
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @StateObject var rulePickerModel: RulePickerModel
 
     private let url: URL

diff --git a/ios/Fileaway/Views/Wizard/RulePickerRow.swift b/ios/Fileaway/Views/Wizard/RulePickerRow.swift
@@ -24,7 +24,7 @@ import FileawayCore
 
 struct RulePickerRow: View {
 
-    @Environment(\.applicationModel) var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
 
     private let url: URL
     private let ruleModel: RuleModel

diff --git a/ios/Fileaway/Views/Wizard/WizardView.swift b/ios/Fileaway/Views/Wizard/WizardView.swift
@@ -24,9 +24,9 @@ import FileawayCore
 
 struct WizardView: View {
 
-    @Environment(\.applicationModel) var applicationModel
     @Environment(\.dismiss) var dismiss
 
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @StateObject var wizardModel = WizardModel()
 
     let file: FileInfo

diff --git a/macos/Fileaway/FileawayApp.swift b/macos/Fileaway/FileawayApp.swift
@@ -49,7 +49,7 @@ struct FileawayApp: App {
 
         WindowGroup(id: "main") {
             ContentView(applicationModel: applicationModel)
-                .environment(\.applicationModel, applicationModel)
+                .environmentObject(applicationModel)
         }
         .commands {
             ToolbarCommands()

diff --git a/macos/Fileaway/Scenes/Wizard.swift b/macos/Fileaway/Scenes/Wizard.swift
@@ -36,7 +36,7 @@ struct Wizard: Scene {
         WindowGroup(id: Self.windowID, for: URL.self) { $url in
             if let url = url {
                 WizardView(url: url)
-                    .environment(\.applicationModel, applicationModel)
+                    .environmentObject(applicationModel)
             }
         }
     }

diff --git a/macos/Fileaway/Toolbars/SelectionToolbar.swift b/macos/Fileaway/Toolbars/SelectionToolbar.swift
@@ -26,9 +26,9 @@ import FileawayCore
 
 struct SelectionToolbar: CustomizableToolbarContent {
 
-    @Environment(\.applicationModel) var manager
     @Environment(\.openWindow) var openWindow
 
+    @EnvironmentObject private var applicationModel: ApplicationModel
     @ObservedObject var directoryViewModel: DirectoryViewModel
 
     var body: some CustomizableToolbarContent {

diff --git a/macos/Fileaway/Views/Settings/GeneralSettingsView.swift b/macos/Fileaway/Views/Settings/GeneralSettingsView.swift
@@ -24,7 +24,7 @@ import FileawayCore
 
 struct GeneralSettingsView: View {
 
-    @Environment(\.applicationModel) var applicationModel: ApplicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
 
     var body: some View {
         FileTypesView(settings: applicationModel.settings)

diff --git a/macos/Fileaway/Views/Wizard/WizardView.swift b/macos/Fileaway/Views/Wizard/WizardView.swift
@@ -34,7 +34,7 @@ class RulesWizardModel: ObservableObject {
 
 struct WizardView: View {
 
-    @Environment(\.applicationModel) var applicationModel
+    @EnvironmentObject private var applicationModel: ApplicationModel
 
     @StateObject var rulesWizardModel = RulesWizardModel()