From 0a11e2fa7253d08a0d1a41c98b8eca490db3dd43 Mon Sep 17 00:00:00 2001 From: adly98 <111687237+adly98@users.noreply.github.com> Date: Mon, 10 Jul 2023 21:59:45 +0300 Subject: [PATCH] fix(ar/Tuktukcinema): refactor, fix and adding more servers (#1882) --- src/ar/tuktukcinema/build.gradle | 5 +- .../ar/tuktukcinema/Tuktukcinema.kt | 71 ++++++++++++------- .../extractors/MoshahdaExtractor.kt | 29 -------- .../extractors/UpStreamExtractor.kt | 17 +++++ .../extractors/VidBomExtractor.kt | 57 --------------- 5 files changed, 68 insertions(+), 111 deletions(-) delete mode 100644 src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/MoshahdaExtractor.kt create mode 100644 src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/UpStreamExtractor.kt delete mode 100644 src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/extractors/VidBomExtractor.kt diff --git a/src/ar/tuktukcinema/build.gradle b/src/ar/tuktukcinema/build.gradle index feda777ab..ee39a3a2f 100644 --- a/src/ar/tuktukcinema/build.gradle +++ b/src/ar/tuktukcinema/build.gradle @@ -5,13 +5,16 @@ ext { extName = 'توك توك سينما' pkgNameSuffix = 'ar.tuktukcinema' extClass = '.Tuktukcinema' - extVersionCode = 6 + extVersionCode = 7 libVersion = '13' } dependencies { implementation(project(':lib-okru-extractor')) implementation(project(':lib-dood-extractor')) + implementation(project(':lib-streamtape-extractor')) + implementation(project(':lib-vidbom-extractor')) + implementation "dev.datlag.jsunpacker:jsunpacker:1.0.1" } apply from: "$rootDir/common.gradle" diff --git a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt index b30ad7b56..c4cd11c4c 100644 --- a/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt +++ b/src/ar/tuktukcinema/src/eu/kanade/tachiyomi/animeextension/ar/tuktukcinema/Tuktukcinema.kt @@ -6,7 +6,8 @@ import android.widget.Toast import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors.MoshahdaExtractor +import eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors.UQLoadExtractor +import eu.kanade.tachiyomi.animeextension.ar.tuktukcinema.extractors.UpStreamExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilter import eu.kanade.tachiyomi.animesource.model.AnimeFilterList @@ -14,9 +15,16 @@ import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource +import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor +import eu.kanade.tachiyomi.lib.okruextractor.OkruExtractor +import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor +import eu.kanade.tachiyomi.lib.vidbomextractor.VidBomExtractor import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.Headers +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.async +import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.runBlocking import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -132,29 +140,39 @@ class Tuktukcinema : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun videoListParse(response: Response): List