subdub toggle | regex fix (yomiroll) | idk I forgot

app/src/main/java/ani/dantotsu/parsers/AnimeParser.kt

@@ -163,7 +163,7 @@ abstract class AnimeParser : BaseParser() {
      *
      * **NOTE : do not forget to override `search` if the site does not support only dub search**
      * **/
-    open val isDubAvailableSeparately by Delegates.notNull<Boolean>()
+    open fun isDubAvailableSeparately(sourceLang: Int? = null): Boolean = false
 
     /**
      * The app changes this, depending on user's choice.
@@ -182,7 +182,7 @@ abstract class AnimeParser : BaseParser() {
      * **/
     override suspend fun loadSavedShowResponse(mediaId: Int): ShowResponse? {
         checkIfVariablesAreEmpty()
-        val dub = if (isDubAvailableSeparately) "_${if (selectDub) "dub" else "sub"}" else ""
+        val dub = if (isDubAvailableSeparately()) "_${if (selectDub) "dub" else "sub"}" else ""
         var loaded = loadData<ShowResponse>("${saveName}${dub}_$mediaId")
         if (loaded == null && malSyncBackupName.isNotEmpty())
             loaded = MalSyncBackup.get(mediaId, malSyncBackupName, selectDub)
@@ -200,7 +200,7 @@ abstract class AnimeParser : BaseParser() {
                     )
                 } : ${response.name}"
             )
-            val dub = if (isDubAvailableSeparately) "_${if (selectDub) "dub" else "sub"}" else ""
+            val dub = if (isDubAvailableSeparately()) "_${if (selectDub) "dub" else "sub"}" else ""
             saveData("${saveName}${dub}_$mediaId", response)
         }
     }
@@ -209,8 +209,6 @@ abstract class AnimeParser : BaseParser() {
 class EmptyAnimeParser : AnimeParser() {
     override val name: String = "None"
     override val saveName: String = "None"
-
-    override val isDubAvailableSeparately: Boolean = false
     override suspend fun loadEpisodes(
         animeLink: String,
         extra: Map<String, String>?,

app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt

@@ -10,12 +10,14 @@ import android.os.Build
 import android.os.Environment
 import android.provider.MediaStore
 import ani.dantotsu.FileUrl
+import ani.dantotsu.currContext
 import ani.dantotsu.logger
 import ani.dantotsu.media.anime.AnimeNameAdapter
 import ani.dantotsu.media.manga.ImageData
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.snackString
 import eu.kanade.tachiyomi.animesource.AnimeCatalogueSource
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimesPage
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
@@ -26,6 +28,7 @@ import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
 import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.network.interceptor.CloudflareBypassException
+import eu.kanade.tachiyomi.source.anime.getPreferenceKey
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
@@ -71,8 +74,63 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
     override val name = extension.name
     override val saveName = extension.name
     override val hostUrl = extension.sources.first().name
-    override val isDubAvailableSeparately = false
     override val isNSFW = extension.isNsfw
+    override var selectDub: Boolean
+        get() = getDub()
+        set(value) {
+            setDub(value)
+        }
+
+    private fun getDub(): Boolean {
+        val configurableSource = extension.sources[sourceLanguage] as? ConfigurableAnimeSource
+            ?: return false
+        currContext()?.let { context ->
+            val sharedPreferences =
+                context.getSharedPreferences(configurableSource.getPreferenceKey(), Context.MODE_PRIVATE)
+            sharedPreferences.all.filterValues { AnimeNameAdapter.getSubDub(it.toString()) != AnimeNameAdapter.Companion.SubDubType.NULL }
+                .forEach { value ->
+                    return when (AnimeNameAdapter.getSubDub(value.value.toString())) {
+                        AnimeNameAdapter.Companion.SubDubType.SUB -> false
+                        AnimeNameAdapter.Companion.SubDubType.DUB -> true
+                        AnimeNameAdapter.Companion.SubDubType.NULL -> false
+                    }
+                }
+        }
+        return false
+    }
+
+    fun setDub(setDub: Boolean) {
+        val configurableSource = extension.sources[sourceLanguage] as? ConfigurableAnimeSource
+            ?: return
+        val type = when (setDub) {
+            true -> AnimeNameAdapter.Companion.SubDubType.DUB
+            false -> AnimeNameAdapter.Companion.SubDubType.SUB
+        }
+        currContext()?.let { context ->
+            val sharedPreferences =
+                context.getSharedPreferences(configurableSource.getPreferenceKey(), Context.MODE_PRIVATE)
+            sharedPreferences.all.filterValues { AnimeNameAdapter.getSubDub(it.toString()) != AnimeNameAdapter.Companion.SubDubType.NULL }
+                .forEach { value ->
+                    val setValue = AnimeNameAdapter.setSubDub(value.value.toString(), type)
+                    if (setValue != null) {
+                        sharedPreferences.edit().putString(value.key, setValue).apply()
+                    }
+                }
+        }
+    }
+    override fun isDubAvailableSeparately(sourceLang: Int?): Boolean {
+        val configurableSource = extension.sources[sourceLanguage] as? ConfigurableAnimeSource
+            ?: return false
+        currContext()?.let { context ->
+            logger("isDubAvailableSeparately: ${configurableSource.getPreferenceKey()}")
+            val sharedPreferences =
+                context.getSharedPreferences(configurableSource.getPreferenceKey(), Context.MODE_PRIVATE)
+            sharedPreferences.all.filterValues { AnimeNameAdapter.setSubDub(it.toString(), AnimeNameAdapter.Companion.SubDubType.NULL) != null }
+                .forEach { _ -> return true }
+        }
+        return false
+    }
+
     override suspend fun loadEpisodes(
         animeLink: String,
         extra: Map<String, String>?,
@@ -106,6 +164,8 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
                     }
                     it
                 }
+            } else if (episodesAreIncrementing(res)) {
+                res.sortedBy { it.episode_number }
             } else {
                 var episodeCounter = 1f
                 // Group by season, sort within each season, and then renumber while keeping episode number 0 as is
@@ -135,6 +195,19 @@ class DynamicAnimeParser(extension: AnimeExtension.Installed) : AnimeParser() {
         return emptyList()
     }
 
+    private fun episodesAreIncrementing(episodes: List<SEpisode>): Boolean {
+        val sortedEpisodes = episodes.sortedBy { it.episode_number }
+        val takenNumbers = mutableListOf<Float>()
+        sortedEpisodes.forEach {
+            if (it.episode_number !in takenNumbers) {
+                takenNumbers.add(it.episode_number)
+            } else {
+                return false
+            }
+        }
+        return true
+    }
+
     override suspend fun loadVideoServers(
         episodeLink: String,
         extra: Map<String, String>?,

app/src/main/java/ani/dantotsu/parsers/OfflineAnimeParser.kt

@@ -21,7 +21,6 @@ class OfflineAnimeParser : AnimeParser() {
     override val name = "Offline"
     override val saveName = "Offline"
     override val hostUrl = "Offline"
-    override val isDubAvailableSeparately = false
     override val isNSFW = false
 
     override suspend fun loadEpisodes(