feat: Development commit

1 files changed, 10 insertions, 7 deletions

diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift
index 253e9ef..b3fb031 100644
--- a/Sora/Data/Booru/BooruManager.swift
+++ b/Sora/Data/Booru/BooruManager.swift
@@ -86,9 +86,8 @@ class BooruManager: ObservableObject {
 
     isLoading = true
 
-    currentTask?.cancel()
+    cancelCurrentTask()
 
-    currentTask = nil
     currentTask = Task {
       defer { isLoading = false }
 
@@ -132,9 +131,7 @@ class BooruManager: ObservableObject {
 
     searchText = tags.joined(separator: " ")
 
-    currentTask?.cancel()
-
-    currentTask = nil
+    cancelCurrentTask()
 
     fetchPosts(page: 1, tags: tags, replace: true)
   }
@@ -166,7 +163,7 @@ class BooruManager: ObservableObject {
 
     searchText = previousQuery.tags.joined(separator: " ")
 
-    currentTask?.cancel()
+    cancelCurrentTask()
 
     currentTask = Task { isNavigatingHistory = false }
   }
@@ -182,7 +179,7 @@ class BooruManager: ObservableObject {
     searchText = nextQuery.tags.joined(separator: " ")
 
     clearCachedPages()
-    currentTask?.cancel()
+    cancelCurrentTask()
 
     currentTask = Task { isNavigatingHistory = false }
   }
@@ -302,6 +299,12 @@ class BooruManager: ObservableObject {
     .value
   }
 
+  private func cancelCurrentTask() {
+    currentTask?.cancel()
+
+    currentTask = nil
+  }
+
   func updateTagsCacheSize() {
     cacheSize = tagsCacheFileURL.flatMap { url in
       ByteCountFormatter.string(