From 4e4d471894c44cf503b35cc9a8e309149a630ed0 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Fri, 25 Aug 2023 14:47:41 -0300 Subject: [PATCH] refactor: Make extensions use the googledrive-extractor lib (#2081) --- .../animestream/desuonline/additional.gradle | 1 + .../animestream/desuonline/src/DesuOnline.kt | 2 +- .../src/extractors/GoogleDriveExtractor.kt | 98 ------------------- src/all/googledrive/build.gradle | 4 + .../all/googledrive/GoogleDrive.kt | 2 +- .../extractors/GoogleDriveExtractor.kt | 98 ------------------- src/en/holamovies/build.gradle | 4 + .../holamovies/extractors/GDFlixExtractor.kt | 1 + .../holamovies/extractors/GDTotExtractor.kt | 1 + .../extractors/GoogleDriveExtractor.kt | 98 ------------------- src/en/kayoanime/build.gradle | 4 + .../animeextension/en/kayoanime/Kayoanime.kt | 2 +- .../extractors/GoogleDriveExtractor.kt | 98 ------------------- src/en/ripcrabbyanime/build.gradle | 4 + .../en/ripcrabbyanime/Ripcrabbyanime.kt | 2 +- .../extractors/GoogleDriveExtractor.kt | 98 ------------------- src/tr/turkanime/build.gradle | 1 + .../animeextension/tr/turkanime/TurkAnime.kt | 2 +- .../extractors/GoogleDriveExtractor.kt | 98 ------------------- 19 files changed, 25 insertions(+), 593 deletions(-) delete mode 100644 multisrc/overrides/animestream/desuonline/src/extractors/GoogleDriveExtractor.kt delete mode 100644 src/all/googledrive/src/eu/kanade/tachiyomi/animeextension/all/googledrive/extractors/GoogleDriveExtractor.kt delete mode 100644 src/en/holamovies/src/eu/kanade/tachiyomi/animeextension/en/holamovies/extractors/GoogleDriveExtractor.kt delete mode 100644 src/en/kayoanime/src/eu/kanade/tachiyomi/animeextension/en/kayoanime/extractors/GoogleDriveExtractor.kt delete mode 100644 src/en/ripcrabbyanime/src/eu/kanade/tachiyomi/animeextension/en/ripcrabbyanime/extractors/GoogleDriveExtractor.kt delete mode 100644 src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/extractors/GoogleDriveExtractor.kt diff --git a/multisrc/overrides/animestream/desuonline/additional.gradle b/multisrc/overrides/animestream/desuonline/additional.gradle index a4b482339..ad648e266 100644 --- a/multisrc/overrides/animestream/desuonline/additional.gradle +++ b/multisrc/overrides/animestream/desuonline/additional.gradle @@ -1,4 +1,5 @@ dependencies { implementation(project(':lib-okru-extractor')) + implementation(project(':lib-googledrive-extractor')) implementation(project(':lib-sibnet-extractor')) } diff --git a/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt b/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt index 3fc4e1c62..0150bbf41 100644 --- a/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt +++ b/multisrc/overrides/animestream/desuonline/src/DesuOnline.kt @@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.animeextension.pl.desuonline import androidx.preference.ListPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animeextension.pl.desuonline.extractors.CDAExtractor -import eu.kanade.tachiyomi.animeextension.pl.desuonline.extractors.GoogleDriveExtractor import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.googledriveextractor.GoogleDriveExtractor import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor import eu.kanade.tachiyomi.multisrc.animestream.AnimeStream diff --git a/multisrc/overrides/animestream/desuonline/src/extractors/GoogleDriveExtractor.kt b/multisrc/overrides/animestream/desuonline/src/extractors/GoogleDriveExtractor.kt deleted file mode 100644 index 2929409c0..000000000 --- a/multisrc/overrides/animestream/desuonline/src/extractors/GoogleDriveExtractor.kt +++ /dev/null @@ -1,98 +0,0 @@ -package eu.kanade.tachiyomi.animeextension.pl.desuonline.extractors - -import eu.kanade.tachiyomi.animesource.model.Video -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.Headers -import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.OkHttpClient -import okhttp3.RequestBody.Companion.toRequestBody - -class GoogleDriveExtractor(private val client: OkHttpClient, private val headers: Headers) { - // Needs to be the form of `https://drive.google.com/uc?id=GOOGLEDRIVEITEMID` - fun videosFromUrl(itemUrl: String, videoName: String = "Video"): List