diff --git a/src/all/pornhub/build.gradle b/src/all/pornhub/build.gradle index a94f16b..3f4e856 100644 --- a/src/all/pornhub/build.gradle +++ b/src/all/pornhub/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' +apply plugin: 'kotlinx-serialization' ext { extName = 'Pornhub' pkgNameSuffix = 'all.pornhub' extClass = '.Pornhub' - extVersionCode = 3 + extVersionCode = 4 libVersion = '13' containsNsfw = true } diff --git a/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt b/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt index fe88c6c..499ddd9 100644 --- a/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt +++ b/src/all/pornhub/src/eu/kanade/tachiyomi/animeextension/all/pornhub/Pornhub.kt @@ -12,6 +12,11 @@ import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup +import kotlinx.serialization.ExperimentalSerializationApi +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.json.Json import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -21,6 +26,7 @@ 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.lang.Exception class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() { @@ -35,6 +41,8 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val client: OkHttpClient = network.cloudflareClient + private val json: Json by injectLazy() + private val preferences: SharedPreferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) } @@ -59,8 +67,6 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun episodeListParse(response: Response): List { val episodes = mutableListOf() - val jsoup = response.asJsoup() - val episode = SEpisode.create().apply { name = "Video" date_upload = System.currentTimeMillis() @@ -75,33 +81,24 @@ class Pornhub : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun episodeFromElement(element: Element) = throw Exception("not used") + @OptIn(ExperimentalSerializationApi::class) override fun videoListParse(response: Response): List