diff --git a/src/pl/ogladajanime/build.gradle b/src/pl/ogladajanime/build.gradle index 349679ef..8b14d136 100644 --- a/src/pl/ogladajanime/build.gradle +++ b/src/pl/ogladajanime/build.gradle @@ -1,17 +1,9 @@ ext { extName = 'OgladajAnime' extClass = '.OgladajAnime' - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } apply from: "$rootDir/common.gradle" -dependencies { - implementation(project(':lib:dailymotion-extractor')) - implementation(project(':lib:mp4upload-extractor')) - implementation(project(':lib:sibnet-extractor')) - implementation(project(':lib:vk-extractor')) - implementation(project(':lib:googledrive-extractor')) - implementation(project(':lib:cda-extractor')) -} diff --git a/src/pl/ogladajanime/src/eu/kanade/tachiyomi/animeextension/pl/ogladajanime/OgladajAnime.kt b/src/pl/ogladajanime/src/eu/kanade/tachiyomi/animeextension/pl/ogladajanime/OgladajAnime.kt index a146930b..f318ee05 100644 --- a/src/pl/ogladajanime/src/eu/kanade/tachiyomi/animeextension/pl/ogladajanime/OgladajAnime.kt +++ b/src/pl/ogladajanime/src/eu/kanade/tachiyomi/animeextension/pl/ogladajanime/OgladajAnime.kt @@ -10,17 +10,9 @@ 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.cdaextractor.CdaPlExtractor -import eu.kanade.tachiyomi.lib.dailymotionextractor.DailymotionExtractor -import eu.kanade.tachiyomi.lib.mp4uploadextractor.Mp4uploadExtractor -import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor -import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import okhttp3.FormBody import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Request @@ -57,7 +49,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // ============================== Popular =============================== override fun popularAnimeRequest(page: Int): Request { - return GET("$baseUrl/search/page/$page", headers) + return GET("$baseUrl/search/page/$page", apiHeaders) } override fun popularAnimeSelector(): String = "div#anime_main div.card.bg-white" @@ -72,7 +64,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // =============================== Latest =============================== - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/search/new/$page", headers) + override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/search/new/$page", apiHeaders) override fun latestUpdatesSelector(): String = popularAnimeSelector() @@ -82,7 +74,7 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // =============================== Search =============================== - override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/search/name/$query", headers) + override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/search/name/$query", apiHeaders) override fun searchAnimeFromElement(element: Element): SAnime = popularAnimeFromElement(element) @@ -90,8 +82,6 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun searchAnimeNextPageSelector(): String? = null - // prosta bez filtrów jak na razie :) są dziury ale to kiedyś sie naprawi hihi. Wystarczy dobrze wyszukać animca i powinno wyszukać. - // =========================== Anime Details ============================ override fun animeDetailsParse(document: Document): SAnime { return SAnime.create().apply { @@ -148,89 +138,25 @@ class OgladajAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() { // ============================ Video Links ============================= - private fun getPlayerUrl(id: String): String { - val body = FormBody.Builder() - .add("action", "change_player_url") - .add("id", id) - .build() - return client.newCall(POST("$baseUrl/manager.php", apiHeaders, body)) - .execute() - .use { response -> - response.body.string() - .substringAfter("\"data\":\"") - .substringBefore("\",") - .replace("\\", "") - } - } - override fun videoListRequest(episode: SEpisode): Request { - val body = FormBody.Builder() - .add("action", "get_player_list") - .add("id", episode.url) - .build() - return POST("$baseUrl/manager.php", apiHeaders, body) + return GET("$baseUrl:8443/Player/${episode.url}", apiHeaders) } - private val vkExtractor by lazy { VkExtractor(client, headers) } - private val cdaExtractor by lazy { CdaPlExtractor(client) } - private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) } - private val dailymotionExtractor by lazy { DailymotionExtractor(client, headers) } - private val sibnetExtractor by lazy { SibnetExtractor(client) } - override fun videoListParse(response: Response): List