Merge pull request #71 from qwertyyb/feature/preferences-refresh

fix: 修复多次打开首选项窗口会导致内存泄漏的问题
qwertyyb · Jun 29, 2022 · 4443664 · 4443664
2 parents 7a575fb + 093d8f7
commit 4443664
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/Fire/Preferences/FirePreferencesController.swift b/Fire/Preferences/FirePreferencesController.swift
@@ -13,6 +13,10 @@ class FirePreferencesController: NSObject, NSWindowDelegate {
     private var controller: PreferencesWindowController?
     static let shared = FirePreferencesController()
 
+    var isVisible: Bool {
+        controller?.window?.isVisible ?? false
+    }
+
     func show() {
         if let controller = controller {
             controller.show()
@@ -61,10 +65,4 @@ class FirePreferencesController: NSObject, NSWindowDelegate {
         self.controller?.window?.delegate = self
         self.controller?.show()
     }
-
-    func windowWillClose(_ notification: Notification) {
-        Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { _ in
-            self.controller = nil
-        }
-    }
 }
diff --git a/Fire/Preferences/StatisticsPane.swift b/Fire/Preferences/StatisticsPane.swift
@@ -56,16 +56,15 @@ class DateCountData: ObservableObject {
     @Published var total: Int64 = 0
 
     var cancellables = Set<AnyCancellable>()
-    private var observer: Any?
 
     init() {
         refresh()
-        observer = NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(refresh),
-            name: Statistics.updated,
-            object: nil
-        )
+        NotificationCenter.default
+            .publisher(for: Statistics.updated)
+            .sink { _ in
+                self.refresh()
+            }
+            .store(in: &cancellables)
         $startDate.sink { date in
             self.refreshData(startDate: date, endDate: nil)
         }
@@ -77,21 +76,28 @@ class DateCountData: ObservableObject {
     }
 
     deinit {
-        guard let observer = self.observer else {
-            return
+        cancellables.forEach { cancellable in
+            cancellable.cancel()
         }
-        NotificationCenter.default.removeObserver(observer)
-        self.observer = nil
+        cancellables = []
     }
 
     @objc func refresh() {
         NSLog("[DateCountData] refresh start: \(startDate)")
+        if !FirePreferencesController.shared.isVisible {
+            NSLog("[DateCountData] refresh cancel: not visible")
+            return
+        }
         total = Statistics.shared.queryTotalCount()
         self.refreshData(startDate: nil, endDate: nil)
     }
-    
+
     func refreshData(startDate: Date?, endDate: Date?) {
-        data = Statistics.shared.queryCountByDate(startDate: startDate ?? self.startDate, endDate: endDate ?? self.endDate)
+        data = Statistics.shared
+            .queryCountByDate(
+                startDate: startDate ?? self.startDate,
+                endDate: endDate ?? self.endDate
+            )
     }
 
     func clear() {
@@ -100,7 +106,7 @@ class DateCountData: ObservableObject {
 }
 
 struct StatisticsPane: View {
-    @ObservedObject var dateCountData = DateCountData()
+    @StateObject var dateCountData = DateCountData()
     @Default(.enableStatistics) private var enableStatistics
     @State private var showAlert = false