fix(all/lmanime): Fix video extractor (#2397)

aniyomiorg · Oct 19, 2023 · 45596e2 · 45596e2
1 parent 05e141c
commit 45596e2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/multisrc/overrides/animestream/lmanime/src/LMAnime.kt b/multisrc/overrides/animestream/lmanime/src/LMAnime.kt
@@ -7,6 +7,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.lib.dailymotionextractor.DailymotionExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
 import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream
+import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 
@@ -20,7 +21,7 @@ class LMAnime : AnimeStream(
     override val prefQualityEntries = prefQualityValues
 
     override fun videoListParse(response: Response): List<Video> {
-        val items = response.asJsoup().select(videoListSelector())
+        val items = response.use { it.asJsoup() }.select(videoListSelector())
         val allowed = preferences.getStringSet(PREF_ALLOWED_LANGS_KEY, PREF_ALLOWED_LANGS_DEFAULT)!!
         return items
             .filter { element ->
@@ -30,16 +31,29 @@ class LMAnime : AnimeStream(
                 val language = it.text().substringBefore(" ")
                 val url = getHosterUrl(it)
                 getVideoList(url, language)
-            }.flatten()
+            }.flatten().ifEmpty { throw Exception("Empty video list!") }
     }
 
+    override fun getHosterUrl(encodedData: String) =
+        client.newCall(GET(encodedData, headers)).execute()
+            .use { it.asJsoup() }
+            .selectFirst("iframe[src~=.]")!!
+            .attr("src")
+            .let { // sometimes the url dont specify its protocol
+                when {
+                    it.startsWith("http") -> it
+                    else -> "https:$it"
+                }
+            }
+
+    private val okruExtractor by lazy { OkruExtractor(client) }
+    private val dailyExtractor by lazy { DailymotionExtractor(client, headers) }
+
     override fun getVideoList(url: String, name: String): List<Video> {
         val prefix = "$name -"
         return when {
-            "ok.ru" in url ->
-                OkruExtractor(client).videosFromUrl(url, prefix)
-            "dailymotion.com" in url ->
-                DailymotionExtractor(client, headers).videosFromUrl(url, "Dailymotion ($name)")
+            "ok.ru" in url -> okruExtractor.videosFromUrl(url, prefix)
+            "dailymotion.com" in url -> dailyExtractor.videosFromUrl(url, "Dailymotion ($name)")
             else -> emptyList()
         }
     }
@@ -48,7 +62,8 @@ class LMAnime : AnimeStream(
     @Suppress("UNCHECKED_CAST")
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         super.setupPreferenceScreen(screen) // Quality preferences
-        val langPref = ListPreference(screen.context).apply {
+
+        ListPreference(screen.context).apply {
             key = PREF_LANG_KEY
             title = PREF_LANG_TITLE
             entries = PREF_LANG_ENTRIES
@@ -61,9 +76,9 @@ class LMAnime : AnimeStream(
                 val entry = entryValues[index] as String
                 preferences.edit().putString(key, entry).commit()
             }
-        }
+        }.also(screen::addPreference)
 
-        val allowedPref = MultiSelectListPreference(screen.context).apply {
+        MultiSelectListPreference(screen.context).apply {
             key = PREF_ALLOWED_LANGS_KEY
             title = PREF_ALLOWED_LANGS_TITLE
             entries = PREF_ALLOWED_LANGS_ENTRIES
@@ -73,10 +88,7 @@ class LMAnime : AnimeStream(
             setOnPreferenceChangeListener { _, newValue ->
                 preferences.edit().putStringSet(key, newValue as Set<String>).commit()
             }
-        }
-
-        screen.addPreference(langPref)
-        screen.addPreference(allowedPref)
+        }.also(screen::addPreference)
     }
 
     // ============================= Utilities ==============================

diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/animestream/AnimeStreamGenerator.kt
@@ -21,7 +21,7 @@ class AnimeStreamGenerator : ThemeSourceGenerator {
         SingleLang("desu-online", "https://desu-online.pl", "pl", className = "DesuOnline", isNsfw = false, overrideVersionCode = 3),
         SingleLang("DonghuaStream", "https://donghuastream.co.in", "en", isNsfw = false, overrideVersionCode = 2),
         SingleLang("Hstream", "https://hstream.moe", "en", isNsfw = true, overrideVersionCode = 3),
-        SingleLang("LMAnime", "https://lmanime.com", "all", isNsfw = false, overrideVersionCode = 3),
+        SingleLang("LMAnime", "https://lmanime.com", "all", isNsfw = false, overrideVersionCode = 4),
         SingleLang("LuciferDonghua", "https://luciferdonghua.in", "en", isNsfw = false, overrideVersionCode = 2),
         SingleLang("MiniOppai", "https://minioppai.org", "id", isNsfw = true, overrideVersionCode = 2),
         SingleLang("RineCloud", "https://rine.cloud", "pt-BR", isNsfw = false, overrideVersionCode = 3),