Merge branch 'develop'

EhPanda-Team · Jul 16, 2021 · c54a661 · c54a661
2 parents 0f492be + 26ddd4d
commit c54a661
Show file tree

Hide file tree

Showing 27 changed files with 943 additions and 150 deletions.
diff --git a/EhPanda.xcodeproj/project.pbxproj b/EhPanda.xcodeproj/project.pbxproj
diff --git a/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -12,37 +12,19 @@
       },
       {
         "package": "Kingfisher",
-        "repositoryURL": "https://github.com/tatsuz0u/Kingfisher",
+        "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
         "state": {
-          "branch": "Xcode-13-fix",
-          "revision": "ff901f1bbde87c923fb79bb084bb28a75d63b8dc",
+          "branch": "fix/xcode-13",
+          "revision": "f012224344f09421588a28e9f6259968e3574f8b",
           "version": null
         }
       },
-      {
-        "package": "SDWebImage",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git",
-        "state": {
-          "branch": null,
-          "revision": "76dd4b49110b8624317fc128e7fa0d8a252018bc",
-          "version": "5.11.1"
-        }
-      },
-      {
-        "package": "SDWebImageSwiftUI",
-        "repositoryURL": "https://github.com/SDWebImage/SDWebImageSwiftUI.git",
-        "state": {
-          "branch": null,
-          "revision": "cd8625b7cf11a97698e180d28bb7d5d357196678",
-          "version": "2.0.2"
-        }
-      },
       {
         "package": "SwiftyBeaver",
-        "repositoryURL": "https://github.com/tatsuz0u/SwiftyBeaver",
+        "repositoryURL": "https://github.com/SwiftyBeaver/SwiftyBeaver.git",
         "state": {
-          "branch": "expose-calendar",
-          "revision": "e5d55d02b571aa9b8a833db519ca9d794380c7fc",
+          "branch": "master",
+          "revision": "607fc8d64388652135f4dcf6a1a340e3a0641088",
           "version": null
         }
       },

