From 7b470cd80eea4b4ef72a3ca8726b8a72a58b01ee Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sat, 22 Feb 2025 00:28:09 -0800 Subject: feat: Development commit --- Sora/Data/Booru/BooruManager.swift | 10 ++++++---- Sora/Data/Booru/BooruPostXMLParser.swift | 11 ++++++++--- Sora/Data/Booru/BooruTagXMLParser.swift | 11 ++++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) (limited to 'Sora/Data/Booru') diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift index 06a714e..c4e9016 100644 --- a/Sora/Data/Booru/BooruManager.swift +++ b/Sora/Data/Booru/BooruManager.swift @@ -8,9 +8,6 @@ class BooruManager: ObservableObject { @Published var currentPage: Int = 1 @Published var searchText = "" @Published var endOfData: Bool = false - #if os(macOS) - @Published var selectedPost: BooruPost? - #endif private var currentTask: Task? let provider: BooruProvider? var tags: [String] { @@ -25,6 +22,10 @@ class BooruManager: ObservableObject { .filter { !$0.isEmpty } } + #if os(macOS) + @Published var selectedPost: BooruPost? + #endif + init(_ provider: BooruProvider? = nil) { self.provider = provider @@ -50,7 +51,8 @@ class BooruManager: ObservableObject { guard let url = urlForPosts( - page: self.provider == .safebooru ? page - 1 : page, limit: limit, tags: tags) + page: self.provider == .safebooru ? page - 1 : page, limit: limit, tags: tags + ) else { return } diff --git a/Sora/Data/Booru/BooruPostXMLParser.swift b/Sora/Data/Booru/BooruPostXMLParser.swift index 79827aa..5149e05 100644 --- a/Sora/Data/Booru/BooruPostXMLParser.swift +++ b/Sora/Data/Booru/BooruPostXMLParser.swift @@ -20,8 +20,11 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate { } func parser( - _: XMLParser, didStartElement elementName: String, namespaceURI _: String?, - qualifiedName _: String?, attributes attributeDict: [String: String] = [:] + _: XMLParser, + didStartElement elementName: String, + namespaceURI _: String?, + qualifiedName _: String?, + attributes attributeDict: [String: String] = [:] ) { if elementName == "post" { guard let id = attributeDict["id"], @@ -87,7 +90,9 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate { } func parser( - _: XMLParser, didEndElement elementName: String, namespaceURI _: String?, + _: XMLParser, + didEndElement elementName: String, + namespaceURI _: String?, qualifiedName _: String? ) { if elementName == "post", let post = currentPost { diff --git a/Sora/Data/Booru/BooruTagXMLParser.swift b/Sora/Data/Booru/BooruTagXMLParser.swift index bba26c5..ebc5afd 100644 --- a/Sora/Data/Booru/BooruTagXMLParser.swift +++ b/Sora/Data/Booru/BooruTagXMLParser.swift @@ -20,8 +20,11 @@ class BooruTagXMLParser: NSObject, XMLParserDelegate { } func parser( - _: XMLParser, didStartElement elementName: String, namespaceURI _: String?, - qualifiedName _: String?, attributes attributeDict: [String: String] = [:] + _: XMLParser, + didStartElement elementName: String, + namespaceURI _: String?, + qualifiedName _: String?, + attributes attributeDict: [String: String] = [:] ) { if elementName == "tag" { guard let id = attributeDict["id"], @@ -46,7 +49,9 @@ class BooruTagXMLParser: NSObject, XMLParserDelegate { } func parser( - _: XMLParser, didEndElement elementName: String, namespaceURI _: String?, + _: XMLParser, + didEndElement elementName: String, + namespaceURI _: String?, qualifiedName _: String? ) { if elementName == "tag", let tag = currentTag { -- cgit v1.2.3