From 23298d6d8a824b41b6f1bc76f6234cd6428e76ed Mon Sep 17 00:00:00 2001 From: Secozzi <49240133+Secozzi@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:19:04 +0200 Subject: [PATCH] More fixes (#1470) --- src/all/googledriveindex/build.gradle | 2 +- .../all/googledriveindex/GoogleDriveIndex.kt | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/all/googledriveindex/build.gradle b/src/all/googledriveindex/build.gradle index 596b4b0af..3442fbe59 100644 --- a/src/all/googledriveindex/build.gradle +++ b/src/all/googledriveindex/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'GoogleDriveIndex' pkgNameSuffix = 'all.googledriveindex' extClass = '.GoogleDriveIndex' - extVersionCode = 3 + extVersionCode = 4 libVersion = '13' } diff --git a/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt b/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt index 950525c65..773d9c522 100644 --- a/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt +++ b/src/all/googledriveindex/src/eu/kanade/tachiyomi/animeextension/all/googledriveindex/GoogleDriveIndex.kt @@ -431,15 +431,28 @@ class GoogleDriveIndex : ConfigurableAnimeSource, AnimeHttpSource() { ).execute().asJsoup() val script = doc.selectFirst("script:containsData(videodomain)")?.data() + ?: doc.selectFirst("script:containsData(downloaddomain)")?.data() ?: return Observable.just(listOf(Video(url, "Video", url))) - val domainUrl = script.substringAfter("\"videodomain\":\"").substringBefore("\"") + + val domainUrl = if (script.contains("videodomain", true)) { + script + .substringAfter("\"videodomain\":\"") + .substringBefore("\"") + } else { + script + .substringAfter("\"downloaddomain\":\"") + .substringBefore("\"") + } + val videoUrl = if (domainUrl.isBlank()) { url } else { domainUrl + url.toHttpUrl().encodedPath } - return Observable.just(listOf(Video(videoUrl, "Video", videoUrl))) + return Observable.just( + listOf(Video(videoUrl, "Video", videoUrl)), + ) } // ============================= Utilities ==============================