Merge

lib-multisrc/zorotheme/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
     id("lib-multisrc")
 }
 
-baseVersionCode = 1
+baseVersionCode = 2
 
 dependencies {
     api(project(":lib:megacloud-extractor"))

lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt

@@ -36,6 +36,7 @@ abstract class ZoroTheme(
     override val lang: String,
     override val name: String,
     override val baseUrl: String,
+    private val hosterNames: List<String>,
 ) : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     override val supportsLatest = true
@@ -44,6 +45,7 @@ abstract class ZoroTheme(
 
     val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+            .clearOldHosts()
     }
 
     private val docHeaders = headers.newBuilder().apply {
@@ -54,8 +56,6 @@ abstract class ZoroTheme(
 
     protected open val ajaxRoute = ""
 
-    abstract val hosterNames: List<String>
-
     private val useEnglish by lazy { preferences.getTitleLang == "English" }
     private val markFiller by lazy { preferences.markFiller }
 
@@ -238,9 +238,7 @@ abstract class ZoroTheme(
         return embedLinks.parallelCatchingFlatMap(::extractVideo)
     }
 
-    protected open fun extractVideo(server: VideoData): List<Video> {
-        return emptyList()
-    }
+    abstract fun extractVideo(server: VideoData): List<Video>
 
     override fun videoListSelector() = throw UnsupportedOperationException()
 
@@ -249,6 +247,21 @@ abstract class ZoroTheme(
     override fun videoUrlParse(document: Document) = throw UnsupportedOperationException()
 
     // ============================= Utilities ==============================
+
+    private fun SharedPreferences.clearOldHosts(): SharedPreferences {
+        if (hostToggle.all { hosterNames.contains(it) }) {
+            return this
+        }
+
+        edit()
+            .remove(PREF_HOSTER_KEY)
+            .putStringSet(PREF_HOSTER_KEY, hosterNames.toSet())
+            .remove(PREF_SERVER_KEY)
+            .putString(PREF_SERVER_KEY, hosterNames.first())
+            .apply()
+        return this
+    }
+
     private fun Set<String>.contains(s: String, ignoreCase: Boolean): Boolean {
         return any { it.equals(s, ignoreCase) }
     }

src/en/animeui/build.gradle → src/all/animeui/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'AnimeUI'
     extClass = '.AnimeUI'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"

src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUI.kt → src/all/animeui/src/eu/kanade/tachiyomi/animeextension/all/animeui/AnimeUI.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.animeextension.en.animeui
+package eu.kanade.tachiyomi.animeextension.all.animeui
 
 import android.app.Application
 import android.content.SharedPreferences
@@ -30,12 +30,14 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
 
     override val baseUrl = "https://animeui.com"
 
-    override val lang = "en"
+    override val lang = "all"
 
     override val supportsLatest = true
 
     private val json: Json by injectLazy()
 
+    override val id: Long = 7372747480486811746L
+
     private val preferences: SharedPreferences by lazy {
         Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
     }
@@ -135,7 +137,7 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
         val subtitleList = parsed.subtitlesJson?.let {
             json.decodeFromString<List<SubtitleObject>>(it).map { s ->
                 Track("$baseUrl/api${s.url}", s.subtitle_name)
-            }
+            }.sortSubs()
         } ?: emptyList()
 
         val cid = parsed.episode.cid
@@ -154,7 +156,17 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
         }
     }
 
-    // ============================= Utilities ==============================
+    // ============================= Utilities ==============================.
+
+    private fun Iterable<Track>.sortSubs(): List<Track> {
+        val sub = preferences.getString(PREF_SUB_LANG_KEY, PREF_SUB_LANG_DEFAULT)!!
+        return this.sortedWith(
+            compareBy<Track>(
+                { it.lang.startsWith(sub, true) },
+                { it.lang.contains(sub, true) },
+            ).thenByDescending { it.lang },
+        ).reversed()
+    }
 
     override fun List<Video>.sort(): List<Video> {
         val server = preferences.getString(PREF_SERVER_KEY, PREF_SERVER_DEFAULT)!!
@@ -173,6 +185,20 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
             "Tokyo", "Kyoto", "Nagoya", "Sendai", "Sagara",
             "Nara", "Osaka", "Web", "Noshiro",
         )
+
+        private const val PREF_SUB_LANG_KEY = "preferred_sub_lang"
+        private const val PREF_SUB_LANG_DEFAULT = "English"
+        private val LOCALE_LIST = arrayOf(
+            "English",
+            "Spanish",
+            "European Spanish",
+            "Portuguese",
+            "Deutsch",
+            "French",
+            "Italian",
+            "Russian",
+            "Arabic",
+        )
     }
     // ============================== Settings ==============================
 
