From 443916a5ee376feab0691eace4b53015723e1d33 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Tue, 8 Apr 2025 00:51:16 -0700 Subject: feat: Development commit --- Sora/Data/Booru/BooruManager.swift | 9 ++++----- Sora/Data/Booru/Post/BooruPostXMLParser.swift | 2 +- Sora/Data/Booru/Tag/BooruTagXMLParser.swift | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'Sora/Data') diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift index 8e9c5bd..3c7ed1d 100644 --- a/Sora/Data/Booru/BooruManager.swift +++ b/Sora/Data/Booru/BooruManager.swift @@ -65,8 +65,7 @@ class BooruManager: ObservableObject { updateTagsCacheSize() } - func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) async - { + func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) { guard !isLoading, let url = urlForPosts(page: flavor == .gelbooru ? page - 1 : page, limit: limit, tags: tags) else { return } @@ -145,7 +144,7 @@ class BooruManager: ObservableObject { currentTask = nil - Task { await fetchPosts(page: 1, tags: tags, replace: true) } + fetchPosts(page: 1, tags: tags, replace: true) } func loadNextPage() { @@ -154,7 +153,7 @@ class BooruManager: ObservableObject { Task { currentPage += 1 - await fetchPosts(page: currentPage, tags: tags) + fetchPosts(page: currentPage, tags: tags) if historyIndex >= 0 && historyIndex < searchHistory.count { var currentQuery = searchHistory[historyIndex] @@ -272,7 +271,7 @@ class BooruManager: ObservableObject { endOfData = newPosts.isEmpty if !endOfData { - posts = posts + newPosts + posts += newPosts postIndexMap.merge( Dictionary(uniqueKeysWithValues: newPosts.enumerated().map { ($0.element.id, $0.offset) }) diff --git a/Sora/Data/Booru/Post/BooruPostXMLParser.swift b/Sora/Data/Booru/Post/BooruPostXMLParser.swift index 4960a79..96aa23a 100644 --- a/Sora/Data/Booru/Post/BooruPostXMLParser.swift +++ b/Sora/Data/Booru/Post/BooruPostXMLParser.swift @@ -191,7 +191,7 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate { } #if DEBUG - func parser(_: XMLParser, parseErrorOccurred parseError: any Error) { + func parser(_: XMLParser, parseErrorOccurred parseError: Error) { print("parser: \(parseError)") } #endif diff --git a/Sora/Data/Booru/Tag/BooruTagXMLParser.swift b/Sora/Data/Booru/Tag/BooruTagXMLParser.swift index ebc5afd..5bb005c 100644 --- a/Sora/Data/Booru/Tag/BooruTagXMLParser.swift +++ b/Sora/Data/Booru/Tag/BooruTagXMLParser.swift @@ -62,7 +62,7 @@ class BooruTagXMLParser: NSObject, XMLParserDelegate { } #if DEBUG - func parser(_: XMLParser, parseErrorOccurred parseError: any Error) { + func parser(_: XMLParser, parseErrorOccurred parseError: Error) { print(parseError) } #endif -- cgit v1.2.3