Wrap search in scheduler

JacobHearst · Aug 17, 2022 · ecad02b · ecad02b
1 parent 9312410
commit ecad02b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/MTGWizard/Components/SearchView/SearchView.swift b/MTGWizard/Components/SearchView/SearchView.swift
@@ -47,8 +47,6 @@ struct SearchView: View {
     }
 
     func handleSubmit() {
-        Task {
-            await viewModel.search()
-        }
+        viewModel.scheduleSearch()
     }
 }
diff --git a/MTGWizard/Components/SearchView/SearchViewModel.swift b/MTGWizard/Components/SearchView/SearchViewModel.swift
@@ -16,6 +16,7 @@ final class SearchViewModel: ObservableObject, SearchPersistable {
     private var storageLocation: StorageLocation
     private var debounceTimer: Timer?
     private var pageNumber = 1
+    private var task: Task<Void, Never>?
 
     @AppStorage("HideAlchemy") var hideAlchemy = false
     @AppStorage("DefaultFormat") var defaultFormat: Format?
@@ -37,7 +38,7 @@ final class SearchViewModel: ObservableObject, SearchPersistable {
     @Published var showFilters = false {
         didSet {
             guard !showFilters else { return }
-            Task { await search() }
+            scheduleSearch()
         }
     }
 
@@ -53,14 +54,22 @@ final class SearchViewModel: ObservableObject, SearchPersistable {
         self.searchText = state.searchTerm
         self.filters = state.filters
 
-        Task { await search() }
+        scheduleSearch()
     }
 
     // MARK: Search
     func debounceSearch() {
         debounceTimer?.invalidate()
         debounceTimer = Timer.scheduledTimer(withTimeInterval: 0.5, repeats: false) { _ in
-            Task { await self.search() }
+            self.scheduleSearch()
+        }
+    }
+
+    func scheduleSearch() {
+        debounceTimer?.invalidate()
+        task?.cancel()
+        task = Task {
+            await search()
         }
     }
 
@@ -144,4 +153,12 @@ final class SearchViewModel: ObservableObject, SearchPersistable {
 
         isLoadingMore = false
     }
+
+    deinit {
+        // TODO: Is this necessary?
+        debounceTimer?.invalidate()
+        debounceTimer = nil
+        task?.cancel()
+        task = nil
+    }
 }
diff --git a/MTGWizard/CoreData/MTGWizard.xcdatamodeld/MTGWizard.xcdatamodel/contents b/MTGWizard/CoreData/MTGWizard.xcdatamodeld/MTGWizard.xcdatamodel/contents
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21256.2" systemVersion="21G72" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+    <entity name="Card" representedClassName="Card" syncable="YES" codeGenerationType="class">
+        <attribute name="data" optional="YES" attributeType="String"/>
+        <relationship name="onList" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="CardList" inverseName="hasCard" inverseEntity="CardList"/>
+    </entity>
+    <entity name="CardList" representedClassName="CardList" syncable="YES" codeGenerationType="class">
+        <attribute name="id" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <relationship name="hasCard" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Card" inverseName="onList" inverseEntity="Card"/>
+    </entity>
+</model>