From 33a9c6ccaea8fe62737ba1d2f8643e5bc25f28b1 Mon Sep 17 00:00:00 2001 From: Dark25 Date: Sat, 27 Jan 2024 09:10:54 +0100 Subject: [PATCH 1/2] fix(es/hackstore): Fix episode order and description (#2830) --- src/es/hackstore/build.gradle | 2 +- .../kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle index 128296d0a7..4321df7991 100644 --- 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/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt index 863c987c1c..68e2ab15a8 100644 --- a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt +++ b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt @@ -117,7 +117,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // =========================== Anime Details ============================ override fun animeDetailsParse(document: Document): SAnime { - val ismovie = getFilterList().find { it is GenreFilter }?.let { it as GenreFilter }?.toUriPart() == "peliculas" + val ismovie = document.selectFirst("#main-content > div > div.content-area.twelve.columns > div.watch-content > center > div > p:nth-child(1)") != null if (ismovie) { val anime = SAnime.create() anime.description = document.selectFirst("#main-content > div > div.content-area.twelve.columns > div.watch-content > center > div > p:nth-child(1)")!!.text().removeSurrounding("\"") @@ -175,6 +175,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() { episode.name = "T$seasonNumber - E$episodeNumber" episode.episode_number = episodeNumber.toFloat() + episodeList.add(0, episode) episode.setUrlWithoutDomain(episodeLink) episodeList.add(episode) From 2db273348929ce9369226f20a1bc4f40f7c71650 Mon Sep 17 00:00:00 2001 From: Dark25 Date: Sat, 27 Jan 2024 22:41:16 +0100 Subject: [PATCH 2/2] feat(es/monoschinos): Add extractors (#2832) --- src/es/monoschinos/build.gradle | 4 +++- .../animeextension/es/monoschinos/MonosChinos.kt | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/es/monoschinos/build.gradle b/src/es/monoschinos/build.gradle index c6dc95617c..28c9f3f768 100644 --- 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')) } \ No newline at end of file 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 index 458ec22eec..d93f77443d 100644 --- 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"