diff options
| author | Fuwn <[email protected]> | 2025-07-02 04:04:53 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2025-07-02 04:04:53 -0700 |
| commit | dc6695672f85a137c7b98d5b091ec410750e06b2 (patch) | |
| tree | 8928680102c6fb8af98ab8010409bfd13d1c2815 /Sora/Data/Booru | |
| parent | feat: Development commit (diff) | |
| download | sora-testing-dc6695672f85a137c7b98d5b091ec410750e06b2.tar.xz sora-testing-dc6695672f85a137c7b98d5b091ec410750e06b2.zip | |
feat: Development commit
Diffstat (limited to 'Sora/Data/Booru')
| -rw-r--r-- | Sora/Data/Booru/BooruManager.swift | 95 |
1 files changed, 27 insertions, 68 deletions
diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift index 966f31f..2c4df79 100644 --- a/Sora/Data/Booru/BooruManager.swift +++ b/Sora/Data/Booru/BooruManager.swift @@ -2,15 +2,13 @@ import Alamofire import SwiftUI @MainActor -class BooruManager: ObservableObject { // swiftlint:disable:this type_body_length +class BooruManager: ObservableObject { // MARK: - Published Properties @Published var posts: [BooruPost] = [] - @Published var allTags: [BooruTag] = [] @Published var isLoading = false @Published var currentPage = 1 @Published var searchText = "" @Published var endOfData = false - @Published var cacheSize: String? @Published var selectedPost: BooruPost? @Published var flavor: BooruProviderFlavor @Published var domain: String @@ -23,10 +21,6 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng // MARK: - Private Properties private var currentTask: Task<Void, Never>? - private let tagsCacheFileURL: URL? = FileManager.default.urls( - for: .cachesDirectory, in: .userDomainMask - ).first? - .appendingPathComponent("\(BooruProvider.safebooru.asFileNameComponent)_tags.json") private let pageCache = NSCache<NSString, BooruPageCacheEntry>() // swiftlint:disable:this legacy_objc_type private let cacheDuration: TimeInterval = 300 private let credentials: BooruProviderCredentials? @@ -62,12 +56,6 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } // MARK: - Public Methods - func initializeTags() { - loadCachedTags() - fetchAllTags() - updateTagsCacheSize() - } - func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) async { guard !isLoading else { return } @@ -198,41 +186,21 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng currentTask = Task { isNavigatingHistory = false } } - func fetchAllTags(limit: Int = 10_000) { - guard let url = urlForTags(limit: limit) else { return } - - Task { - do { - let data = try await requestURL(url) + func searchTags(name: String) async -> [BooruTag] { + guard let url = urlForTagsSearch(name: name) else { return [] } - guard !Task.isCancelled else { return } + do { + let data = try await requestURL(url) - allTags = BooruTagXMLParser(data: data).parse().sorted { $0.count > $1.count } + guard !Task.isCancelled else { return [] } - saveTagsToCache() - } catch { - if (error as? URLError)?.code != .cancelled { - debugPrint("BooruManager.fetchAllTags: \(error)") - } + return BooruTagXMLParser(data: data).parse().sorted { $0.count > $1.count } + } catch { + if (error as? URLError)?.code != .cancelled { + debugPrint("BooruManager.searchTags: \(error)") } - } - } - func clearCachedTags() { - try? tagsCacheFileURL.map { url in - try FileManager.default.removeItem(at: url) - updateTagsCacheSize() - } - } - - func updateTagsCacheSize() { - cacheSize = tagsCacheFileURL.flatMap { url in - ByteCountFormatter.string( - fromByteCount: Int64( - (try? FileManager.default.attributesOfItem(atPath: url.path)[.size] as? Int) ?? 0 - ), - countStyle: .file - ) + return [] } } @@ -280,6 +248,22 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } } + private func urlForTagsSearch(name: String) -> URL? { + switch flavor { + case .moebooru: + return URL(string: "https://\(domain)/tag.xml?name_pattern=\(name)&order=count") + + case .gelbooru: + return URL( + string: + "https://\(domain)/index.php?page=dapi&s=tag&q=index&name_pattern=%\(name)%&orderby=count" + ) + + case .danbooru: + return nil + } + } + nonisolated private func parsePosts( from data: Data, flavor: BooruProviderFlavor, @@ -325,31 +309,6 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } } - private func saveTagsToCache() { - if let url = tagsCacheFileURL { - do { - let data = try JSONEncoder().encode(allTags) - - try data.write(to: url) - updateTagsCacheSize() - } catch { - debugPrint("BooruManager.saveTagsToCache:", error) - } - } - } - - private func loadCachedTags() { - guard let url = tagsCacheFileURL else { return } - - if let data = try? Data(contentsOf: url), - let tags = try? JSONDecoder().decode([BooruTag].self, from: data) - { - allTags = tags - - updateTagsCacheSize() - } - } - private func requestURL(_ url: URL) async throws -> Data { let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "1.0" let buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "1" |