diff --git a/src/all/hikari/build.gradle b/src/all/hikari/build.gradle index 2e8afef6..9db96065 100644 --- a/src/all/hikari/build.gradle +++ b/src/all/hikari/build.gradle @@ -1,13 +1,14 @@ ext { extName = 'Hikari' extClass = '.Hikari' - extVersionCode = 11 + extVersionCode = 12 } apply from: "$rootDir/common.gradle" dependencies { - implementation(project(':lib:filemoon-extractor')) - implementation(project(':lib:vidhide-extractor')) implementation(project(':lib:chillx-extractor')) + implementation(project(':lib:filemoon-extractor')) + implementation(project(':lib:streamwish-extractor')) + implementation(project(':lib:vidhide-extractor')) } \ No newline at end of file diff --git a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt index aa771c1f..0ccfb7d7 100644 --- a/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt +++ b/src/all/hikari/src/eu/kanade/tachiyomi/animeextension/all/hikari/Hikari.kt @@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.lib.chillxextractor.ChillxExtractor import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor +import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking @@ -220,6 +221,7 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource { private val filemoonExtractor by lazy { FilemoonExtractor(client) } private val vidHideExtractor by lazy { VidHideExtractor(client, headers) } private val chillxExtractor by lazy { ChillxExtractor(client, headers) } + private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) } private val embedRegex = Regex("""getEmbed\(\s*(\d+)\s*,\s*(\d+)\s*,\s*'(\d+)'""") override fun videoListRequest(episode: SEpisode): Request { @@ -328,17 +330,19 @@ class Hikari : ParsedAnimeHttpSource(), ConfigurableAnimeSource { }.filter { it.first.isNotEmpty() } } - val embedUrls = sdEmbedUrls.ifEmpty { - subEmbedUrls + dubEmbedUrls - } - return embedUrls.parallelCatchingFlatMapBlocking { + return sdEmbedUrls.parallelCatchingFlatMapBlocking { getVideosFromEmbed(it.first, it.second) + }.ifEmpty { + (subEmbedUrls + dubEmbedUrls).parallelCatchingFlatMapBlocking { + getVideosFromEmbed(it.first, it.second) + } } } private fun getVideosFromEmbed(embedUrl: String, name: String): List