@@ -194,6 +220,22 @@ class AnimeUI : ConfigurableAnimeSource, AnimeHttpSource() {
             }
         }.also(screen::addPreference)
 
+        ListPreference(screen.context).apply {
+            key = PREF_SUB_LANG_KEY
+            title = "Preferred subtitle language"
+            entries = LOCALE_LIST
+            entryValues = LOCALE_LIST
+            setDefaultValue(PREF_SUB_LANG_DEFAULT)
+            summary = "%s"
+
+            setOnPreferenceChangeListener { _, newValue ->
+                val selected = newValue as String
+                val index = findIndexOfValue(selected)
+                val entry = entryValues[index] as String
+                preferences.edit().putString(key, entry).commit()
+            }
+        }.also(screen::addPreference)
+
         ListPreference(screen.context).apply {
             key = PREF_SERVER_KEY
             title = "Preferred server"

src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUIDto.kt → src/all/animeui/src/eu/kanade/tachiyomi/animeextension/all/animeui/AnimeUIDto.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.animeextension.en.animeui
+package eu.kanade.tachiyomi.animeextension.all.animeui
 
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode

src/en/animeui/src/eu/kanade/tachiyomi/animeextension/en/animeui/AnimeUIFilters.kt → src/all/animeui/src/eu/kanade/tachiyomi/animeextension/all/animeui/AnimeUIFilters.kt

@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.animeextension.en.animeui
+package eu.kanade.tachiyomi.animeextension.all.animeui
 
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList

src/all/chineseanime/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.ChineseAnime'
     themePkg = 'animestream'
     baseUrl = 'https://www.chineseanime.vip'
-    overrideVersionCode = 6
+    overrideVersionCode = 7
 }
 
 apply from: "$rootDir/common.gradle"

src/en/kaido/src/eu/kanade/tachiyomi/animeextension/en/kaido/Kaido.kt

