diff --git a/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt b/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt index e765c0cc3f..3c4ea3e6b1 100644 --- a/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt +++ b/lib/unpacker/src/main/java/eu/kanade/tachiyomi/lib/unpacker/Unpacker.kt @@ -58,7 +58,7 @@ object Unpacker { } } - private val wordRegex by lazy { Regex("""\w+""") } + private val wordRegex by lazy { Regex("""[0-9A-Za-z]+""") } private fun parseRadix62(str: String): Int { var result = 0 diff --git a/src/tr/hdfilmcehennemi/AndroidManifest.xml b/src/tr/hdfilmcehennemi/AndroidManifest.xml index dc3c5bea75..06e3c8fbc6 100644 --- a/src/tr/hdfilmcehennemi/AndroidManifest.xml +++ b/src/tr/hdfilmcehennemi/AndroidManifest.xml @@ -13,7 +13,7 @@ diff --git a/src/tr/hdfilmcehennemi/build.gradle b/src/tr/hdfilmcehennemi/build.gradle index cbdd0bc454..8abdc692cb 100644 --- a/src/tr/hdfilmcehennemi/build.gradle +++ b/src/tr/hdfilmcehennemi/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'HDFilmCehennemi' extClass = '.HDFilmCehennemi' - extVersionCode = 9 + extVersionCode = 10 isNsfw = true } @@ -10,4 +10,4 @@ apply from: "$rootDir/common.gradle" dependencies { implementation(project(":lib:unpacker")) implementation(project(":lib:playlist-utils")) -} \ No newline at end of file +} diff --git a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt index 5ccb956510..2a2945dc69 100644 --- a/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt +++ b/src/tr/hdfilmcehennemi/src/eu/kanade/tachiyomi/animeextension/tr/hdfilmcehennemi/HDFilmCehennemi.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi import android.app.Application import androidx.preference.ListPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.RapidrameExtractor +import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.CloseloadExtractor import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.VidmolyExtractor import eu.kanade.tachiyomi.animeextension.tr.hdfilmcehennemi.extractors.XBetExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource @@ -22,7 +22,6 @@ import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking import eu.kanade.tachiyomi.util.parallelMapBlocking import eu.kanade.tachiyomi.util.parseAs import kotlinx.serialization.Serializable -import kotlinx.serialization.json.Json import okhttp3.FormBody import okhttp3.MultipartBody import okhttp3.Request @@ -31,7 +30,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import uy.kohesive.injekt.injectLazy import java.text.SimpleDateFormat import java.util.Locale @@ -39,7 +37,7 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val name = "HDFilmCehennemi" - override val baseUrl = "https://www.hdfilmcehennemi.fun" + override val baseUrl = "https://www.hdfilmcehennemi.us" override val lang = "tr" @@ -49,8 +47,6 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() { .add("Referer", "$baseUrl/") .add("Origin", baseUrl) - private val json: Json by injectLazy() - private val preferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) } @@ -225,8 +221,8 @@ class HDFilmCehennemi : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // ============================ Video Links ============================= private val vidmolyExtractor by lazy { VidmolyExtractor(client, headers) } - private val rapidrameExtractor by lazy { RapidrameExtractor(client, headers, json) } - private val xbetExtractor by lazy { XBetExtractor(client, headers, json) } + private val closeloadExtractor by lazy { CloseloadExtractor(client, headers) } + private val xbetExtractor by lazy { XBetExtractor(client, headers) } override fun videoListParse(response: Response): List