Merge branch 'aniyomiorg:master' into master

Dark25 · Jan 28, 2024 · f57db71 · f57db71
2 parents f727ef9 + 2db2733
commit f57db71
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hackstore'
     extClass = '.Hackstore'
-    extVersionCode = 1
+    extVersionCode = 2
 }
 
 apply from: "$rootDir/common.gradle"

diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'MonosChinos'
     extClass = '.MonosChinos'
-    extVersionCode = 24
+    extVersionCode = 25
 }
 
 apply from: "$rootDir/common.gradle"
@@ -10,4 +10,6 @@ dependencies {
     implementation(project(':lib:uqload-extractor'))
     implementation(project(':lib:mp4upload-extractor'))
     implementation(project(':lib:okru-extractor'))
+    implementation(project(':lib:streamtape-extractor'))
+    implementation(project(':lib:filemoon-extractor'))
 }
diff --git a/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt b/src/es/monoschinos/src/eu/kanade/tachiyomi/animeextension/es/monoschinos/MonosChinos.kt
@@ -13,8 +13,10 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.animesource.model.SEpisode
 import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
+import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
 import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor
 import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor
+import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.util.asJsoup
@@ -92,6 +94,14 @@ class MonosChinos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                     val videos = Mp4uploadExtractor(client).videosFromUrl(url, headers)
                     videoList.addAll(videos)
                 }
+                url.contains("streamtape") -> {
+                    val videos = StreamTapeExtractor(client).videosFromUrl(url)
+                    videoList.addAll(videos)
+                }
+                url.contains("filemoon") -> {
+                    val videos = FilemoonExtractor(client).videosFromUrl(url)
+                    videoList.addAll(videos)
+                }
             }
         }
 
@@ -255,6 +265,8 @@ class MonosChinos : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
             "Okru:240p", // Okru
             "SolidFiles",
             "Upload", // video servers without resolution
+            "StreamTape",
+            "FileMoon",
         )
         val videoQualityPref = ListPreference(screen.context).apply {
             key = "preferred_quality"