From cfb8c4775edc2b980171fffc87729a17a31b6dca Mon Sep 17 00:00:00 2001 From: Dark25 Date: Wed, 10 Jul 2024 05:26:05 +0100 Subject: [PATCH] chore(src/es and ar) Fix Hackstore and Anime4up (#40) * chore(src/es): Change Domain on Hackstore and add VidHideExtractor Checklist: - [x] Updated `extVersionCode` value in `build.gradle` for individual extensions - [x] Have not changed source names - [x] Have explicitly kept the `id` if a source's name or language were changed - [x] Have tested the modifications by compiling and running the extension through Android Studio * chore(src/ar): fix VideoListParse on Anime4up --- src/ar/anime4up/build.gradle | 2 +- .../tachiyomi/animeextension/ar/anime4up/Anime4Up.kt | 3 +-- src/es/hackstore/build.gradle | 3 ++- .../tachiyomi/animeextension/es/hackstore/Hackstore.kt | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ar/anime4up/build.gradle b/src/ar/anime4up/build.gradle index 41a87b92..54b07aca 100644 --- a/src/ar/anime4up/build.gradle +++ b/src/ar/anime4up/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Anime4up' extClass = '.Anime4Up' - extVersionCode = 56 + extVersionCode = 57 } apply from: "$rootDir/common.gradle" diff --git a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt b/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt index 68028c00..dc78d63a 100644 --- a/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt +++ b/src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt @@ -22,7 +22,6 @@ import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json @@ -154,7 +153,7 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val parsedData = json.decodeFromString(base64) val streamLinks = with(parsedData) { fhd + hd + sd } - return streamLinks.values.distinct().parallelCatchingFlatMapBlocking(::extractVideos) + return streamLinks.values.distinct().flatMap(::extractVideos) } private val uqloadExtractor by lazy { UqloadExtractor(client) } diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle index 34f99d76..a1afa5be 100644 --- a/src/es/hackstore/build.gradle +++ b/src/es/hackstore/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Hackstore' extClass = '.Hackstore' - extVersionCode = 9 + extVersionCode = 10 } apply from: "$rootDir/common.gradle" @@ -12,4 +12,5 @@ dependencies { implementation(project(':lib:filemoon-extractor')) implementation(project(':lib:streamwish-extractor')) implementation(project(':lib:dood-extractor')) + implementation(project(':lib:vidhide-extractor')) } 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 98d489f9..0a7f860e 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 @@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor +import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup @@ -32,7 +33,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val name = "Hackstore" - override val baseUrl = "https://hackstore.to" + override val baseUrl = "https://hackstore.fo" override val lang = "es" @@ -177,6 +178,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() { private val filemoonExtractor by lazy { FilemoonExtractor(client) } private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) } private val doodExtractor by lazy { DoodExtractor(client) } + private val vidHideExtractor by lazy { VidHideExtractor(client, headers) } override fun videoListParse(response: Response): List