From cd9f02790946526e9632361791e6b3188a377803 Mon Sep 17 00:00:00 2001 From: Rama Bondan Prakoso Date: Wed, 18 Sep 2019 05:26:41 +0700 Subject: [PATCH] FoolSlide: Update Hentai Cafe (#1522) * Fix genres and artist parsing * Set status as completed * Set chapters number to 1 * Fix latest update load if there is no thumbnail Signed-off-by: Rama Bondan Prakoso --- src/all/foolslide/build.gradle | 2 +- .../extension/all/foolslide/HentaiCafe.kt | 28 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/all/foolslide/build.gradle b/src/all/foolslide/build.gradle index 8af61468a..8668e1003 100644 --- a/src/all/foolslide/build.gradle +++ b/src/all/foolslide/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: FoolSlide' pkgNameSuffix = 'all.foolslide' extClass = '.FoolSlideFactory' - extVersionCode = 24 + extVersionCode = 25 libVersion = '1.2' } diff --git a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/HentaiCafe.kt b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/HentaiCafe.kt index fd87ac9d3..b7af35c77 100644 --- a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/HentaiCafe.kt +++ b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/HentaiCafe.kt @@ -20,8 +20,12 @@ class HentaiCafe : FoolSlide("Hentai Cafe", "https://hentai.cafe", "en", "/manga override fun latestUpdatesFromElement(element: Element) = SManga.create().apply { val urlElement = element.select(".entry-thumb").first() - setUrlWithoutDomain(urlElement.attr("href")) - thumbnail_url = urlElement.child(0).attr("src") + if (urlElement != null) { + setUrlWithoutDomain(urlElement.attr("href")) + thumbnail_url = urlElement.child(0).attr("src") + } else { + setUrlWithoutDomain(element.select(".entry-title a").attr("href")) + } title = element.select(".entry-title").text().trim() } @@ -35,13 +39,17 @@ class HentaiCafe : FoolSlide("Hentai Cafe", "https://hentai.cafe", "en", "/manga title = document.select(".entry-title").text() val contentElement = document.select(".entry-content").first() thumbnail_url = contentElement.child(0).child(0).attr("src") - - fun filterableTagsOfType(type: String) = contentElement.select("a") - .filter { "$baseUrl/$type/" in it.attr("href") } - .joinToString { it.text() } - - genre = filterableTagsOfType("tag") - artist = filterableTagsOfType("artist") + val genres = mutableListOf() + document.select(".content a[rel=tag]").forEach { element -> + if (!element.attr("href").contains("artist")) + genres.add(element.text()) + else { + artist = element.text() + author = element.text() + } + } + status = SManga.COMPLETED + genre = genres.joinToString(", ") } // Note that the reader URL cannot be deduced from the manga URL all the time which is why @@ -51,7 +59,7 @@ class HentaiCafe : FoolSlide("Hentai Cafe", "https://hentai.cafe", "en", "/manga SChapter.create().apply { setUrlWithoutDomain(response.asJsoup().select("[title=Read]").attr("href")) name = "Chapter" - chapter_number = 0.0f + chapter_number = 1f } )