diff options
| -rw-r--r-- | Sora/Data/Booru/BooruManager.swift | 12 | ||||
| -rw-r--r-- | Sora/Data/Settings/SettingsManager.swift | 4 | ||||
| -rw-r--r-- | Sora/Views/Post/Grid/PostGridView.swift | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift index 3e94b56..49b1be3 100644 --- a/Sora/Data/Booru/BooruManager.swift +++ b/Sora/Data/Booru/BooruManager.swift @@ -78,7 +78,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng guard !isLoading else { return } let pageValue = flavor == .gelbooru ? page - 1 : page - guard let url = urlForPosts(page: pageValue, limit: limit, tags: tags) else { return } + guard let url = url(forPosts: pageValue, limit: limit, tags: tags) else { return } let cacheKey = "\(url.absoluteString.hashValue)_\(replace)" as NSString // swiftlint:disable:this legacy_objc_type if let cachedEntry = pageCache.object(forKey: cacheKey), @@ -262,7 +262,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } func searchTags(name: String) async -> [BooruTag] { - guard let url = urlForTagsSearch(name: name) else { return [] } + guard let url = url(forTagsSearch: name) else { return [] } do { let data = try await requestURL(url) @@ -280,7 +280,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } // MARK: - Private Methods - func urlForPosts(page: Int, limit: Int, tags: [String]) -> URL? { + func url(forPosts page: Int, limit: Int, tags: [String]) -> URL? { let tagString = tags.joined(separator: "+") let cacheKey = "posts_\(page)_\(limit)_\(tagString.hashValue)" @@ -351,7 +351,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng return url } - private func urlForTags(limit: Int, order: String = "count") -> URL? { + private func url(forTags limit: Int, order: String = "count") -> URL? { switch flavor { case .moebooru: var components = URLComponents() @@ -387,7 +387,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng } } - private func urlForTagsSearch(name: String) -> URL? { + private func url(forTagsSearch name: String) -> URL? { switch flavor { case .moebooru: var components = URLComponents() @@ -452,7 +452,7 @@ class BooruManager: ObservableObject { // swiftlint:disable:this type_body_leng return Array(uniquePosts.values) } - private func getXMLParser(for provider: BooruProvider) -> BooruPostXMLParser { + private func xmlParser(for provider: BooruProvider) -> BooruPostXMLParser { parserPoolLock.lock() defer { parserPoolLock.unlock() } diff --git a/Sora/Data/Settings/SettingsManager.swift b/Sora/Data/Settings/SettingsManager.swift index 6f9cb41..c1a0fd2 100644 --- a/Sora/Data/Settings/SettingsManager.swift +++ b/Sora/Data/Settings/SettingsManager.swift @@ -1180,7 +1180,7 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l return word } - func addDummyBookmarks() { + func addSampleBookmarks() { for _ in 0..<10 { let randomTags: [String] = Array(repeating: randomWord(), count: Int.random(in: 1...5)) @@ -1188,7 +1188,7 @@ class SettingsManager: ObservableObject { // swiftlint:disable:this type_body_l } } - func addDummySearchHistory() { + func addSampleSearchHistory() { for _ in 0..<10 { let randomTags: [String] = Array(repeating: randomWord(), count: Int.random(in: 1...5)) diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift index 9070396..7cfa206 100644 --- a/Sora/Views/Post/Grid/PostGridView.swift +++ b/Sora/Views/Post/Grid/PostGridView.swift @@ -625,7 +625,7 @@ struct PostGridView: View { // swiftlint:disable:this type_body_length let provider = manager.provider let pageValue = flavor == .gelbooru ? page - 1 : page - guard let url = manager.urlForPosts(page: pageValue, limit: limit, tags: tags) else { return } + guard let url = manager.url(forPosts: pageValue, limit: limit, tags: tags) else { return } do { let data = try await manager.requestURL(url) |