@@ -9,13 +9,12 @@ class Kaido : ZoroTheme(
     "en",
     "Kaido",
     "https://kaido.to",
-) {
-    override val hosterNames: List<String> = listOf(
+    hosterNames = listOf(
         "Vidstreaming",
         "Vidcloud",
         "StreamTape",
-    )
-
+    ),
+) {
     private val streamtapeExtractor by lazy { StreamTapeExtractor(client) }
     private val megaCloudExtractor by lazy { MegaCloudExtractor(client, headers, preferences) }
 

src/en/slothanime/build.gradle

@@ -0,0 +1,7 @@
+ext {
+    extName = 'SlothAnime'
+    extClass = '.SlothAnime'
+    extVersionCode = 1
+}
+
+apply from: "$rootDir/common.gradle"

src/en/slothanime/src/eu/kanade/tachiyomi/animeextension/en/slothanime/Filters.kt

@@ -0,0 +1,122 @@
+package eu.kanade.tachiyomi.animeextension.en.slothanime
+
+import eu.kanade.tachiyomi.animesource.model.AnimeFilter
+
+open class UriPartFilter(
+    name: String,
+    private val vals: Array<Pair<String, String>>,
+    defaultValue: String? = null,
+) : AnimeFilter.Select<String>(
+    name,
+    vals.map { it.first }.toTypedArray(),
+    vals.indexOfFirst { it.second == defaultValue }.takeIf { it != -1 } ?: 0,
+) {
+    fun getValue(): String {
+        return vals[state].second
+    }
+}
+
+open class UriMultiSelectOption(name: String, val value: String) : AnimeFilter.CheckBox(name)
+
+open class UriMultiSelectFilter(
+    name: String,
+    private val vals: Array<Pair<String, String>>,
+) : AnimeFilter.Group<UriMultiSelectOption>(name, vals.map { UriMultiSelectOption(it.first, it.second) }) {
+    fun getValues(): List<String> {
+        return state.filter { it.state }.map { it.value }
+    }
+}
+
+open class UriMultiTriSelectOption(name: String, val value: String) : AnimeFilter.TriState(name)
+
+open class UriMultiTriSelectFilter(
+    name: String,
+    private val vals: Array<Pair<String, String>>,
+) : AnimeFilter.Group<UriMultiTriSelectOption>(name, vals.map { UriMultiTriSelectOption(it.first, it.second) }) {
+    fun getIncluded(): List<String> {
+        return state.filter { it.state == TriState.STATE_INCLUDE }.map { it.value }
+    }
+
+    fun getExcluded(): List<String> {
+        return state.filter { it.state == TriState.STATE_EXCLUDE }.map { it.value }
+    }
+}
+
+class GenreFilter : UriMultiTriSelectFilter(
+    "Genre",
+    arrayOf(
+        Pair("Action", "action"),
+        Pair("Adventure", "adventure"),
+        Pair("Fantasy", "fantasy"),
+        Pair("Martial Arts", "martial_arts"),
+        Pair("Comedy", "comedy"),
+        Pair("School", "school"),
+        Pair("Slice of Life", "slice_of_life"),
+        Pair("Military", "military"),
+        Pair("Sci-Fi", "scifi"),
+        Pair("Isekai", "isekai"),
+        Pair("Kids", "kids"),
+        Pair("Iyashikei", "iyashikei"),
+        Pair("Horror", "horror"),
+        Pair("Supernatural", "supernatural"),
+        Pair("Avant Garde", "avant_garde"),
+        Pair("Demons", "demons"),
+        Pair("Gourmet", "gourmet"),
+        Pair("Music", "music"),
+        Pair("Drama", "drama"),
+        Pair("Seinen", "seinen"),
+        Pair("Ecchi", "ecchi"),
+        Pair("Harem", "harem"),
+        Pair("Romance", "romance"),
+        Pair("Magic", "magic"),
+        Pair("Mystery", "mystery"),
+        Pair("Suspense", "suspense"),
+        Pair("Parody", "parody"),
+        Pair("Psychological", "psychological"),
+        Pair("Super Power", "super_power"),
+        Pair("Vampire", "vampire"),
+        Pair("Shounen", "shounen"),
+        Pair("Space", "space"),
+        Pair("Mecha", "mecha"),
+        Pair("Sports", "sports"),
+        Pair("Shoujo", "shoujo"),
+        Pair("Girls Love", "girls_love"),
+        Pair("Josei", "josei"),
+        Pair("Mahou Shoujo", "mahou_shoujo"),
+        Pair("Thriller", "thriller"),
+        Pair("Reverse Harem", "reverse_harem"),
+        Pair("Boys Love", "boys_love"),
+        Pair("Uncategorized", "uncategorized"),
+    ),
+)
+
+class TypeFilter : UriMultiSelectFilter(
+    "Type",
+    arrayOf(
+        Pair("ONA", "ona"),
+        Pair("TV", "tv"),
+        Pair("MOVIE", "movie"),
+        Pair("SPECIAL", "special"),
+        Pair("OVA", "ova"),
+        Pair("MUSIC", "music"),
+    ),
+)
+
+class StatusFilter : UriPartFilter(
+    "Status",
+    arrayOf(
+        Pair("All", "2"),
+        Pair("Completed", "1"),
+        Pair("Releasing", "0"),
+    ),
+)
+
+class SortFilter : UriPartFilter(
+    "Sort",
+    arrayOf(
+        Pair("Most Watched", "viewed"),
+        Pair("Scored", "scored"),
+        Pair("Newest", "created_at"),
+        Pair("Latest Update", "updated_at"),
+    ),
+)