diff --git a/EhPanda/App/Defaults.swift b/EhPanda/App/Defaults.swift
@@ -60,7 +60,7 @@ struct Defaults {
     struct URL {
         // Domains
         static var host: String {
-            galleryType == .ehentai ? ehentai : exhentai
+            galleryHost == .exhentai ? exhentai : ehentai
         }
         static let ehentai = "https://e-hentai.org/"
         static let exhentai = "https://exhentai.org/"

diff --git a/EhPanda/App/EhPandaApp.swift b/EhPanda/App/EhPandaApp.swift
@@ -8,18 +8,11 @@
 import SwiftUI
 import Kingfisher
 import SwiftyBeaver
-import SDWebImageSwiftUI
 
 @main
 struct EhPandaApp: App {
     @StateObject private var store = Store()
 
-    init() {
-        configureLogging()
-        configureWebImage()
-        clearImageCachesIfNeeded()
-    }
-
     var body: some Scene {
         WindowGroup {
             Home()
@@ -44,9 +37,15 @@ private extension EhPandaApp {
     }
 
     func onStartTasks() {
+        syncGalleryHost()
+        configureLogging()
+        configureWebImage()
+        configureDomainFronting()
+        clearImageCachesIfNeeded()
+
         DispatchQueue.main.async {
-            store.dispatch(.fetchFavoriteNames)
             store.dispatch(.fetchUserInfo)
+            store.dispatch(.fetchFavoriteNames)
         }
     }
     func onOpenURL(url: URL) {
@@ -58,6 +57,9 @@ private extension EhPandaApp {
         }
     }
 
+    func syncGalleryHost() {
+        setGalleryHost(with: setting.galleryHost)
+    }
     func configureLogging() {
         var file = FileDestination()
         var console = ConsoleDestination()
@@ -97,16 +99,21 @@ private extension EhPandaApp {
     }
 
     func configureWebImage() {
-        let config = KingfisherManager.shared.downloader.sessionConfiguration
+        let config = KingfisherManager.shared
+            .downloader.sessionConfiguration
+        if setting.bypassSNIFiltering {
+            config.protocolClasses = [DFURLProtocol.self]
+        }
         config.httpCookieStorage = HTTPCookieStorage.shared
         KingfisherManager.shared.downloader.sessionConfiguration = config
     }
+    func configureDomainFronting() {
+        DFManager.shared.dfState = setting.bypassSNIFiltering
+            ? .activated : .notActivated
+    }
     func clearImageCachesIfNeeded() {
         let threshold = 200 * 1024 * 1024
 
-        if SDImageCache.shared.totalDiskSize() > threshold {
-            SDImageCache.shared.clearDisk()
-        }
         KingfisherManager.shared.cache.calculateDiskStorageSize { result in
             if case .success(let size) = result {
                 if size > threshold {

diff --git a/EhPanda/App/Extensions.swift b/EhPanda/App/Extensions.swift
@@ -249,3 +249,12 @@ extension CGSize {
         CGSize(width: left.width * right, height: left.height * right)
     }
 }
+
+extension URLRequest {
+    mutating func setURLEncodedContentType() {
+        setValue(
+            "application/x-www-form-urlencoded",
+            forHTTPHeaderField: "Content-Type"
+        )
+    }
+}
diff --git a/EhPanda/App/Utility.swift b/EhPanda/App/Utility.swift
@@ -51,11 +51,11 @@ var appBuild: String {
     ) as? String ?? "(null)"
 }
 
-var galleryType: GalleryType {
+var galleryHost: GalleryHost {
     let rawValue = UserDefaults
         .standard
-        .string(forKey: "GalleryType") ?? ""
-    return GalleryType(rawValue: rawValue) ?? .ehentai
+        .string(forKey: "GalleryHost") ?? ""
+    return GalleryHost(rawValue: rawValue) ?? .ehentai
 }
 
 var appIconType: IconType {
@@ -282,8 +282,8 @@ func setDebugMode(with debugModeOn: Bool) {
     UserDefaults.standard.set(debugModeOn, forKey: "debugModeOn")
 }
 
-func setGalleryType(with type: GalleryType) {
-    UserDefaults.standard.set(type.rawValue, forKey: "GalleryType")
+func setGalleryHost(with host: GalleryHost) {
+    UserDefaults.standard.set(host.rawValue, forKey: "GalleryHost")
 }
 
 func clearGalleryType() {

diff --git a/EhPanda/App/ja.lproj/Localizable.strings b/EhPanda/App/ja.lproj/Localizable.strings
@@ -109,6 +109,9 @@
 "Maximum scale factor" = "最大スケール係数";
 "Double tap scale factor" = "ダブルタップスケール係数";
 
+"Laboratory" = "ラボ";
+"Bypass SNI Filtering" = "SNIフィルタリングを回避";
+
 "About EhPanda" = "EhPandaについて";
 "Version" = "バージョン";
 "Contacts" = "連絡";

diff --git a/EhPanda/App/zh-Hans.lproj/Localizable.strings b/EhPanda/App/zh-Hans.lproj/Localizable.strings
@@ -109,6 +109,9 @@
 "Maximum scale factor" = "最大缩放系数";
 "Double tap scale factor" = "双击缩放系数";
 
+"Laboratory" = "实验室";
+"Bypass SNI Filtering" = "域前置绕过SNI阻断";
+
 "About EhPanda" = "关于EhPanda";
 "Version" = "版本";
 "Contacts" = "联系";

diff --git a/EhPanda/App/zh-Hant.lproj/Localizable.strings b/EhPanda/App/zh-Hant.lproj/Localizable.strings
@@ -109,6 +109,9 @@
 "Maximum scale factor" = "縮放上限";
 "Double tap scale factor" = "雙擊縮放值";
 
+"Laboratory" = "實驗室";
+"Bypass SNI Filtering" = "域前置繞過SNI阻斷";
+
 "About EhPanda" = "關於EhPanda";
 "Version" = "版本";
 "Contacts" = "聯絡";

diff --git a/EhPanda/Models/Models.swift b/EhPanda/Models/Models.swift
@@ -284,7 +284,7 @@ extension MangaTorrent: DateFormattable, CustomStringConvertible {
 
 extension Category {
     var color: Color {
-        Color(galleryType.rawValue + "/" + rawValue)
+        Color(galleryHost.rawValue + "/" + rawValue)
     }
     var value: Int {
         switch self {

diff --git a/EhPanda/Models/Setting.swift b/EhPanda/Models/Setting.swift
@@ -11,9 +11,9 @@ import Foundation
 
 struct Setting: Codable {
     // Account
-    var galleryType = GalleryType.ehentai {
+    var galleryHost = GalleryHost.ehentai {
         didSet {
-            setGalleryType(with: galleryType)
+            setGalleryHost(with: galleryHost)
         }
     }
     var showNewDawnGreeting = false
@@ -63,9 +63,12 @@ struct Setting: Codable {
             }
         }
     }
+
+    // Laboratory
+    var bypassSNIFiltering = false
 }
 
-enum GalleryType: String, Codable {
+enum GalleryHost: String, Codable {
     case ehentai = "E-Hentai"
     case exhentai = "ExHentai"