From fdde5b67cbe5048ddf63091f933373f053b2a94e Mon Sep 17 00:00:00 2001 From: adly98 <111687237+adly98@users.noreply.github.com> Date: Wed, 19 Oct 2022 23:23:22 +0200 Subject: [PATCH] Akwam: merge extensions (#951) --- src/ar/akwam/build.gradle | 2 +- .../animeextension/ar/akwam/Akwam.kt | 60 +++- src/ar/akwams/AndroidManifest.xml | 2 - src/ar/akwams/build.gradle | 12 - src/ar/akwams/res/mipmap-hdpi/ic_launcher.png | Bin 2480 -> 0 bytes src/ar/akwams/res/mipmap-mdpi/ic_launcher.png | Bin 1633 -> 0 bytes .../akwams/res/mipmap-xhdpi/ic_launcher.png | Bin 3301 -> 0 bytes .../akwams/res/mipmap-xxhdpi/ic_launcher.png | Bin 5298 -> 0 bytes .../akwams/res/mipmap-xxxhdpi/ic_launcher.png | Bin 7356 -> 0 bytes src/ar/akwams/res/play_store_512.png | Bin 19598 -> 0 bytes .../animeextension/ar/akwams/AkwamS.kt | 322 ------------------ 11 files changed, 50 insertions(+), 348 deletions(-) delete mode 100644 src/ar/akwams/AndroidManifest.xml delete mode 100644 src/ar/akwams/build.gradle delete mode 100644 src/ar/akwams/res/mipmap-hdpi/ic_launcher.png delete mode 100644 src/ar/akwams/res/mipmap-mdpi/ic_launcher.png delete mode 100644 src/ar/akwams/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 src/ar/akwams/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 src/ar/akwams/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 src/ar/akwams/res/play_store_512.png delete mode 100644 src/ar/akwams/src/eu/kanade/tachiyomi/animeextension/ar/akwams/AkwamS.kt diff --git a/src/ar/akwam/build.gradle b/src/ar/akwam/build.gradle index 5a84e2330..93ec62a55 100644 --- a/src/ar/akwam/build.gradle +++ b/src/ar/akwam/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'أكوام' pkgNameSuffix = 'ar.akwam' extClass = '.Akwam' - extVersionCode = 7 + extVersionCode = 8 libVersion = '13' } diff --git a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt index d160f3c86..42a8be1bc 100644 --- a/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt +++ b/src/ar/akwam/src/eu/kanade/tachiyomi/animeextension/ar/akwam/Akwam.kt @@ -57,16 +57,45 @@ class Akwam : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun popularAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]" // episodes + override fun episodeListSelector() = "div.bg-primary2 h2 a" - override fun episodeListSelector() = "input#reportInputUrl" + override fun episodeListParse(response: Response): List { + val episodes = mutableListOf() + fun addEpisodes(document: Document) { + if (document.select(episodeListSelector()).isNullOrEmpty()) { + // add movie + document.select("input#reportInputUrl").map { episodes.add(episodeFromElement(it)) } + } else { + document.select(episodeListSelector()).map { episodes.add(episodesFromElement(it)) } + } + } + addEpisodes(response.asJsoup()) + return episodes + } override fun episodeFromElement(element: Element): SEpisode { val episode = SEpisode.create() episode.setUrlWithoutDomain(element.attr("value")) - episode.name = element.ownerDocument().select("picture > img.img-fluid").attr("alt") + episode.name = "مشاهدة" return episode } + private fun episodesFromElement(element: Element): SEpisode { + val episode = SEpisode.create() + val epNum = getNumberFromEpsString(element.text()) + episode.setUrlWithoutDomain(element.attr("href")) + episode.name = element.text() + episode.episode_number = when { + (epNum.isNotEmpty()) -> epNum.toFloat() + else -> 1F + } + return episode + } + + private fun getNumberFromEpsString(epsStr: String): String { + return epsStr.filter { it.isDigit() } + } + // Video links override fun videoListParse(response: Response): List