From 289403c12c15403de81dcfa46ddaa967b8434af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moon=20Light=E3=80=8C=E3=81=A4=E3=81=8B=E3=82=8A=E3=80=8D?= <66781351+MoonLGH@users.noreply.github.com> Date: Sun, 16 Jan 2022 15:18:35 +0700 Subject: [PATCH] Otakudesu,Oploverz,NeoNime - fix zippy parsing (#240) * fixed zippy scraper on NN and OL * Fixes zippyshare parser of id exts --- src/id/neonime/build.gradle | 2 +- .../tachiyomi/animeextension/id/neonime/NeoNime.kt | 11 ++++++----- src/id/oploverz/build.gradle | 2 +- .../tachiyomi/animeextension/id/oploverz/Oploverz.kt | 11 ++++++----- src/id/otakudesu/build.gradle | 2 +- .../animeextension/id/otakudesu/OtakuDesu.kt | 11 ++++++----- .../tachiyomi/animeextension/pt/anitube/Anitube.kt | 2 +- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/id/neonime/build.gradle b/src/id/neonime/build.gradle index f158a0d80..817b84578 100644 --- a/src/id/neonime/build.gradle +++ b/src/id/neonime/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'NeoNime' pkgNameSuffix = 'id.neonime' extClass = '.NeoNime' - extVersionCode = 4 + extVersionCode = 5 libVersion = '12' } diff --git a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt index 75a2b6432..ab8fe091e 100644 --- a/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt +++ b/src/id/neonime/src/eu/kanade/tachiyomi/animeextension/id/neonime/NeoNime.kt @@ -217,12 +217,13 @@ class NeoNime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val res = client.newCall(GET(element.attr("href"))).execute().asJsoup() val scr = res.select("script:containsData(dlbutton)").html() var url = element.attr("href").substringBefore("/v/") - val firstString = scr.substringAfter(" = \"").substringBefore("\"+(") - val num = scr.substringAfter("n = ").substringBefore("%2;").toInt() - val lastString = scr.substringAfter("3)+\"").substringBefore("\";") - val nums = (num % 2) + (num % 3) + num + val numbs = scr.substringAfter("\" + (").substringBefore(") + \"") + val firstString = scr.substringAfter(" = \"").substringBefore("\" + (") + val num = numbs.substringBefore(" % ").toInt() + val lastString = scr.substringAfter("913) + \"").substringBefore("\";") + val nums = num % 51245 + num % 913 url += firstString + nums.toString() + lastString - val quality = with(url) { + val quality = with(lastString) { when { contains("1080p") -> "1080p" contains("720p") -> "720p" diff --git a/src/id/oploverz/build.gradle b/src/id/oploverz/build.gradle index 3dd40d829..4078d4159 100644 --- a/src/id/oploverz/build.gradle +++ b/src/id/oploverz/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Oploverz' pkgNameSuffix = 'id.oploverz' extClass = '.Oploverz' - extVersionCode = 8 + extVersionCode = 9 libVersion = '12' } diff --git a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt index e74f20193..10d2fe561 100644 --- a/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt +++ b/src/id/oploverz/src/eu/kanade/tachiyomi/animeextension/id/oploverz/Oploverz.kt @@ -161,12 +161,13 @@ class Oploverz : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val res = client.newCall(GET(element.attr("href"))).execute().asJsoup() val scr = res.select("script:containsData(dlbutton)").html() var url = element.attr("href").substringBefore("/v/") - val firstString = scr.substringAfter(" = \"").substringBefore("\"+(") - val num = scr.substringAfter("n = ").substringBefore("%2;").toInt() - val lastString = scr.substringAfter("3)+\"").substringBefore("\";") - val nums = (num % 2) + (num % 3) + num + val numbs = scr.substringAfter("\" + (").substringBefore(") + \"") + val firstString = scr.substringAfter(" = \"").substringBefore("\" + (") + val num = numbs.substringBefore(" % ").toInt() + val lastString = scr.substringAfter("913) + \"").substringBefore("\";") + val nums = num % 51245 + num % 913 url += firstString + nums.toString() + lastString - val quality = with(url) { + val quality = with(lastString) { when { contains("1080p") -> "ZippyShare - 1080p" contains("720p") -> "ZippyShare - 720p" diff --git a/src/id/otakudesu/build.gradle b/src/id/otakudesu/build.gradle index 16ae25a3e..c9d115bcf 100644 --- a/src/id/otakudesu/build.gradle +++ b/src/id/otakudesu/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'OtakuDesu' pkgNameSuffix = 'id.otakudesu' extClass = '.OtakuDesu' - extVersionCode = 8 + extVersionCode = 9 libVersion = '12' } diff --git a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt index ff60daf4b..f9190ef75 100644 --- a/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt +++ b/src/id/otakudesu/src/eu/kanade/tachiyomi/animeextension/id/otakudesu/OtakuDesu.kt @@ -213,12 +213,13 @@ class OtakuDesu : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val res = client.newCall(GET(element.attr("href"))).execute().asJsoup() val scr = res.select("script:containsData(dlbutton)").html() var url = element.attr("href").substringBefore("/v/") - val firstString = scr.substringAfter(" = \"").substringBefore("\"+(") - val num = scr.substringAfter("n = ").substringBefore("%2;").toInt() - val lastString = scr.substringAfter("3)+\"").substringBefore("\";") - val nums = (num % 2) + (num % 3) + num + val numbs = scr.substringAfter("\" + (").substringBefore(") + \"") + val firstString = scr.substringAfter(" = \"").substringBefore("\" + (") + val num = numbs.substringBefore(" % ").toInt() + val lastString = scr.substringAfter("913) + \"").substringBefore("\";") + val nums = num % 51245 + num % 913 url += firstString + nums.toString() + lastString - val quality = with(url) { + val quality = with(lastString) { when { contains("1080p") -> "1080p" contains("720p") -> "720p" diff --git a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt index e08c2b56f..d396fdb57 100644 --- a/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt +++ b/src/pt/anitube/src/eu/kanade/tachiyomi/animeextension/pt/anitube/Anitube.kt @@ -327,7 +327,7 @@ class Anitube : ConfigurableAnimeSource, ParsedAnimeHttpSource() { AnimeFilter.Select(displayName, vals.map { it.first }.toTypedArray()) { fun toUriPart() = vals[state].second } - + // New functions private fun getRealDoc(document: Document): Document { val menu = document.selectFirst("div.controles_ep > a[href] > i.spr.listaEP")