From afb33b7e018af8b563c8b9ec99d5f1a64b421d99 Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Sat, 13 Jan 2024 06:43:46 -0300 Subject: [PATCH] fix(pt/pifansubs): Fix latest updates & video extractors (#2733) --- .../dooplay/pifansubs/additional.gradle | 2 +- .../dooplay/pifansubs/src/PiFansubs.kt | 23 ++++------ .../src/extractors/AdoroDoramasExtractor.kt | 22 --------- .../src/extractors/BlembedExtractor.kt | 45 +++++++++++++++++++ .../src/extractors/JMVStreamExtractor.kt | 31 ------------- .../multisrc/dooplay/DooPlayGenerator.kt | 2 +- 6 files changed, 55 insertions(+), 70 deletions(-) delete mode 100644 multisrc/overrides/dooplay/pifansubs/src/extractors/AdoroDoramasExtractor.kt create mode 100644 multisrc/overrides/dooplay/pifansubs/src/extractors/BlembedExtractor.kt delete mode 100644 multisrc/overrides/dooplay/pifansubs/src/extractors/JMVStreamExtractor.kt diff --git a/multisrc/overrides/dooplay/pifansubs/additional.gradle b/multisrc/overrides/dooplay/pifansubs/additional.gradle index b739238d6..d80f9da90 100644 --- a/multisrc/overrides/dooplay/pifansubs/additional.gradle +++ b/multisrc/overrides/dooplay/pifansubs/additional.gradle @@ -1,4 +1,4 @@ dependencies { - implementation(project(':lib-gdriveplayer-extractor')) + implementation(project(':lib-streamhidevid-extractor')) } diff --git a/multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt b/multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt index 625e9336c..ca9c7dfbd 100644 --- a/multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt +++ b/multisrc/overrides/dooplay/pifansubs/src/PiFansubs.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.animeextension.pt.pifansubs -import android.net.Uri -import eu.kanade.tachiyomi.animeextension.pt.pifansubs.extractors.AdoroDoramasExtractor -import eu.kanade.tachiyomi.animeextension.pt.pifansubs.extractors.JMVStreamExtractor +import eu.kanade.tachiyomi.animeextension.pt.pifansubs.extractors.BlembedExtractor import eu.kanade.tachiyomi.animesource.model.Video -import eu.kanade.tachiyomi.lib.gdriveplayerextractor.GdrivePlayerExtractor +import eu.kanade.tachiyomi.lib.streamhidevidextractor.StreamHideVidExtractor import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup @@ -43,18 +41,13 @@ class PiFansubs : DooPlay( } } + private val streamHideVidExtractor by lazy { StreamHideVidExtractor(client) } + private val blembedExtractor by lazy { BlembedExtractor(client, headers) } + private fun getPlayerVideos(url: String): List