diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png index 16bbe4506..b030d70c9 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png index 0dfa0f915..2630aab2d 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png index f362b11b8..f9dc791e5 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png index 0005c44f7..54d400e77 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png index 63ca5d3c2..c60c9090a 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/comicdays/res/web_hi_res_512.png index 5ffcdef78..eb2b71413 100644 Binary files a/multisrc/overrides/gigaviewer/comicdays/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/comicdays/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png index a837d19cf..25c644933 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png index f413b8b83..512b5018b 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png index f5cddd3cd..b37db1951 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png index 7ecdf487d..e65daae14 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png index 4c5b61cb4..dd01c5fa7 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comicgardo/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/comicgardo/res/web_hi_res_512.png index 79d3ffb00..076ace3fa 100644 Binary files a/multisrc/overrides/gigaviewer/comicgardo/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/comicgardo/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt b/multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt index a21c1b72d..ba6be3d61 100644 --- a/multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt +++ b/multisrc/overrides/gigaviewer/comicgardo/src/ComicGardo.kt @@ -23,8 +23,8 @@ class ComicGardo : GigaViewer( override fun popularMangaSelector(): String = "ul.series-section-list li.series-section-item > a" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("h5.series-title").text() - thumbnail_url = element.select("div.thumb img").attr("data-src") + title = element.selectFirst("h5.series-title").text() + thumbnail_url = element.selectFirst("div.thumb img").attr("data-src") setUrlWithoutDomain(element.attr("href")) } diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png index 2a8fcd000..2d169d46a 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png index 231d25f75..f0486db50 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png index c70af0994..45b63d67b 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png index c056689df..e6ff5ed1f 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png index aac0d0ea5..4ddc9bff6 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/comiplex/res/web_hi_res_512.png index 1c73548de..ce32c1d8c 100644 Binary files a/multisrc/overrides/gigaviewer/comiplex/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/comiplex/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png index ab0ab1132..c3cd570f3 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png index 2f63cf4bf..49ba3efdb 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png index e1b60cdcb..ca8d65936 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png index e01b66181..73eff6e66 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png index 5451a1f9c..f9eb54002 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/corocoroonline/res/web_hi_res_512.png index 32cb54d45..4155b33a2 100644 Binary files a/multisrc/overrides/gigaviewer/corocoroonline/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/corocoroonline/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt b/multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt index 1c0176f20..7d59cb263 100644 --- a/multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt +++ b/multisrc/overrides/gigaviewer/corocoroonline/src/CorocoroOnline.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension.ja.corocoroonline import eu.kanade.tachiyomi.multisrc.gigaviewer.GigaViewer import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage import eu.kanade.tachiyomi.source.model.SChapter @@ -19,6 +18,8 @@ class CorocoroOnline : GigaViewer( "https://cdn-img.www.corocoro.jp/public/page" ) { + override val supportsLatest: Boolean = false + override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(::imageIntercept) .build() @@ -27,23 +28,18 @@ class CorocoroOnline : GigaViewer( override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga", headers) - override fun popularMangaSelector(): String = "ul.p-list-manga li.p-wp-list-item > a" + override fun popularMangaSelector(): String = "a.p-article-wrap" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { title = element.selectFirst("h3.p-article-title")!!.text() - .substringBefore("第") - .trim() - thumbnail_url = element.selectFirst("img")!!.attr("src") + .substringAfter(']') + thumbnail_url = element.selectFirst("> .p-article-image > img")!!.attr("src") setUrlWithoutDomain(element.attr("href")) } - override fun latestUpdatesSelector(): String = "div.p-manga-today a.p-article-wrap" - // Site doesn't have a manga search and only returns news in search results. override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { - return client.newCall(popularMangaRequest(page)) - .asObservableSuccess() - .map(::popularMangaParse) + return fetchPopularManga(page) .map { allManga -> val filteredManga = allManga.mangas.filter { manga -> manga.title.contains(query, true) @@ -65,6 +61,8 @@ class CorocoroOnline : GigaViewer( // All chapters seems to be free. override fun chapterListSelector(): String = "li.episode" + override val chapterListMode = CHAPTER_LIST_LOCKED + // The source have no collections, so no need to have filters. override fun getFilterList(): FilterList = FilterList() diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png index c281f6552..f14743bb8 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/default/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png index 02cf3e3a5..e46ce03bf 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/default/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png index 4df727c6b..e28ccdb5d 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/default/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png index cbec25604..7b752dc55 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/default/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png index 2b0215b09..9f8fdb738 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/default/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/default/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/default/res/web_hi_res_512.png index 2b29b0146..151769b0e 100644 Binary files a/multisrc/overrides/gigaviewer/default/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/default/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png index 719e29318..541af8ac8 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png index 08663e441..f1c8971a1 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png index 4a0a2f723..fab9b1003 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png index 2e25ca77d..ee954b550 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png index 3b3382bed..008726b79 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/kuragebunch/res/web_hi_res_512.png index 91a3dac57..374bde806 100644 Binary files a/multisrc/overrides/gigaviewer/kuragebunch/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/kuragebunch/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt b/multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt index 6bddb0941..07822227a 100644 --- a/multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt +++ b/multisrc/overrides/gigaviewer/kuragebunch/src/KurageBunch.kt @@ -27,9 +27,9 @@ class KurageBunch : GigaViewer( override fun popularMangaSelector(): String = "ul.page-series-list li div.item-box" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("a.series-data-container h4").text() - thumbnail_url = element.select("a.series-thumb img").attr("data-src") - setUrlWithoutDomain(element.select("a").first()!!.attr("href")) + title = element.selectFirst("a.series-data-container h4").text() + thumbnail_url = element.selectFirst("a.series-thumb img").attr("data-src") + setUrlWithoutDomain(element.selectFirst("a")!!.attr("href")) } override fun chapterListSelector(): String = "li.episode" diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png index e2ad42f63..71b561beb 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png index 906bf4457..cda8755b7 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png index 466243c35..095694514 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png index 30a77017c..91dd77058 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png index 518023ece..8424d2dc4 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/magazinepocket/res/web_hi_res_512.png index 6efe3a63b..543956ca4 100644 Binary files a/multisrc/overrides/gigaviewer/magazinepocket/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/magazinepocket/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt b/multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt index 0a6db39cc..24d1f586f 100644 --- a/multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt +++ b/multisrc/overrides/gigaviewer/magazinepocket/src/MagazinePocket.kt @@ -21,8 +21,8 @@ class MagazinePocket : GigaViewer( override fun popularMangaSelector(): String = "ul.daily-series li.daily-series-item > a" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("h4.daily-series-title").text() - thumbnail_url = element.select("div.daily-series-thumb img").attr("data-src") + title = element.selectFirst("h4.daily-series-title").text() + thumbnail_url = element.selectFirst("div.daily-series-thumb img").attr("data-src") setUrlWithoutDomain(element.attr("href")) } diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png index 6bce2ba0e..ddbdb3bfa 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png index 1c8300d7c..32b1ac437 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png index 94840dab3..44e899370 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png index 6be6b47b2..a0e87bfeb 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png index 48fa911f6..4dc7d16f1 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/magcomi/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/magcomi/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/magcomi/res/web_hi_res_512.png index e52c638e7..e807b364f 100644 Binary files a/multisrc/overrides/gigaviewer/magcomi/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/magcomi/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png index e9eb56a57..46d908d23 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png index 3da83cd78..1b5829133 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png index 3b8ee05b7..eb3eb16da 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png index e801c5560..fbe22f77b 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png index 027d43fe5..b7b07b121 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/shonenjumpplus/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/shonenjumpplus/res/web_hi_res_512.png index 0e6dc3ea4..d6916e649 100644 Binary files a/multisrc/overrides/gigaviewer/shonenjumpplus/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/shonenjumpplus/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png index a6a883b37..f504dae0a 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png index 0fa8008e8..85523db09 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png index 442a8ed4a..58b710261 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png index 657372833..5345814d8 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png index 2d58b9a41..353165ac3 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/web_hi_res_512.png index adc9fa677..877db8184 100644 Binary files a/multisrc/overrides/gigaviewer/sundaywebevery/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/sundaywebevery/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt b/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt index 63205d68b..989a202ed 100644 --- a/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt +++ b/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt @@ -28,7 +28,7 @@ class SundayWebEvery : GigaViewer( override fun latestUpdatesSelector(): String = "h3#series-$dayOfWeek + section " + popularMangaSelector() - override fun chapterListSelector(): String = "li.episode:not(.private)" + override val chapterListMode = CHAPTER_LIST_LOCKED override fun getCollections(): List = listOf( Collection("連載作品", ""), diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png index 209de0726..a54cd5ad6 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png index 7afdd7b7f..5dfd28141 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png index d16435f25..0b4fd4cc8 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png index bf91bd048..cb3a5a64e 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png index 9b449cbea..81136b36d 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/web_hi_res_512.png b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/web_hi_res_512.png index 407ea41d0..e29bcbaf0 100644 Binary files a/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/web_hi_res_512.png and b/multisrc/overrides/gigaviewer/tonarinoyoungjump/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt b/multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt index 798502b92..77b7a4a5a 100644 --- a/multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt +++ b/multisrc/overrides/gigaviewer/tonarinoyoungjump/src/TonariNoYoungJump.kt @@ -23,14 +23,14 @@ class TonariNoYoungJump : GigaViewer( override fun popularMangaSelector(): String = "ul.series-table-list li.subpage-table-list-item > a" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("h4.title").text() - thumbnail_url = element.select("div.subpage-image-wrapper img").attr("data-src") + title = element.selectFirst("h4.title").text() + thumbnail_url = element.selectFirst("div.subpage-image-wrapper img").attr("data-src") .replace("{width}", "528") .replace("{height}", "528") setUrlWithoutDomain(element.attr("href")) } - override fun chapterListSelector(): String = "li.episode" + override val chapterListMode = CHAPTER_LIST_LOCKED override fun getCollections(): List = listOf( Collection("連載中", ""), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt index f3d027d66..18e40d70a 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewer.kt @@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.util.asJsoup +import kotlinx.serialization.SerializationException import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject @@ -22,7 +23,7 @@ import okhttp3.Call import okhttp3.Headers import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Interceptor -import okhttp3.MediaType.Companion.toMediaTypeOrNull +import okhttp3.MediaType.Companion.toMediaType import okhttp3.Request import okhttp3.Response import okhttp3.ResponseBody.Companion.toResponseBody @@ -66,8 +67,8 @@ abstract class GigaViewer( override fun popularMangaSelector(): String = "ul.series-list li a" override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("h2.series-list-title").text() - thumbnail_url = element.select("div.series-list-thumb img") + title = element.selectFirst("h2.series-list-title").text() + thumbnail_url = element.selectFirst("div.series-list-thumb img") .attr("data-src") setUrlWithoutDomain(element.attr("href")) } @@ -112,9 +113,9 @@ abstract class GigaViewer( override fun searchMangaSelector() = "ul.search-series-list li, ul.series-list li" override fun searchMangaFromElement(element: Element): SManga = SManga.create().apply { - title = element.select("div.title-box p.series-title").text() - thumbnail_url = element.select("div.thmb-container a img").attr("src") - setUrlWithoutDomain(element.select("div.thmb-container a").attr("href")) + title = element.selectFirst("div.title-box p.series-title").text() + thumbnail_url = element.selectFirst("div.thmb-container a img").attr("src") + setUrlWithoutDomain(element.selectFirst("div.thmb-container a").attr("href")) } override fun searchMangaNextPageSelector(): String? = null @@ -122,19 +123,19 @@ abstract class GigaViewer( protected open fun mangaDetailsInfoSelector(): String = "section.series-information div.series-header" override fun mangaDetailsParse(document: Document): SManga = SManga.create().apply { - val infoElement = document.select(mangaDetailsInfoSelector()).first()!! + val infoElement = document.selectFirst(mangaDetailsInfoSelector())!! - title = infoElement.select("h1.series-header-title").text() - author = infoElement.select("h2.series-header-author").text() + title = infoElement.selectFirst("h1.series-header-title").text() + author = infoElement.selectFirst("h2.series-header-author").text() artist = author - description = infoElement.select("p.series-header-description").text() - thumbnail_url = infoElement.select("div.series-header-image-wrapper img") + description = infoElement.selectFirst("p.series-header-description").text() + thumbnail_url = infoElement.selectFirst("div.series-header-image-wrapper img") .attr("data-src") } override fun chapterListParse(response: Response): List { val document = response.asJsoup() - val readableProductList = document.select("div.js-readable-product-list").first()!! + val readableProductList = document.selectFirst("div.js-readable-product-list")!! val firstListEndpoint = readableProductList.attr("data-first-list-endpoint") .toHttpUrlOrNull()!! val latestListEndpoint = readableProductList.attr("data-latest-list-endpoint") @@ -162,9 +163,9 @@ abstract class GigaViewer( response.request.url.toString() ) - chapters += tempDocument + tempDocument .select("ul.series-episode-list " + chapterListSelector()) - .map { element -> chapterFromElement(element) } + .mapTo(chapters) { element -> chapterFromElement(element) } request = GET(readMoreEndpoint, newHeaders) result = client.newCall(request).execute() @@ -175,15 +176,22 @@ abstract class GigaViewer( return chapters } - override fun chapterListSelector() = "li.episode:has(span.series-episode-list-is-free)" + override fun chapterListSelector() = "li.episode" + + protected open val chapterListMode = CHAPTER_LIST_PAID override fun chapterFromElement(element: Element): SChapter { - val info = element.select("a.series-episode-list-container").first() ?: element + val info = element.selectFirst("a.series-episode-list-container") ?: element val mangaUrl = element.ownerDocument().location() return SChapter.create().apply { - name = info.select("h4.series-episode-list-title").text() - date_upload = info.select("span.series-episode-list-date").first() + name = info.selectFirst("h4.series-episode-list-title").text() + if (chapterListMode == CHAPTER_LIST_PAID && element.selectFirst("span.series-episode-list-is-free") == null) { + name = YEN_BANKNOTE + name + } else if (chapterListMode == CHAPTER_LIST_LOCKED && element.hasClass("private")) { + name = LOCK + name + } + date_upload = info.selectFirst("span.series-episode-list-date") ?.text().orEmpty() .toDate() scanlator = publisher @@ -192,9 +200,15 @@ abstract class GigaViewer( } override fun pageListParse(document: Document): List { - val episode = document.select("script#episode-json") + val episode = document.selectFirst("script#episode-json") .attr("data-value") - .let { json.decodeFromString(it) } + .let { + try { + json.decodeFromString(it) + } catch (e: SerializationException) { + throw Exception("このチャプターは非公開です\nChapter is not available!") + } + } return episode.readableProduct.pageStructure.pages .filter { it.type == "main" } @@ -251,7 +265,7 @@ abstract class GigaViewer( val response = chain.proceed(request) val image = decodeImage(response.body!!.byteStream(), width, height) - val body = image.toResponseBody("image/png".toMediaTypeOrNull()) + val body = image.toResponseBody(jpegMediaType) response.close() @@ -283,7 +297,7 @@ abstract class GigaViewer( } val output = ByteArrayOutputStream() - result.compress(Bitmap.CompressFormat.PNG, 100, output) + result.compress(Bitmap.CompressFormat.JPEG, 90, output) return output.toByteArray() } @@ -306,5 +320,12 @@ abstract class GigaViewer( private const val DIVIDE_NUM = 4 private const val MULTIPLE = 8 + private val jpegMediaType = "image/jpeg".toMediaType() + + const val CHAPTER_LIST_PAID = 0 + const val CHAPTER_LIST_LOCKED = 1 + + private const val YEN_BANKNOTE = "💴 " + private const val LOCK = "🔒 " } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt index 79f898357..da9d02c92 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gigaviewer/GigaViewerGenerator.kt @@ -9,7 +9,7 @@ class GigaViewerGenerator : ThemeSourceGenerator { override val themeClass = "GigaViewer" - override val baseVersionCode: Int = 4 + override val baseVersionCode: Int = 5 override val sources = listOf( SingleLang("Comic Days", "https://comic-days.com", "ja"),