diff --git a/src/pt/bakai/build.gradle b/src/pt/bakai/build.gradle index b1f9bb447..d3a9ec476 100644 --- a/src/pt/bakai/build.gradle +++ b/src/pt/bakai/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Bakai' extClass = '.Bakai' - extVersionCode = 3 + extVersionCode = 4 isNsfw = true } diff --git a/src/pt/bakai/res/mipmap-hdpi/ic_launcher.png b/src/pt/bakai/res/mipmap-hdpi/ic_launcher.png index c837ccb9f..dfec91647 100644 Binary files a/src/pt/bakai/res/mipmap-hdpi/ic_launcher.png and b/src/pt/bakai/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/pt/bakai/res/mipmap-mdpi/ic_launcher.png b/src/pt/bakai/res/mipmap-mdpi/ic_launcher.png index dbf4f7191..86341fcc1 100644 Binary files a/src/pt/bakai/res/mipmap-mdpi/ic_launcher.png and b/src/pt/bakai/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/pt/bakai/res/mipmap-xhdpi/ic_launcher.png b/src/pt/bakai/res/mipmap-xhdpi/ic_launcher.png index 37af9a17a..1feeaaf9e 100644 Binary files a/src/pt/bakai/res/mipmap-xhdpi/ic_launcher.png and b/src/pt/bakai/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/pt/bakai/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/bakai/res/mipmap-xxhdpi/ic_launcher.png index 475f77355..164b44f44 100644 Binary files a/src/pt/bakai/res/mipmap-xxhdpi/ic_launcher.png and b/src/pt/bakai/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/pt/bakai/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/bakai/res/mipmap-xxxhdpi/ic_launcher.png index 533a6e19a..a33aa70a8 100644 Binary files a/src/pt/bakai/res/mipmap-xxxhdpi/ic_launcher.png and b/src/pt/bakai/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt b/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt index 3e6c4f4f9..15f01fe76 100644 --- a/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt +++ b/src/pt/bakai/src/eu/kanade/tachiyomi/extension/pt/bakai/Bakai.kt @@ -59,7 +59,7 @@ class Bakai : ParsedHttpSource() { override fun popularMangaSelector() = "#elCmsPageWrap ul > li > article" override fun popularMangaFromElement(element: Element) = SManga.create().apply { - thumbnail_url = element.selectFirst("img")?.absUrl("src") + thumbnail_url = element.selectFirst("img")?.imgAttr() with(element.selectFirst("h2.ipsType_pageTitle a")!!) { title = text() setUrlWithoutDomain(attr("href")) @@ -117,7 +117,7 @@ class Bakai : ParsedHttpSource() { override fun searchMangaSelector() = "ol > li > div" override fun searchMangaFromElement(element: Element) = SManga.create().apply { - thumbnail_url = element.selectFirst(".ipsThumb img")?.absUrl("src") + thumbnail_url = element.selectFirst(".ipsThumb img")?.imgAttr() with(element.selectFirst("h2.ipsStreamItem_title a")!!) { title = text() @@ -130,7 +130,7 @@ class Bakai : ParsedHttpSource() { // =========================== Manga Details ============================ override fun mangaDetailsParse(document: Document) = SManga.create().apply { title = document.selectFirst("h1.ipsType_pageTitle")?.text() ?: "Hentai" - thumbnail_url = document.selectFirst("div.cCmsRecord_image img")?.absUrl("src") + thumbnail_url = document.selectFirst("div.cCmsRecord_image img")?.imgAttr() artist = document.selectFirst("span.mangaInfo:has(strong:contains(Artist)) + a")?.text() genre = document.selectFirst("span.mangaInfo:has(strong:contains(Tags)) + span")?.text() description = document.selectFirst("h2.ipsFieldRow_desc")?.let { @@ -164,7 +164,7 @@ class Bakai : ParsedHttpSource() { override fun pageListParse(document: Document): List { return document.select("div.ipsGrid div.ipsType_center > img") .mapIndexed { index, item -> - Page(index, "", item.absUrl("data-src")) + Page(index, "", item.imgAttr()) } } @@ -172,6 +172,15 @@ class Bakai : ParsedHttpSource() { throw UnsupportedOperationException() } + private fun Element.imgAttr(): String { + return when { + hasAttr("data-lazy-src") -> attr("abs:data-lazy-src") + hasAttr("data-src") -> attr("abs:data-src") + hasAttr("data-cfsrc") -> attr("abs:data-cfsrc") + else -> attr("abs:src") + } + } + companion object { const val PREFIX_SEARCH = "id:" }