diff --git a/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comicdays/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..16bbe4506 Binary files /dev/null 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 new file mode 100644 index 000000000..0dfa0f915 Binary files /dev/null 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 new file mode 100644 index 000000000..f362b11b8 Binary files /dev/null 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 new file mode 100644 index 000000000..0005c44f7 Binary files /dev/null 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 new file mode 100644 index 000000000..63ca5d3c2 Binary files /dev/null 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 new file mode 100644 index 000000000..5ffcdef78 Binary files /dev/null and b/multisrc/overrides/gigaviewer/comicdays/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/comicdays/src/ComicDays.kt b/multisrc/overrides/gigaviewer/comicdays/src/ComicDays.kt new file mode 100644 index 000000000..31ab4c84c --- /dev/null +++ b/multisrc/overrides/gigaviewer/comicdays/src/ComicDays.kt @@ -0,0 +1,35 @@ +package eu.kanade.tachiyomi.extension.ja.comicdays + +import eu.kanade.tachiyomi.multisrc.gigaviewer.GigaViewer +import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.OkHttpClient +import org.jsoup.nodes.Element + +class ComicDays : GigaViewer( + "Comic Days", + "https://comic-days.com", + "ja", + "https://cdn-img.comic-days.com/public/page" +) { + + override val client: OkHttpClient = super.client.newBuilder() + .addInterceptor(::imageIntercept) + .build() + + override val publisher: String = "講談社" + + override fun popularMangaSelector(): String = "ul.daily-series li.daily-series-item:has(a.link)" + + override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { + title = element.selectFirst("h4.daily-series-title")!!.text() + thumbnail_url = element.selectFirst("div.daily-series-thumb img")!! + .attr("data-src") + setUrlWithoutDomain(element.selectFirst("a.link")!!.attr("href")) + } + + override fun latestUpdatesSelector(): String = "section#$dayOfWeek.daily " + popularMangaSelector() + + override fun getCollections(): List = listOf( + Collection("連載作品一覧", "") + ) +} diff --git a/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/comiplex/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..2a8fcd000 Binary files /dev/null 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 new file mode 100644 index 000000000..231d25f75 Binary files /dev/null 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 new file mode 100644 index 000000000..c70af0994 Binary files /dev/null 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 new file mode 100644 index 000000000..c056689df Binary files /dev/null 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 new file mode 100644 index 000000000..aac0d0ea5 Binary files /dev/null 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 new file mode 100644 index 000000000..1c73548de Binary files /dev/null and b/multisrc/overrides/gigaviewer/comiplex/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/gigaviewer/comiplex/src/Comiplex.kt b/multisrc/overrides/gigaviewer/comiplex/src/Comiplex.kt new file mode 100644 index 000000000..27c6a4968 --- /dev/null +++ b/multisrc/overrides/gigaviewer/comiplex/src/Comiplex.kt @@ -0,0 +1,42 @@ +package eu.kanade.tachiyomi.extension.ja.comiplex + +import eu.kanade.tachiyomi.multisrc.gigaviewer.GigaViewer +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.OkHttpClient +import okhttp3.Request +import org.jsoup.nodes.Element + +class Comiplex : GigaViewer( + "Comiplex", + "https://viewer.heros-web.com", + "ja", + "https://cdn-img.viewer.heros-web.com/public/page" +) { + + override val supportsLatest: Boolean = false + + override val client: OkHttpClient = super.client.newBuilder() + .addInterceptor(::imageIntercept) + .build() + + override val publisher: String = "ヒーローズ" + + override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/series/heros", headers) + + override fun popularMangaSelector(): String = "ul.series-items li.series-item > a" + + override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { + title = element.selectFirst("h4.item-series-title")!!.text() + thumbnail_url = element.selectFirst("div.series-item-thumb img")!! + .attr("data-src") + setUrlWithoutDomain(element.attr("href")) + } + + override fun getCollections(): List = listOf( + Collection("ヒーローズ", "heros"), + Collection("ふらっとヒーローズ", "flat"), + Collection("わいるどヒーローズ", "wild"), + Collection("読切作品", "oneshot") + ) +} diff --git a/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/gigaviewer/sundaywebevery/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a6a883b37 Binary files /dev/null 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 new file mode 100644 index 000000000..0fa8008e8 Binary files /dev/null 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 new file mode 100644 index 000000000..442a8ed4a Binary files /dev/null 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 new file mode 100644 index 000000000..657372833 Binary files /dev/null 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 new file mode 100644 index 000000000..2d58b9a41 Binary files /dev/null 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 new file mode 100644 index 000000000..adc9fa677 Binary files /dev/null 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 new file mode 100644 index 000000000..63205d68b --- /dev/null +++ b/multisrc/overrides/gigaviewer/sundaywebevery/src/SundayWebEvery.kt @@ -0,0 +1,38 @@ +package eu.kanade.tachiyomi.extension.ja.sundaywebevery + +import eu.kanade.tachiyomi.multisrc.gigaviewer.GigaViewer +import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.OkHttpClient +import org.jsoup.nodes.Element + +class SundayWebEvery : GigaViewer( + "Sunday Web Every", + "https://www.sunday-webry.com", + "ja", + "https://cdn-img.www.sunday-webry.com/public/page" +) { + + override val client: OkHttpClient = super.client.newBuilder() + .addInterceptor(::imageIntercept) + .build() + + override val publisher: String = "小学館" + + override fun popularMangaSelector(): String = "ul.webry-series-list li a.webry-series-item-link" + + override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { + title = element.selectFirst("h4.series-title")!!.text() + thumbnail_url = element.selectFirst("div.thumb-wrapper img")!!.attr("data-src") + setUrlWithoutDomain(element.attr("href")) + } + + override fun latestUpdatesSelector(): String = "h3#series-$dayOfWeek + section " + popularMangaSelector() + + override fun chapterListSelector(): String = "li.episode:not(.private)" + + override fun getCollections(): List = listOf( + Collection("連載作品", ""), + Collection("読切", "oneshot"), + Collection("夜サンデー", "yoru-sunday") + ) +} diff --git a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt index 302e5eac5..60fd2c723 100644 --- a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt +++ b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt @@ -23,11 +23,11 @@ open class AsuraScans( override val lang: String, dateFormat: SimpleDateFormat ) : WPMangaStream( - "Asura Scans", - baseUrl, - lang, - dateFormat -), + "Asura Scans", + baseUrl, + lang, + dateFormat + ), ConfigurableSource { private val preferences: SharedPreferences by lazy { 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 f3d8392e6..e2c076c92 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 @@ -12,11 +12,14 @@ class GigaViewerGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 4 override val sources = listOf( + SingleLang("Comic Days", "https://comic-days.com", "ja"), SingleLang("Comic Gardo", "https://comic-gardo.com", "ja"), + SingleLang("Comiplex", "https://viewer.heros-web.com", "ja"), SingleLang("Kurage Bunch", "https://kuragebunch.com", "ja"), SingleLang("MAGCOMI", "https://magcomi.com", "ja", className = "MagComi"), SingleLang("Magazine Pocket", "https://pocket.shonenmagazine.com", "ja"), SingleLang("Shonen Jump+", "https://shonenjumpplus.com", "ja", pkgName = "shonenjumpplus", className = "ShonenJumpPlus", overrideVersionCode = 2), + SingleLang("Sunday Web Every", "https://www.sunday-webry.com", "ja"), SingleLang("Tonari no Young Jump", "https://tonarinoyj.jp", "ja", className = "TonariNoYoungJump") ) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt index eabb7f534..443e40dac 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/monochrome/MonochromeCMS.kt @@ -45,7 +45,9 @@ open class MonochromeCMS( } override fun fetchSearchManga( - page: Int, query: String, filters: FilterList + page: Int, + query: String, + filters: FilterList ): Observable { if (!query.startsWith(UUID_QUERY)) return super.fetchSearchManga(page, query, filters)