From 86744226b1f423742fc9663300bd0e322807a1ee Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sat, 22 Feb 2025 00:37:31 -0800
Subject: feat: Development commit

---
 Sora/Data/Booru/BooruManager.swift       |  4 ++++
 Sora/Data/Booru/BooruPostFileType.swift  |  6 +++---
 Sora/Data/Booru/BooruPostXMLParser.swift |  7 ++-----
 Sora/Data/Booru/BooruProvider.swift      | 14 ++------------
 4 files changed, 11 insertions(+), 20 deletions(-)

(limited to 'Sora/Data/Booru')

diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift
index c4e9016..d650593 100644
--- a/Sora/Data/Booru/BooruManager.swift
+++ b/Sora/Data/Booru/BooruManager.swift
@@ -155,4 +155,8 @@ class BooruManager: ObservableObject {
       nil
     }
   }
+
+  deinit {
+    currentTask?.cancel()
+  }
 }
diff --git a/Sora/Data/Booru/BooruPostFileType.swift b/Sora/Data/Booru/BooruPostFileType.swift
index 62900db..f1f98b7 100644
--- a/Sora/Data/Booru/BooruPostFileType.swift
+++ b/Sora/Data/Booru/BooruPostFileType.swift
@@ -1,5 +1,5 @@
 enum BooruPostFileType: String, CaseIterable {
-  case original
-  case sample
-  case preview
+  case original = "Original"
+  case preview = "Preview"
+  case sample = "Sample"
 }
diff --git a/Sora/Data/Booru/BooruPostXMLParser.swift b/Sora/Data/Booru/BooruPostXMLParser.swift
index 5149e05..3bce127 100644
--- a/Sora/Data/Booru/BooruPostXMLParser.swift
+++ b/Sora/Data/Booru/BooruPostXMLParser.swift
@@ -58,9 +58,6 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate {
         return
       }
 
-      let hasNotesStr = attributeDict["has_notes"] ?? "false"
-      let hasCommentsStr = attributeDict["has_comments"] ?? "false"
-
       currentPost = BooruPost(
         id: id,
         height: height,
@@ -81,8 +78,8 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate {
         createdAt: parseCreatedAt(createdAt)!,
         status: status,
         source: source,
-        hasNotes: hasNotesStr == "true",
-        hasComments: hasCommentsStr == "true",
+        hasNotes: (attributeDict["has_notes"] ?? "false") == "true",
+        hasComments: (attributeDict["has_comments"] ?? "false") == "true",
         previewWidth: previewWidth,
         previewHeight: previewHeight
       )
diff --git a/Sora/Data/Booru/BooruProvider.swift b/Sora/Data/Booru/BooruProvider.swift
index 4de543b..19e5234 100644
--- a/Sora/Data/Booru/BooruProvider.swift
+++ b/Sora/Data/Booru/BooruProvider.swift
@@ -1,14 +1,4 @@
 enum BooruProvider: String, CaseIterable, Decodable, Encodable {
-  case yandere
-  case safebooru
-
-  func formatted() -> String {
-    switch self {
-    case .yandere:
-      "yande.re"
-
-    case .safebooru:
-      "Safebooru"
-    }
-  }
+  case safebooru = "Safebooru"
+  case yandere = "yande.re"
 }
-- 
cgit v1.2.3