diff --git a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt index 9dc41953a..f19baf4e1 100644 --- a/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt +++ b/lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt @@ -12,8 +12,8 @@ class VoeExtractor(private val client: OkHttpClient) { val script = document.selectFirst("script:containsData(const sources)") ?.data() ?: return null - val videoUrl = script.substringAfter("hls\": \"").substringBefore("\"") - val resolution = script.substringAfter("video_height\": ") + val videoUrl = script.substringAfter("hls': '").substringBefore("'") + val resolution = script.substringAfter("video_height': ") .substringBefore(",") val qualityStr = quality ?: "VoeCDN(${resolution}p)" return Video(url, qualityStr, videoUrl) diff --git a/src/de/animebase/build.gradle b/src/de/animebase/build.gradle index 1271d80c9..125f34af6 100644 --- a/src/de/animebase/build.gradle +++ b/src/de/animebase/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Anime-Base' pkgNameSuffix = 'de.animebase' extClass = '.Anime-Base' - extVersionCode = 1 + extVersionCode = 2 libVersion = '13' } diff --git a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/Anime-Base.kt b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/Anime-Base.kt index 3d40fbe9a..1bf4f9912 100644 --- a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/Anime-Base.kt +++ b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/Anime-Base.kt @@ -67,13 +67,13 @@ class `Anime-Base` : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val document = response.asJsoup() val episodeList = mutableListOf() val episodeElement = document.select( - "div.tab-content table#angebotTabelle tbody tr.episodetoggleclass-gersub, div.tab-content table#angebotTabelle tbody tr.episodetoggleclass-Filme button[${ - if (document.select("div.tab-content table#angebotTabelle tbody tr.episodetoggleclass-Filme button[data-dubbed=\"0\"]").isNullOrEmpty()){ + "div.tab-content #gersub div.panel, div.tab-content #filme div.panel button[${ + if (document.select("div.tab-content #filme div.panel button[data-dubbed=\"0\"]").isNullOrEmpty()){ "data-dubbed=\"1\"" } else { "data-dubbed=\"0\"" } - }][data-hoster=\"1\"], div.tab-content table#angebotTabelle tbody tr.episodetoggleclass-Specials button[data-dubbed=\"0\"][data-hoster=\"1\"]" + }][data-hoster=\"1\"], div.tab-content #specials div.panel button[data-dubbed=\"0\"][data-hoster=\"1\"]" ) episodeElement.forEach { val episode = episodeFromElement(it) @@ -99,10 +99,10 @@ class `Anime-Base` : ConfigurableAnimeSource, ParsedAnimeHttpSource() { episode.name = "Film ${epnum.toInt() - 1}" episode.setUrlWithoutDomain("/episode/$id/$epnum/0/$host/2") } else { - val season = element.attr("class") - .substringAfter("-").substringBefore(" ger") - episode.name = "Staffel $season Folge $epnum : " + element.select("td.openEpisodeEmbed").toString() - .substringAfter("\">").substringBefore("Filler!", "").replace(" ", "") episode.episode_number = element.select("button[data-hoster=\"1\"]").attr("data-folge").toFloat() episode.setUrlWithoutDomain("/episode/$id/$epnum/0/$host/0") diff --git a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/CookieInterceptor.kt b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/CookieInterceptor.kt index 8be3c883d..327e4ebdf 100644 --- a/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/CookieInterceptor.kt +++ b/src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/CookieInterceptor.kt @@ -69,7 +69,7 @@ class CookieInterceptor(private val baseUrl: String) : Interceptor { newRequest = GET(baseUrl, request.requestHeaders.toHeaders()) latch.countDown() } - if (request.url.toString().contains("favicon.png") && request.url.toString().contains("anime-base")) { + if (request.url.toString().contains("favicon.ico") && request.url.toString().contains("anime-base")) { newRequest = GET(baseUrl, request.requestHeaders.toHeaders()) latch.countDown() }