Merge pull request #34 from shinrenpan/develop

v1.0.0
shinrenpan · Nov 4, 2024 · d6a1a31 · d6a1a31
2 parents 9c68b85 + 52cf03b
commit d6a1a31
Show file tree

Hide file tree

Showing 42 changed files with 283 additions and 251 deletions.
diff --git a/Sources/Extensions/AnyCodable+Extensions.swift b/Sources/Extensions/AnyCodable+Extensions.swift
@@ -7,7 +7,7 @@
 import AnyCodable
 import UIKit
 
-extension AnyCodable {
+extension AnyCodable: @unchecked @retroactive Sendable {
     subscript(index: Int) -> AnyCodable {
         anyArray?[safe: index] ?? AnyCodable(NSNull())
     }

diff --git a/Sources/Extensions/Kingfisher+Extensions.swift b/Sources/Extensions/Kingfisher+Extensions.swift
@@ -3,17 +3,31 @@
 //
 //  Created by Joe Pan on 2024/10/28.
 //
-//
 
 import UIKit
 import Kingfisher
 
 extension Kingfisher.ImageCache {
     func asyncCleanDiskCache() async {
         await withCheckedContinuation { continuation in
-            ImageCache.default.clearDiskCache {
+            clearDiskCache {
                 continuation.resume(returning: ())
             }
         }
     }
 }
+
+extension KingfisherManager {
+    func asyncRetrieveImage(with resource: Resource, options: KingfisherOptionsInfo? = nil) async throws -> KFCrossPlatformImage {
+        try await withCheckedThrowingContinuation { continuation in
+            retrieveImage(with: resource, options: options) { result in
+                switch result {
+                case let .success(value):
+                    continuation.resume(returning: value.image)
+                case let .failure(error):
+                    continuation.resume(throwing: error)
+                }
+            }
+        }
+    }
+}
diff --git a/Sources/Javascripts/Update.js b/Sources/Javascripts/Update.js
@@ -15,20 +15,16 @@ list.each(function() {
     comic.id = $(this).find('a').eq(0).attr('href').split('/').filter(Boolean).pop();
     // title
     comic.title = $(this).find('a').eq(0).attr('title');
+    // 圖片
+    // 圖片有載入是 scr, 未載入前是 data-src
+    comic.cover = $(this).find('img').eq(0).attr('src') || $(this).find('img').eq(0).attr('data-src');
     // 更新進度
     comic.note = $(this).find('.tt').eq(0).text();
     // 最後更新時間
     date = $(this).find('em').eq(0).text();
     timestamp = Date.parse(date);
     comic.lastUpdate = (timestamp + length) / 1000
-
-    // Detail
-    var detail = new Object();
-    // 圖片有載入是 scr, 未載入前是 data-src
-    detail.cover = $(this).find('img').eq(0).attr('src') || $(this).find('img').eq(0).attr('data-src');
-    comic.detail = detail
     results.push(comic);
-
     length--;
 });
 results;
diff --git a/Sources/MVVVR/Detail/DetailModel.swift b/Sources/MVVVR/Detail/DetailModel.swift
@@ -39,14 +39,14 @@ extension Detail {
         let title: String
         let author: String
         let description: String?
-        let cover: String?
+        let coverURI: String
         let favorited: Bool
 
-        init(comic: Comic) {
+        init(comic: Database.Comic) {
             self.title = comic.title
             self.author = comic.detail?.author ?? "Unknown"
             self.description = comic.detail?.desc
-            self.cover = comic.detail?.cover
+            self.coverURI = comic.cover
             self.favorited = comic.favorited
         }
     }
@@ -60,7 +60,7 @@ extension Detail {
             hasher.combine(id)
         }
 
-        init(episode: Comic.Episode, selected: Bool) {
+        init(episode: Database.Episode, selected: Bool) {
             self.id = episode.id
             self.title = episode.title
             self.selected = selected

diff --git a/Sources/MVVVR/Detail/DetailRouter.swift b/Sources/MVVVR/Detail/DetailRouter.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension Detail {
-    final class Router {
+    @MainActor final class Router {
         weak var vc: ViewController?
 
         // MARK: - Public

diff --git a/Sources/MVVVR/Detail/DetailViewController.swift b/Sources/MVVVR/Detail/DetailViewController.swift
@@ -50,6 +50,7 @@ extension Detail {
             _ = withObservationTracking {
                 vm.state
             } onChange: { [weak self] in
+                guard let self else { return }
                 Task { @MainActor [weak self] in
                     guard let self else { return }
                     if viewIfLoaded?.window == nil { return }

diff --git a/Sources/MVVVR/Detail/DetailViewModel.swift b/Sources/MVVVR/Detail/DetailViewModel.swift
@@ -10,7 +10,7 @@ import UIKit
 import WebParser
 
 extension Detail {
-    @Observable final class ViewModel {
+    @MainActor @Observable final class ViewModel {
         let comicId: String
         private(set) var state = State.none
         private let parser: Parser
@@ -62,7 +62,7 @@ extension Detail {
                         throw ParserError.timeout
                     }
 
-                    let result = try await parser.result()
+                    let result = try await parser.anyResult()
                     await handleLoadRemote(comic: comic, result: result)
                     actionLoadData()
                 }
@@ -81,14 +81,14 @@ extension Detail {
 
         // MARK: - Handle Action Result
 
-        private func handleLoadRemote(comic: Comic, result: Any) async {
+        private func handleLoadRemote(comic: Database.Comic, result: Any) async {
             let data = AnyCodable(result)
             comic.detail?.author = data["author"].string ?? ""
             comic.detail?.desc = data["desc"].string ?? ""
 
             let array = data["episodes"].anyArray ?? []
 
-            let episodes: [Comic.Episode] = array.compactMap {
+            let episodes: [Database.Episode] = array.compactMap {
                 guard let id = $0["id"].string, !id.isEmpty else {
                     return nil
                 }

diff --git a/Sources/MVVVR/Detail/DetailViewOutlet.swift b/Sources/MVVVR/Detail/DetailViewOutlet.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension Detail {
-    final class ViewOutlet {
+    @MainActor final class ViewOutlet {
         let mainView = UIView(frame: .zero)
             .setup(\.translatesAutoresizingMaskIntoConstraints, value: false)
             .setup(\.backgroundColor, value: .white)

diff --git a/Sources/MVVVR/Detail/DetailViews.swift b/Sources/MVVVR/Detail/DetailViews.swift
@@ -45,16 +45,14 @@ extension Detail {
             authorLabel.text = comic.author
             descLabel.text = comic.description
 
-            if let cover = comic.cover {
-                coverView.kf.setImage(
-                    with: URL(string: "https:\(cover)"),
-                    options: [
-                        .processor(DownsamplingImageProcessor(size: coverView.frame.size)),
-                        .scaleFactor(UIScreen.main.scale),
-                        .cacheOriginalImage,
-                    ]
-                )
-            }
+            coverView.kf.setImage(
+                with: URL(string: "https:\(comic.coverURI)"),
+                options: [
+                    .processor(DownsamplingImageProcessor(size: coverView.frame.size)),
+                    .scaleFactor(UIScreen.main.scale),
+                    .cacheOriginalImage,
+                ]
+            )
         }
 
         // MARK: - Setup Something

diff --git a/Sources/MVVVR/EpisodePicker/EpisodePickerModel.swift b/Sources/MVVVR/EpisodePicker/EpisodePickerModel.swift
@@ -47,7 +47,7 @@ extension EpisodePicker {
             hasher.combine(id)
         }
 
-        init(epidose: Comic.Episode, selected: Bool) {
+        init(epidose: Database.Episode, selected: Bool) {
             self.id = epidose.id
             self.title = epidose.title
             self.selected = selected

diff --git a/Sources/MVVVR/EpisodePicker/EpisodePickerRouter.swift b/Sources/MVVVR/EpisodePicker/EpisodePickerRouter.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension EpisodePicker {
-    final class Router {
+    @MainActor final class Router {
         weak var vc: ViewController?
     }
 }
diff --git a/Sources/MVVVR/EpisodePicker/EpisodePickerViewController.swift b/Sources/MVVVR/EpisodePicker/EpisodePickerViewController.swift
@@ -49,6 +49,7 @@ extension EpisodePicker {
             _ = withObservationTracking {
                 vm.state
             } onChange: { [weak self] in
+                guard let self else { return }
                 Task { @MainActor [weak self] in
                     guard let self else { return }
                     if viewIfLoaded?.window == nil { return }

diff --git a/Sources/MVVVR/EpisodePicker/EpisodePickerViewModel.swift b/Sources/MVVVR/EpisodePicker/EpisodePickerViewModel.swift
@@ -8,7 +8,7 @@ import Observation
 import UIKit
 
 extension EpisodePicker {
-    @Observable final class ViewModel {
+    @MainActor @Observable final class ViewModel {
         private(set) var state = State.none
         private let comicId: String
         private let epidoseId: String

diff --git a/Sources/MVVVR/EpisodePicker/EpisodePickerViewOutlet.swift b/Sources/MVVVR/EpisodePicker/EpisodePickerViewOutlet.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension EpisodePicker {
-    final class ViewOutlet {
+    @MainActor final class ViewOutlet {
         let mainView = UIView(frame: .zero)
             .setup(\.translatesAutoresizingMaskIntoConstraints, value: false)
             .setup(\.backgroundColor, value: .white)

diff --git a/Sources/MVVVR/Favorite/FavoriteModel.swift b/Sources/MVVVR/Favorite/FavoriteModel.swift
@@ -50,10 +50,10 @@ extension Favorite {
             hasher.combine(id)
         }
 
-        init(comic: Comic) {
+        init(comic: Database.Comic) {
             self.id = comic.id
             self.title = comic.title
-            self.coverURI = comic.detail?.cover ?? ""
+            self.coverURI = comic.cover
             self.lastUpdate = comic.lastUpdate
             self.hasNew = comic.hasNew
             self.note = comic.note

diff --git a/Sources/MVVVR/Favorite/FavoriteRouter.swift b/Sources/MVVVR/Favorite/FavoriteRouter.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension Favorite {
-    final class Router {
+    @MainActor final class Router {
         weak var vc: ViewController?
 
         // MARK: - Public

diff --git a/Sources/MVVVR/Favorite/FavoriteViewController.swift b/Sources/MVVVR/Favorite/FavoriteViewController.swift
@@ -39,6 +39,7 @@ extension Favorite {
             _ = withObservationTracking {
                 vm.state
             } onChange: { [weak self] in
+                guard let self else { return }
                 Task { @MainActor [weak self] in
                     guard let self else { return }
                     if viewIfLoaded?.window == nil { return }

diff --git a/Sources/MVVVR/Favorite/FavoriteViewModel.swift b/Sources/MVVVR/Favorite/FavoriteViewModel.swift
@@ -8,7 +8,7 @@ import Observation
 import UIKit
 
 extension Favorite {
-    @Observable final class ViewModel {
+    @MainActor @Observable final class ViewModel {
         private(set) var state = State.none
 
         // MARK: - Public

diff --git a/Sources/MVVVR/Favorite/FavoriteViewOutlet.swift b/Sources/MVVVR/Favorite/FavoriteViewOutlet.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension Favorite {
-    final class ViewOutlet {
+    @MainActor final class ViewOutlet {
         let mainView = UIView(frame: .zero)
             .setup(\.translatesAutoresizingMaskIntoConstraints, value: false)
 

diff --git a/Sources/MVVVR/History/HistoryModel.swift b/Sources/MVVVR/History/HistoryModel.swift
@@ -59,10 +59,10 @@ extension History {
             hasher.combine(id)
         }
 
-        init(comic: Comic) {
+        init(comic: Database.Comic) {
             self.id = comic.id
             self.title = comic.title
-            self.coverURI = comic.detail?.cover ?? ""
+            self.coverURI = comic.cover
             self.favorited = comic.favorited
             self.lastUpdate = comic.lastUpdate
             self.hasNew = comic.hasNew

diff --git a/Sources/MVVVR/History/HistoryRouter.swift b/Sources/MVVVR/History/HistoryRouter.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension History {
-    final class Router {
+    @MainActor final class Router {
         weak var vc: ViewController?
 
         // MARK: - Public

diff --git a/Sources/MVVVR/History/HistoryViewController.swift b/Sources/MVVVR/History/HistoryViewController.swift
@@ -39,6 +39,7 @@ extension History {
             _ = withObservationTracking {
                 vm.state
             } onChange: { [weak self] in
+                guard let self else { return }
                 Task { @MainActor [weak self] in
                     guard let self else { return }
                     if viewIfLoaded?.window == nil { return }

diff --git a/Sources/MVVVR/History/HistoryViewModel.swift b/Sources/MVVVR/History/HistoryViewModel.swift
@@ -8,7 +8,7 @@ import Observation
 import UIKit
 
 extension History {
-    @Observable final class ViewModel {
+    @MainActor @Observable final class ViewModel {
         private(set) var state = State.none
 
         // MARK: - Public

diff --git a/Sources/MVVVR/History/HistoryViewOutlet.swift b/Sources/MVVVR/History/HistoryViewOutlet.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension History {
-    final class ViewOutlet {
+    @MainActor final class ViewOutlet {
         let mainView = UIView(frame: .zero)
             .setup(\.translatesAutoresizingMaskIntoConstraints, value: false)
 

diff --git a/Sources/MVVVR/Reader/ReaderRouter.swift b/Sources/MVVVR/Reader/ReaderRouter.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension Reader {
-    final class Router {
+    @MainActor final class Router {
         weak var vc: ViewController?
 
         // MARK: - Public

diff --git a/Sources/MVVVR/Reader/ReaderViewController.swift b/Sources/MVVVR/Reader/ReaderViewController.swift
@@ -74,6 +74,7 @@ extension Reader {
             _ = withObservationTracking {
                 vm.state
             } onChange: { [weak self] in
+                guard let self else { return }
                 Task { @MainActor [weak self] in
                     guard let self else { return }
                     if viewIfLoaded?.window == nil { return }

diff --git a/Sources/MVVVR/Reader/ReaderViewModel.swift b/Sources/MVVVR/Reader/ReaderViewModel.swift
@@ -10,7 +10,7 @@ import UIKit
 import WebParser
 
 extension Reader {
-    @Observable final class ViewModel {
+    @MainActor @Observable final class ViewModel {
         let comicId: String
         private(set) var episodeId: String
         private(set) var state = State.none
@@ -52,9 +52,8 @@ extension Reader {
                     let isFavorited = await ComicWorker.shared.getComic(id: comicId)?.favorited ?? false
                     state = .checkoutFavorited(response: .init(isFavorited: isFavorited))
 
-                    let result = try await parser.result()
-                    let images = try await makeImagesWithParser(result: result)
-                    imageDatas = images.compactMap { .init(uri: $0.uri) }
+                    let result = try await parser.anyResult()
+                    imageDatas = try await makeImagesWithParser(result: result)
 
                     if imageDatas.isEmpty {
                         state = .dataLoadFail(response: .init(error: .empty))
@@ -111,14 +110,10 @@ extension Reader {
 
         // MARK: - Make Something
 
-        private func makeImagesWithParser(result: Any) async throws -> [Comic.ImageData] {
+        private func makeImagesWithParser(result: Any) async throws -> [ImageData] {
             let array = AnyCodable(result).anyArray ?? []
 
-            let result: [Comic.ImageData] = array.compactMap {
-                guard let index = $0["index"].int else {
-                    return nil
-                }
-
+            let result: [ImageData] = array.compactMap {
                 guard let uri = $0["uri"].string, !uri.isEmpty else {
                     return nil
                 }
@@ -127,7 +122,7 @@ extension Reader {
                     return nil
                 }
 
-                return .init(index: index, uri: uriDecode)
+                return .init(uri: uriDecode)
             }
 
             if result.isEmpty {
@@ -148,7 +143,7 @@ extension Reader {
 
         // MARK: - Get Something
 
-        private func getCurrentEpisode() async -> Comic.Episode? {
+        private func getCurrentEpisode() async -> Database.Episode? {
             let episodes = await ComicWorker.shared.getEpisodes(comicId: comicId)
             return episodes.first(where: { $0.id == episodeId })
         }