Fix PlayTools icon not updating (#809)

* fix: playtools icon not updating when removed * chore: cleanup code
PlayCover · Feb 23, 2023 · 6426ef7 · 6426ef7
1 parent 7b1416e
commit 6426ef7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/PlayCover/ViewModel/AppsVM.swift b/PlayCover/ViewModel/AppsVM.swift
@@ -22,7 +22,10 @@ class AppsVM: ObservableObject {
     func fetchApps() {
         Task { @MainActor in
             updatingApps = true
-            var result: [PlayApp] = []
+
+            filteredApps.removeAll()
+            apps.removeAll()
+
             do {
                 let containers = try AppContainer.containers()
                 let directoryContents = try FileManager.default
@@ -40,31 +43,20 @@ class AppsVM: ObservableObject {
                             app.container = container
                             print("Application installed under:", sub.path)
                         }
-                        result.append(app)
+                        apps.append(app)
+                        if uif.searchText.isEmpty || app.searchText.contains(uif.searchText.lowercased()) {
+                            filteredApps.append(app)
+                        }
                     }
                 }
 
             } catch let error as NSError {
                 print(error)
             }
 
-            apps = result
-
-            updateApps(result)
-        }
-    }
+            filteredApps.sort(by: { $0.name.lowercased() < $1.name.lowercased() })
 
-    @MainActor func updateApps(_ newApps: [PlayApp]) {
-        updatingApps = true
-        self.filteredApps.removeAll()
-        var filteredApps = newApps
-
-        if !uif.searchText.isEmpty {
-            filteredApps = newApps.filter({ $0.searchText.contains(uif.searchText.lowercased()) })
+            updatingApps = false
         }
-
-        filteredApps.sort(by: { $0.name.lowercased() < $1.name.lowercased() })
-        self.filteredApps.append(contentsOf: filteredApps)
-        updatingApps = false
     }
 }
diff --git a/PlayCover/ViewModel/StoreVM.swift b/PlayCover/ViewModel/StoreVM.swift
@@ -75,14 +75,13 @@ class StoreVM: ObservableObject {
 
     func fetchApps() {
         filteredApps.removeAll()
-        var result = apps
+        filteredApps = apps
         if !uif.searchText.isEmpty {
-            result = result.filter({
+            filteredApps = filteredApps.filter({
                 $0.name.lowercased().contains(uif.searchText.lowercased())
             })
         }
-        result.sort(by: { $0.name.lowercased() < $1.name.lowercased() })
-        filteredApps = result
+        filteredApps.sort(by: { $0.name.lowercased() < $1.name.lowercased() })
     }
 
     func resolveSources() {

diff --git a/PlayCover/Views/AppSettingsView.swift b/PlayCover/Views/AppSettingsView.swift
@@ -504,6 +504,7 @@ struct MiscView: View {
                             }
 
                             Task { @MainActor in
+                                AppsVM.shared.filteredApps = []
                                 AppsVM.shared.fetchApps()
                             }
                         }