feat: Development commit

1 files changed, 32 insertions, 14 deletions

diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift
index 6d96bdc..518b305 100644
--- a/Sora/Views/Post/Grid/PostGridView.swift
+++ b/Sora/Views/Post/Grid/PostGridView.swift
@@ -23,6 +23,7 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
   @State private var localEndOfData = false
   @State private var localError: Error?
   @State private var hasAppearedBefore = false
+  @State private var currentLocalTask: Task<Void, Never>?
 
   init(
     selectedTab: Binding<Int>, navigationPath: Binding<NavigationPath>, initialTag: String? = nil
@@ -252,7 +253,7 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
             await performLocalSearch()
           }
         } else {
-          Task(priority: .userInitiated) {
+          currentLocalTask = Task(priority: .userInitiated) {
             await fetchLocalPosts(
               page: 1,
               tags: localSearchText.components(separatedBy: .whitespaces).filter { component in
@@ -268,8 +269,8 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
       #if os(macOS)
         ToolbarItem {
           Button(action: {
-            Task {
-              if initialTag != nil {
+            if initialTag != nil {
+              currentLocalTask = Task(priority: .userInitiated) {
                 await fetchLocalPosts(
                   page: 1,
                   tags: localSearchText.components(separatedBy: .whitespaces).filter { component in
@@ -277,7 +278,9 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
                   },
                   replace: true
                 )
-              } else {
+              }
+            } else {
+              Task(priority: .userInitiated) {
                 await manager.fetchPosts(page: 1, tags: manager.tags, replace: true)
               }
             }
@@ -395,13 +398,16 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
     .navigationTitle(initialTag != nil ? initialTag! : "Posts")
     .refreshable {
       if initialTag != nil {
-        await fetchLocalPosts(
-          page: 1,
-          tags: localSearchText.components(separatedBy: .whitespaces).filter { component in
-            !component.isEmpty
-          },
-          replace: true
-        )
+        currentLocalTask = Task(priority: .userInitiated) {
+          await fetchLocalPosts(
+            page: 1,
+            tags: localSearchText.components(separatedBy: .whitespaces).filter { component in
+              !component.isEmpty
+            },
+            replace: true
+          )
+        }
+        await currentLocalTask?.value
       } else {
         manager.clearCachedPages()
         Task(priority: .userInitiated) {
@@ -516,9 +522,14 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
   ) async {
     guard !localIsLoading else { return }
 
+    currentLocalTask?.cancel()
+
     localIsLoading = true
 
-    defer { localIsLoading = false }
+    defer {
+      localIsLoading = false
+      currentLocalTask = nil
+    }
 
     let flavor = manager.flavor
     let provider = manager.provider
@@ -528,6 +539,9 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
 
     do {
       let data = try await manager.requestURL(url)
+
+      guard !Task.isCancelled else { return }
+
       let newPosts = await withCheckedContinuation { continuation in
         DispatchQueue.global(qos: .userInitiated).async {
           let parsedPosts = BooruManager.parsePosts(
@@ -541,6 +555,8 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
         }
       }
 
+      guard !Task.isCancelled else { return }
+
       withAnimation(nil) {
         if replace {
           localPosts = newPosts
@@ -552,9 +568,11 @@ struct PostGridView: View {  // swiftlint:disable:this type_body_length
         localEndOfData = newPosts.isEmpty
       }
     } catch {
-      localError = error
+      if (error as? URLError)?.code != .cancelled {
+        localError = error
 
-      debugPrint("PostGridView.fetchLocalPosts: \(error)")
+        debugPrint("PostGridView.fetchLocalPosts: \(error)")
+      }
     }
   }
 }