EHentai - add language preference (#3812)

src/all/ehentai/build.gradle

@@ -5,7 +5,7 @@ ext {
     extName = 'E-Hentai'
     pkgNameSuffix = 'all.ehentai'
     extClass = '.EHFactory'
-    extVersionCode = 12
+    extVersionCode = 13
     libVersion = '1.2'
 }
 

src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt

@@ -1,9 +1,14 @@
 package eu.kanade.tachiyomi.extension.all.ehentai
 
 import android.annotation.SuppressLint
+import android.app.Application
+import android.content.SharedPreferences
 import android.net.Uri
+import androidx.preference.CheckBoxPreference
+import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.source.ConfigurableSource
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.source.model.Filter.CheckBox
 import eu.kanade.tachiyomi.source.model.Filter.Group
@@ -17,7 +22,6 @@ import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import eu.kanade.tachiyomi.util.asJsoup
-import java.net.URLEncoder
 import okhttp3.CacheControl
 import okhttp3.CookieJar
 import okhttp3.Headers
@@ -25,8 +29,17 @@ import okhttp3.Request
 import okhttp3.Response
 import org.jsoup.nodes.Element
 import rx.Observable
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+import java.net.URLEncoder
+import android.support.v7.preference.CheckBoxPreference as LegacyCheckBoxPreference
+import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen
 
-open class EHentai(override val lang: String, private val ehLang: String) : HttpSource() {
+open class EHentai(override val lang: String, private val ehLang: String) : ConfigurableSource, HttpSource() {
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
 
     override val name = "E-Hentai"
 
@@ -41,7 +54,7 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
         val doc = response.asJsoup()
         val parsedMangas = doc.select("table.itg td.glname")
             .let { elements ->
-                if (isLangNatural()) {
+                if (isLangNatural() && getEnforceLanguagePref()) {
                     elements.filter { element ->
                         // only accept elements with a language tag matching ehLang or without a language tag
                         // could make this stricter and not accept elements without a language tag, possibly add a sharedpreference for it
@@ -115,20 +128,23 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
         if (it.text() == ">") it.attr("href") else null
     }
 
-    private val languageTag = "language:$ehLang"
+    private fun languageTag(enforceLanguageFilter: Boolean = false): String {
+        return if (enforceLanguageFilter || getEnforceLanguagePref()) "language:$ehLang" else ""
+    }
 
     override fun popularMangaRequest(page: Int) = if (isLangNatural()) {
-        exGet("$baseUrl/?f_search=$languageTag&f_srdd=5&f_sr=on", page)
+        exGet("$baseUrl/?f_search=${languageTag()}&f_srdd=5&f_sr=on", page)
     } else {
         latestUpdatesRequest(page)
     }
 
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        val enforceLanguageFilter = filters.find { it is EnforceLanguageFilter }?.state == true
         val uri = Uri.parse("$baseUrl$QUERY_PREFIX").buildUpon()
         var modifiedQuery = when {
             !isLangNatural() -> query
-            query.isBlank() -> languageTag
+            query.isBlank() -> languageTag(enforceLanguageFilter)
-            else -> "$query,$languageTag"
+            else -> languageTag(enforceLanguageFilter).let { if (it.isNotEmpty()) "$query,$it" else query }
         }
         modifiedQuery += filters.filterIsInstance<TagFilter>()
             .flatMap { it.markedTags() }
@@ -204,7 +220,7 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
                                 ignore {
                                     when (left.removeSuffix(":")
                                         .toLowerCase()) {
-                                        "posted" -> datePosted = EX_DATE_FORMAT.parse(right).time
+                                        "posted" -> datePosted = EX_DATE_FORMAT.parse(right)?.time ?: 0
                                         "visible" -> visible = right.nullIfBlank()
                                         "language" -> {
                                             language = right.removeSuffix(TR_SUFFIX).trim().nullIfBlank()
@@ -329,6 +345,7 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
 
     // Filters
     override fun getFilterList() = FilterList(
+        EnforceLanguageFilter(getEnforceLanguagePref()),
         Watched(),
         GenreGroup(),
         TagFilter("Misc Tags", triStateBoxesFrom(miscTags), ""),
@@ -420,7 +437,9 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
         MaxPagesOption()
     ))
 
-    private val miscTags = "3d, animated, artbook, comic, forbidden content, full censorship, full color, group, hololive, how to, lvlapple, miwano ragu, model, mosaic censorship, multi-work series, novel, sawan no mole, soushuuhen, square-enix, story arc, tokuohyoe, udan, uncensored, webtoon, western cg, western imageset, western non-h, yukkuri"
+    private class EnforceLanguageFilter(default: Boolean) : CheckBox("Enforce language", default)
+
+    private val miscTags = "3d, already uploaded, anaglyph, animal on animal, animated, anthology, arisa mizuhara, artbook, ashiya noriko, bailey jay, body swap, caption, chouzuki maryou, christian godard, comic, compilation, dakimakura, fe galvao, ffm threesome, figure, forbidden content, full censorship, full color, game sprite, goudoushi, group, gunyou mikan, harada shigemitsu, hardcore, helly von valentine, higurashi rin, hololive, honey select, how to, incest, incomplete, ishiba yoshikazu, jessica nigri, kalinka fox, kanda midori, kira kira, kitami eri, kuroi hiroki, lenfried, lincy leaw, marie claude bourbonnais, matsunaga ayaka, me me me, missing cover, mmf threesome, mmt threesome, mosaic censorship, mtf threesome, multi-work series, no penetration, non-nude, novel, nudity only, oakazaki joe, out of order, paperchild, pm02 colon 20, poor grammar, radio comix, realporn, redraw, replaced, sakaki kasa, sample, saotome love, scanmark, screenshots, sinful goddesses, sketch lines, stereoscopic, story arc, takeuti ken, tankoubon, themeless, tikuma jukou, time stop, tsubaki zakuro, ttm threesome, twins, uncensored, vandych alex, variant set, watermarked, webtoon, western cg, western imageset, western non-h, yamato nadeshiko club, yui okada, yukkuri, zappa go"
     private val femaleTags = "ahegao, anal, angel, apron, bandages, bbw, bdsm, beauty mark, big areolae, big ass, big breasts, big clit, big lips, big nipples, bikini, blackmail, bloomers, blowjob, bodysuit, bondage, breast expansion, bukkake, bunny girl, business suit, catgirl, centaur, cheating, chinese dress, christmas, collar, corset, cosplaying, cowgirl, crossdressing, cunnilingus, dark skin, daughter, deepthroat, defloration, demon girl, double penetration, dougi, dragon, drunk, elf, exhibitionism, farting, females only, femdom, filming, fingering, fishnets, footjob, fox girl, furry, futanari, garter belt, ghost, giantess, glasses, gloves, goblin, gothic lolita, growth, guro, gyaru, hair buns, hairy, hairy armpits, handjob, harem, hidden sex, horns, huge breasts, humiliation, impregnation, incest, inverted nipples, kemonomimi, kimono, kissing, lactation, latex, leg lock, leotard, lingerie, lizard girl, maid, masked face, masturbation, midget, miko, milf, mind break, mind control, monster girl, mother, muscle, nakadashi, netorare, nose hook, nun, nurse, oil, paizuri, panda girl, pantyhose, piercing, pixie cut, policewoman, ponytail, pregnant, rape, rimjob, robot, scat, schoolgirl uniform, sex toys, shemale, sister, small breasts, smell, sole dickgirl, sole female, squirting, stockings, sundress, sweating, swimsuit, swinging, tail, tall girl, teacher, tentacles, thigh high boots, tomboy, transformation, twins, twintails, unusual pupils, urination, vore, vtuber, widow, wings, witch, wolf girl, x-ray, yuri, zombie"
     private val maleTags = "anal, bbm, big ass, big penis, bikini, blood, blowjob, bondage, catboy, cheating, chikan, condom, crab, crossdressing, dark skin, deepthroat, demon, dickgirl on male, dilf, dog boy, double anal, double penetration, dragon, drunk, exhibitionism, facial hair, feminization, footjob, fox boy, furry, glasses, group, guro, hairy, handjob, hidden sex, horns, huge penis, human on furry, kimono, lingerie, lizard guy, machine, maid, males only, masturbation, mmm threesome, monster, muscle, nakadashi, ninja, octopus, oni, pillory, policeman, possession, prostate massage, public use, schoolboy uniform, schoolgirl uniform, sex toys, shotacon, sleeping, snuff, sole male, stockings, sunglasses, swimsuit, tall man, tentacles, tomgirl, unusual pupils, virginity, waiter, x-ray, yaoi, zombie"
 
@@ -456,5 +475,45 @@ open class EHentai(override val lang: String, private val ehLang: String) : Http
         const val QUERY_PREFIX = "?f_apply=Apply+Filter"
         const val PREFIX_ID_SEARCH = "id:"
         const val TR_SUFFIX = "TR"
+
+        // Preferences vals
+        private const val ENFORCE_LANGUAGE_PREF_KEY = "ENFORCE_LANGUAGE"
+        private const val ENFORCE_LANGUAGE_PREF_TITLE = "Enforce Language"
+        private const val ENFORCE_LANGUAGE_PREF_SUMMARY = "If checked, forces browsing of manga matching a language tag"
+        private const val ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE = false
     }
+
+    // Preferences
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val enforceLanguagePref = CheckBoxPreference(screen.context).apply {
+            key = "${ENFORCE_LANGUAGE_PREF_KEY}_$lang"
+            title = ENFORCE_LANGUAGE_PREF_TITLE
+            summary = ENFORCE_LANGUAGE_PREF_SUMMARY
+            setDefaultValue(ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE)
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val checkValue = newValue as Boolean
+                preferences.edit().putBoolean("${ENFORCE_LANGUAGE_PREF_KEY}_$lang", checkValue).commit()
+            }
+        }
+        screen.addPreference(enforceLanguagePref)
+    }
+
+    override fun setupPreferenceScreen(screen: LegacyPreferenceScreen) {
+        val enforceLanguagePref = LegacyCheckBoxPreference(screen.context).apply {
+            key = "${ENFORCE_LANGUAGE_PREF_KEY}_$lang"
+            title = ENFORCE_LANGUAGE_PREF_TITLE
+            summary = ENFORCE_LANGUAGE_PREF_SUMMARY
+            setDefaultValue(ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE)
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val checkValue = newValue as Boolean
+                preferences.edit().putBoolean("${ENFORCE_LANGUAGE_PREF_KEY}_$lang", checkValue).commit()
+            }
+        }
+        screen.addPreference(enforceLanguagePref)
+    }
+
+    private fun getEnforceLanguagePref(): Boolean = preferences.getBoolean("${ENFORCE_LANGUAGE_PREF_KEY}_$lang", ENFORCE_LANGUAGE_PREF_DEFAULT_VALUE)
 }