Clear parser & Fix Archive

EhPanda-Team · May 5, 2021 · 145858a · 145858a
1 parent 63f43fa
commit 145858a
Show file tree

Hide file tree

Showing 7 changed files with 365 additions and 296 deletions.
diff --git a/EhPanda/App/Tools/Parser.swift b/EhPanda/App/Tools/Parser.swift
diff --git a/EhPanda/DataFlow/AppAction.swift b/EhPanda/DataFlow/AppAction.swift
@@ -78,7 +78,7 @@ enum AppAction {
     case fetchAssociatedItemsDone(result: Result<(Depth, AssociatedKeyword, PageNumber, [Manga]), AppError>)
     case fetchMoreAssociatedItems(depth: Int, keyword: AssociatedKeyword)
     case fetchMoreAssociatedItemsDone(result: Result<(Depth, AssociatedKeyword, PageNumber, [Manga]), AppError>)
-    case fetchAlterImages(gid: String, doc: HTMLDocument)
+    case fetchAlterImages(gid: String)
     case fetchAlterImagesDone(result: Result<(Identity, [MangaAlterData]), AppError>)
     case updateMangaComments(gid: String)
     case updateMangaCommentsDone(result: Result<(Identity, [MangaComment]), AppError>)

diff --git a/EhPanda/DataFlow/AppCommand.swift b/EhPanda/DataFlow/AppCommand.swift
@@ -279,7 +279,7 @@ struct FetchMangaDetailCommand: AppCommand {
             } receiveValue: { detail in
                 store.dispatch(.fetchMangaDetailDone(result: .success((gid, detail.0, detail.1))))
                 if detail.0.previews.isEmpty == true {
-                    store.dispatch(.fetchAlterImages(gid: gid, doc: detail.2))
+                    store.dispatch(.fetchAlterImages(gid: gid))
                 }
             }
             .seal(in: token)
@@ -411,11 +411,11 @@ struct FetchMoreAssociatedItemsCommand: AppCommand {
 
 struct FetchAlterImagesCommand: AppCommand {
     let gid: String
-    let doc: HTMLDocument
+    let alterImagesURL: String
 
     func execute(in store: Store) {
         let token = SubscriptionToken()
-        AlterImagesRequest(doc: doc)
+        AlterImagesRequest(alterImagesURL: alterImagesURL)
             .publisher
             .receive(on: DispatchQueue.main)
             .sink { completion in

diff --git a/EhPanda/DataFlow/Store.swift b/EhPanda/DataFlow/Store.swift
@@ -493,8 +493,7 @@ final class Store: ObservableObject {
             if appState.detailInfo.mangaArchiveFundsLoading { break }
             appState.detailInfo.mangaArchiveFundsLoading = true
 
-            let detailURL = (appState.cachedList.items?[gid]?.detailURL ?? "")
-                .replacingOccurrences(of: Defaults.URL.exhentai, with: Defaults.URL.ehentai)
+            let detailURL = appState.cachedList.items?[gid]?.detailURL ?? ""
             appCommand = FetchMangaArchiveFundsCommand(detailURL: detailURL)
         case .fetchMangaArchiveFundsDone(let result):
             appState.detailInfo.mangaArchiveFundsLoading = false
@@ -602,11 +601,13 @@ final class Store: ObservableObject {
                 print(error)
             }
 
-        case .fetchAlterImages(let gid, let doc):
+        case .fetchAlterImages(let gid):
             if appState.detailInfo.alterImagesLoading { break }
             appState.detailInfo.alterImagesLoading = true
 
-            appCommand = FetchAlterImagesCommand(gid: gid, doc: doc)
+            let alterImagesURL = appState.cachedList.items?[gid]?.detail?.alterImagesURL ?? ""
+            appCommand = FetchAlterImagesCommand(gid: gid, alterImagesURL: alterImagesURL)
+
         case .fetchAlterImagesDone(let result):
             appState.detailInfo.alterImagesLoading = false
 

diff --git a/EhPanda/Models/Manga.swift b/EhPanda/Models/Manga.swift
@@ -22,6 +22,7 @@ struct Manga: Identifiable, Codable, Equatable {
         category: .nonH,
         uploader: nil,
         publishedTime: "",
+        publishedDate: Date(),
         coverURL: "",
         detailURL: ""
     )
@@ -40,6 +41,7 @@ struct Manga: Identifiable, Codable, Equatable {
     var language: Language?
     let uploader: String?
     let publishedTime: String
+    let publishedDate: Date
     let coverURL: String
     let detailURL: String
     var lastOpenTime: Date?
@@ -48,6 +50,7 @@ struct Manga: Identifiable, Codable, Equatable {
 struct MangaDetail: Codable {
     static let empty = MangaDetail(
         isFavored: false,
+        alterImagesURL: nil,
         alterImages: [],
         torrents: [],
         comments: [],
@@ -60,6 +63,7 @@ struct MangaDetail: Codable {
         language: .English,
         uploader: "",
         publishedTime: "",
+        publishedDate: Date(),
         coverURL: "",
         likeCount: "",
         pageCount: "",
@@ -75,6 +79,7 @@ struct MangaDetail: Codable {
     var isFavored: Bool
     var archiveURL: String?
     var archive: MangaArchive?
+    let alterImagesURL: String?
     var alterImages: [MangaAlterData]
     var torrents: [MangaTorrent]
     var comments: [MangaComment]
@@ -90,6 +95,7 @@ struct MangaDetail: Codable {
     let language: Language
     let uploader: String
     let publishedTime: String
+    let publishedDate: Date
     let coverURL: String
     var likeCount: String
     var pageCount: String
@@ -129,6 +135,7 @@ struct MangaComment: Identifiable, Codable {
     let author: String
     let contents: [CommentContent]
     let commentID: String
+    let commentTime: String
     let commentDate: Date
 }
 
@@ -188,11 +195,6 @@ extension Manga {
     var color: Color {
         category.color
     }
-    var publishedDate: Date {
-        let formatter = DateFormatter()
-        formatter.dateFormat = "yyyy-MM-dd HH:mm"
-        return formatter.date(from: publishedTime) ?? Date()
-    }
 }
 
 extension MangaDetail {
@@ -201,17 +203,6 @@ extension MangaDetail {
     }
 }
 
-extension MangaComment {
-    var commentTime: String {
-        let formatter = DateFormatter()
-        formatter.locale = Locale.current
-        formatter.timeZone = TimeZone.current
-        formatter.dateFormat = "yyyy-MM-dd HH:mm"
-
-        return formatter.string(from: commentDate)
-    }
-}
-
 extension Category {
     var color: Color {
         Color(galleryType.rawValue + "/" + rawValue)