diff --git a/src/pt/animesup/build.gradle b/src/pt/animesup/build.gradle index edc173f81..b15077e64 100644 --- a/src/pt/animesup/build.gradle +++ b/src/pt/animesup/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'AnimesUP' pkgNameSuffix = 'pt.animesup' extClass = '.AnimesUp' - extVersionCode = 2 + extVersionCode = 3 libVersion = '13' } diff --git a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/AnimesUp.kt b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/AnimesUp.kt index 64db210e7..008e94be3 100644 --- a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/AnimesUp.kt +++ b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/AnimesUp.kt @@ -124,8 +124,8 @@ class AnimesUp : ConfigurableAnimeSource, ParsedAnimeHttpSource() { .videoFromUrl("https:" + videoUrl, quality) } else -> null - } ?: Video(videoUrl, quality, videoUrl) - } + } + }.filterNotNull() return resolutions } diff --git a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/AnimesUpExtractor.kt b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/AnimesUpExtractor.kt index 21f778c12..21ba0c730 100644 --- a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/AnimesUpExtractor.kt +++ b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/AnimesUpExtractor.kt @@ -7,13 +7,19 @@ import okhttp3.OkHttpClient class AnimesUpExtractor(private val client: OkHttpClient) { - fun videoFromUrl(url: String, quality: String, headers: Headers): Video { + fun videoFromUrl(url: String, quality: String, headers: Headers): Video? { val body = client.newCall(GET(url, headers)) .execute() .body?.string() .orEmpty() val videoUrl = body.substringAfter("file: \"").substringBefore("\",") val newHeaders = Headers.headersOf("referer", url) - return Video(url, quality, videoUrl, newHeaders) + // Temporary(or not) fix: videos from this host are not working + // even on the website, returning HTTP 403 Forbidden. + return if (videoUrl.startsWith("https://video.wixstatic.com")) { + null + } else { + Video(url, quality, videoUrl, newHeaders) + } } } diff --git a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/LegacyFunExtractor.kt b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/LegacyFunExtractor.kt index 1356e6b91..4233f5818 100644 --- a/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/LegacyFunExtractor.kt +++ b/src/pt/animesup/src/eu/kanade/tachiyomi/animeextension/pt/animesup/extractors/LegacyFunExtractor.kt @@ -47,9 +47,12 @@ class LegacyFunExtractor(private val client: OkHttpClient) { "user-agent", USER_AGENT ) val newDoc = client.newCall(GET(iframeUrl, newHeaders)).execute().asJsoup() - val body = newDoc.selectFirst("script:containsData(eval)").data() - val unpacked = JsUnpacker.unpackAndCombine(body) - return unpacked?.let { + val body = newDoc.let { doc -> + doc.selectFirst("script:containsData(eval)")?.let { + JsUnpacker.unpackAndCombine(it.data()) + } ?: doc.selectFirst("script:containsData(var player)")?.data() + } + return body?.let { val url = it.substringAfter("file\":") .substringAfter("\"") .substringBefore("\"")