Merge pull request #227 from tatsuz0u/develop

Features & Bugfixes
EhPanda-Team · Feb 13, 2022 · 294634c · 294634c
2 parents eca6597 + ac02d4d
commit 294634c
Show file tree

Hide file tree

Showing 64 changed files with 2,932 additions and 674 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
     types: [closed]
 env:
   DEVELOPER_DIR: /Applications/Xcode_13.2.1.app
-  APP_VERSION: '2.1.3'
+  APP_VERSION: '2.2.0'
   SCHEME_NAME: 'EhPanda'
   ALTSTORE_JSON_PATH: './AltStore.json'
   BUILDS_PATH: '/tmp/action-builds'

diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj
diff --git a/EhPanda/App/Constant.strings b/EhPanda/App/Constant.strings
@@ -37,9 +37,11 @@
 
 // Code level contributors
 "ehpanda.code.level.contributors.link.tatsuz0u" = "https://github.com/tatsuz0u";
+"ehpanda.code.level.contributors.link.xioxin" = "https://github.com/xioxin";
 "ehpanda.code.level.contributors.link.EthanChinCN" = "https://github.com/EthanChinCN";
 "ehpanda.code.level.contributors.link.leng-yue" = "https://github.com/leng-yue";
 "ehpanda.code.level.contributors.text.tatsuz0u" = "Tatsuzou Araki";
+"ehpanda.code.level.contributors.text.xioxin" = "xioxin";
 "ehpanda.code.level.contributors.text.EthanChinCN" = "Ethan Chin";
 "ehpanda.code.level.contributors.text.leng-yue" = "LengYue";
 

diff --git a/EhPanda/App/Tools/Clients/DatabaseClient.swift b/EhPanda/App/Tools/Clients/DatabaseClient.swift
@@ -309,14 +309,11 @@ extension DatabaseClient {
                         managedObject?.category = gallery.category.rawValue
                         managedObject?.coverURL = gallery.coverURL
                         managedObject?.galleryURL = gallery.galleryURL
-                        if let language = gallery.language {
-                            managedObject?.language = language.rawValue
-                        }
                         // managedObject?.lastOpenDate = gallery.lastOpenDate
                         managedObject?.pageCount = Int64(gallery.pageCount)
                         managedObject?.postedDate = gallery.postedDate
                         managedObject?.rating = gallery.rating
-                        managedObject?.tagStrings = gallery.tagStrings.toData()
+                        managedObject?.tags = gallery.tags.toData()
                         managedObject?.title = gallery.title
                         managedObject?.token = gallery.token
                         if let uploader = gallery.uploader {
@@ -495,9 +492,9 @@ extension DatabaseClient {
         case .search:
             key = "searchFilter"
         case .global:
-            key = "watchedFilter"
-        case .watched:
             key = "globalFilter"
+        case .watched:
+            key = "watchedFilter"
         }
         return updateAppEnv(key: key, value: filter.toData())
     }

diff --git a/EhPanda/App/Tools/Clients/FileClient.swift b/EhPanda/App/Tools/Clients/FileClient.swift
@@ -22,7 +22,7 @@ extension FileClient {
         },
         fetchLogs: {
             Future { promise in
-                DispatchQueue.global().async {
+                DispatchQueue.global(qos: .userInitiated).async {
                     guard let path = FileUtil.logsDirectoryURL?.path,
                           let enumerator = FileManager.default.enumerator(atPath: path),
                           let fileNames = (enumerator.allObjects as? [String])?
@@ -72,7 +72,7 @@ extension FileClient {
         },
         importTagTranslator: { url in
             Future { promise in
-                DispatchQueue.global().async {
+                DispatchQueue.global(qos: .userInitiated).async {
                     guard let data = try? Data(contentsOf: url),
                           let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
                     else {

diff --git a/EhPanda/App/Tools/Clients/LibraryClient.swift b/EhPanda/App/Tools/Clients/LibraryClient.swift
@@ -78,7 +78,6 @@ extension LibraryClient {
         calculateWebImageDiskCacheSize: {
             Future(KingfisherManager.shared.cache.calculateDiskStorageSize)
                 .eraseToAnyPublisher()
-                .subscribe(on: DispatchQueue.global())
                 .receive(on: DispatchQueue.main)
                 .catchToEffect()
         }

diff --git a/EhPanda/App/Tools/Defaults.swift b/EhPanda/App/Tools/Defaults.swift
@@ -64,15 +64,14 @@ struct Defaults {
         static let logs = "logs"
         static let ehpandaLog = "EhPanda.log"
     }
-    struct ParsingMark {
-        static let hexStart = "hexStart<"
-        static let hexEnd = ">hexEnd"
-    }
     struct URL {
         static var host: Foundation.URL { AppUtil.galleryHost == .exhentai ? exhentai : ehentai }
         static let ehentai: Foundation.URL = .init(string: "https://e-hentai.org/").forceUnwrapped
         static let exhentai: Foundation.URL = .init(string: "https://exhentai.org/").forceUnwrapped
 
+        static let torrentDownload: Foundation.URL = .init(string: "https://ehgt.org/g/t.png").forceUnwrapped
+        static let torrentDownloadInvalid: Foundation.URL = .init(string: "https://ehgt.org/g/td.png").forceUnwrapped
+
         static let forum: Foundation.URL = .init(string: "https://forums.e-hentai.org/index.php").forceUnwrapped
         static let login = forum.appending(queryItems: [.act: .loginAct, .code: .zeroOne])
         static let webLogin = forum.appending(queryItems: [.act: .loginAct])