From ff1e0d75788f4875dc47433e655dde5fe4a9f512 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 19 Jul 2020 20:06:47 -0400
Subject: [PATCH] Allow hitomi users to select whether they want to download
 images as Webp or not

---
 .../eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 ++
 .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 2 ++
 .../java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt  | 4 ++--
 .../kanade/tachiyomi/ui/setting/SettingsHlController.kt   | 8 ++++++++
 app/src/main/res/values/strings_sy.xml                    | 5 +++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index c22aaa2e4..24a6e0ecc 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -270,4 +270,6 @@ object PreferenceKeys {
     const val sourcesSort = "sources_sort"
 
     const val recommendsInOverflow = "recommends_in_overflow"
+
+    const val hitomiAlwaysWebp = "hitomi_always_webp"
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 01a0f7c1c..af99c4e0d 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -370,4 +370,6 @@ class PreferencesHelper(val context: Context) {
     fun sourceSorting() = flowPrefs.getInt(Keys.sourcesSort, 0)
 
     fun recommendsInOverflow() = flowPrefs.getBoolean(Keys.recommendsInOverflow, false)
+
+    fun hitomiAlwaysWebp() = flowPrefs.getBoolean(Keys.hitomiAlwaysWebp, true)
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
index 4dcd148de..7ca297174 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt
@@ -375,8 +375,8 @@ class Hitomi(val context: Context) : HttpSource(), LewdSource<HitomiSearchMetada
         val json = JsonParser.parseString(str.removePrefix("var galleryinfo = "))
         return json["files"].array.mapIndexed { index, jsonElement ->
             val hash = jsonElement["hash"].string
-            val ext = if (jsonElement["haswebp"].string == "0") jsonElement["name"].string.split('.').last() else "webp"
-            val path = if (jsonElement["haswebp"].string == "0") "images" else "webp"
+            val ext = if (jsonElement["haswebp"].string == "0" || !prefs.hitomiAlwaysWebp().get()) jsonElement["name"].string.split('.').last() else "webp"
+            val path = if (jsonElement["haswebp"].string == "0" || !prefs.hitomiAlwaysWebp().get()) "images" else "webp"
             val hashPath1 = hash.takeLast(1)
             val hashPath2 = hash.takeLast(3).take(2)
             Page(
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
index 7d8900175..1703e341a 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt
@@ -22,5 +22,13 @@ class SettingsHlController : SettingsController() {
             key = PreferenceKeys.eh_hl_useHighQualityThumbs
             defaultValue = false
         }
+
+        switchPreference {
+            titleRes = R.string.always_download_webp
+            summaryOn = context.getString(R.string.always_download_webp_summary_on)
+            summaryOff = context.getString(R.string.always_download_webp_summary_off)
+            key = PreferenceKeys.hitomiAlwaysWebp
+            defaultValue = true
+        }
     }
 }
diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml
index 5c06b583d..93cde1d0d 100644
--- a/app/src/main/res/values/strings_sy.xml
+++ b/app/src/main/res/values/strings_sy.xml
@@ -142,6 +142,11 @@
     <!-- Library settings -->
     <string name="pref_skip_pre_migration_summary">Use last saved pre-migration preferences and sources to mass migrate</string>
 
+    <!-- Hitomi.la settings -->
+    <string name="always_download_webp">Always download webp</string>
+    <string name="always_download_webp_summary_on">Will always try to download images as webp when possible</string>
+    <string name="always_download_webp_summary_off">Will only download images as webp if its the only option, most images will be jpg</string>
+
     <!-- Other Settings -->
     <string name="high_quality_thumbnails">Use high-quality thumbnails</string>
     <string name="high_quality_thumbnails_summary">May slow down search results</string>