From 34145a6f16b544d6db82f9b134af236b71eb0acd Mon Sep 17 00:00:00 2001 From: miguelantonioe Date: Sun, 4 Sep 2022 04:34:22 -0500 Subject: [PATCH] Fixed a bug in exception handling in extractors (#840) --- .../de/serienstream/Serienstream.kt | 4 -- .../animeextension/en/dramacool/DramaCool.kt | 2 +- src/es/animefenix/build.gradle | 2 +- .../es/animefenix/Animefenix.kt | 3 +- .../es/animefenix/extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- .../extractors/StreamSBExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- src/es/animeflv/build.gradle | 2 +- .../animeextension/es/animeflv/AnimeFlv.kt | 3 +- .../es/animeflv/extractors/DoodExtractor.kt | 3 +- .../es/animeflv/extractors/OkruExtractor.kt | 5 +- .../animeflv/extractors/StreamSBExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- .../extractors/YourUploadExtractor.kt | 3 +- src/es/animeid/build.gradle | 2 +- .../animeextension/es/animeid/AnimeID.kt | 3 +- .../animeid/extractors/StreamTapeExtractor.kt | 3 +- src/es/animelatinohd/build.gradle | 2 +- .../es/animelatinohd/AnimeLatinoHD.kt | 3 +- .../animelatinohd/extractors/DoodExtractor.kt | 3 +- .../animelatinohd/extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- .../extractors/StreamSBExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- src/es/animeonlineninja/build.gradle | 2 +- .../es/animeonlineninja/AnimeonlineNinja.kt | 3 +- .../extractors/DoodExtractor.kt | 3 +- .../extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- .../extractors/StreamSBExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- .../extractors/UploadExtractor.kt | 3 +- src/es/animeyt/build.gradle | 2 +- .../animeextension/es/animeyt/Animeyt.kt | 3 +- .../animeyt/extractors/FastreamExtractor.kt | 3 +- src/es/asialiveaction/build.gradle | 2 +- .../es/asialiveaction/AsiaLiveAction.kt | 3 +- .../extractors/OkruExtractor.kt | 5 +- .../extractors/StreamSBExtractor.kt | 3 +- src/es/doramasyt/build.gradle | 2 +- .../animeextension/es/doramasyt/Doramasyt.kt | 3 +- .../es/doramasyt/extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- .../doramasyt/extractors/UqloadExtractor.kt | 3 +- src/es/hentaijk/build.gradle | 2 +- .../animeextension/es/hentaijk/Hentaijk.kt | 3 +- .../es/hentaijk/extractors/OkruExtractor.kt | 5 +- src/es/hentaila/build.gradle | 2 +- .../animeextension/es/hentaila/Hentaila.kt | 3 +- .../es/hentaila/extractors/OkruExtractor.kt | 5 +- src/es/jkanime/build.gradle | 2 +- .../animeextension/es/jkanime/Jkanime.kt | 3 +- .../es/jkanime/extractors/OkruExtractor.kt | 5 +- src/es/jkhentai/build.gradle | 2 +- .../animeextension/es/jkhentai/Jkhentai.kt | 3 +- .../es/jkhentai/extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- .../extractors/YourUploadExtractor.kt | 3 +- src/es/monoschinos/build.gradle | 2 +- .../es/monoschinos/MonosChinos.kt | 3 +- .../monoschinos/extractors/OkruExtractor.kt | 5 +- .../extractors/SolidFilesExtractor.kt | 3 +- src/es/mundodonghua/build.gradle | 2 +- .../es/mundodonghua/MundoDonghua.kt | 3 +- .../extractors/ProteaExtractor.kt | 3 +- src/es/pelisflix/build.gradle | 2 +- .../animeextension/es/pelisflix/Pelisflix.kt | 7 +- .../es/pelisflix/PelisflixFactory.kt | 3 +- .../es/pelisflix/extractors/DoodExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- src/es/pelisplushd/build.gradle | 2 +- .../es/pelisplushd/Pelisplushd.kt | 67 ++++++++++++------- .../pelisplushd/extractors/DoodExtractor.kt | 3 +- .../extractors/StreamSBExtractor.kt | 3 +- .../extractors/StreamTapeExtractor.kt | 3 +- .../extractors/YourUploadExtractor.kt | 3 +- src/es/tioanime/build.gradle | 2 +- .../animeextension/es/tioanimeh/TioanimeH.kt | 3 +- .../es/tioanimeh/extractors/OkruExtractor.kt | 5 +- .../extractors/YourUploadExtractor.kt | 3 +- 83 files changed, 137 insertions(+), 187 deletions(-) diff --git a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt index 05afb0230..1b28e31fa 100644 --- a/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt +++ b/src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt @@ -9,10 +9,6 @@ import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.MultiSelectListPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.animeextension.de.serienstream.DdosGuardInterceptor -import eu.kanade.tachiyomi.animeextension.de.serienstream.RedirectInterceptor -import eu.kanade.tachiyomi.animeextension.de.serienstream.SConstants -import eu.kanade.tachiyomi.animeextension.de.serienstream.SerienstreamInterceptor import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.DoodExtractor import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.StreamTapeExtractor import eu.kanade.tachiyomi.animeextension.de.serienstream.extractors.VoeExtractor diff --git a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt index 3b10c76bd..b1a09e01f 100644 --- a/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt +++ b/src/en/dramacool/src/eu/kanade/tachiyomi/animeextension/en/dramacool/DramaCool.kt @@ -106,7 +106,7 @@ class DramaCool : ConfigurableAnimeSource, ParsedAnimeHttpSource() { url.contains("sbplay2.com") || url.contains("japopav.tv") || url.contains("viewsb.com") || url.contains("sbfast") || url.contains("sbfull.com") || url.contains("javplaya.com") || url.contains("ssbstream.net") || url.contains("p1ayerjavseen.com") || url.contains("sbthe.com") || - url.contains("streamsss.net") || url.contains("sbplay2.xyz") // || url.contains("") + url.contains("streamsss.net") || url.contains("sbplay2.xyz") // || url.contains("") -> { val headers = headers.newBuilder() .set("Referer", url) diff --git a/src/es/animefenix/build.gradle b/src/es/animefenix/build.gradle index 2b72a8fba..a0f62f695 100644 --- a/src/es/animefenix/build.gradle +++ b/src/es/animefenix/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Animefenix' pkgNameSuffix = 'es.animefenix' extClass = '.Animefenix' - extVersionCode = 7 + extVersionCode = 8 libVersion = '13' } diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt index f1a96120d..e477f6f3f 100644 --- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt +++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt @@ -24,7 +24,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.io.IOException import java.net.URLDecoder class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() { @@ -157,7 +156,7 @@ class Animefenix : ConfigurableAnimeSource, ParsedAnimeHttpSource() { videoSorted[0] = videoSorted[preferredIdx] } videoSorted.toList() - } catch (e: IOException) { + } catch (e: Exception) { this } } diff --git a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt index 0d854f2df..a8df313c3 100644 --- a/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt +++ b/src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/extractors/OkruExtractor.kt @@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup import okhttp3.OkHttpClient -import java.io.IOException class OkruExtractor(private val client: OkHttpClient) { fun videosFromUrl(url: String, qualityPrefix: String = ""): List