diff --git a/multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt b/multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt index 5530389a4..26bfa2d13 100644 --- a/multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt +++ b/multisrc/overrides/bilibili/bilibilimanga/src/BilibiliManga.kt @@ -27,9 +27,15 @@ class BilibiliManga : Bilibili( return emptyList() } - return result.data!!.episodeList - .filter { episode -> episode.isInFree || !episode.isLocked } - .map { ep -> chapterFromObject(ep, result.data.id) } + val data = result.data!! + val id = data.id + return data.episodeList.mapNotNull { episode -> + if (episode.isInFree || !episode.isLocked) { + chapterFromObject(episode, id) + } else { + null + } + } } override val defaultPopularSort: Int = 0 diff --git a/multisrc/overrides/madara/akumanga/AkuManga.kt b/multisrc/overrides/madara/akumanga/AkuManga.kt deleted file mode 100644 index b7fee1faf..000000000 --- a/multisrc/overrides/madara/akumanga/AkuManga.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.akumanga - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class AkuManga : Madara("AkuManga", "https://akumanga.com", "en") { - - override val id: Long = 107810123708352143 - - override val chapterUrlSuffix = "" -} diff --git a/multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt b/multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt index 8b0d5d479..bcd600564 100644 --- a/multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt +++ b/multisrc/overrides/madara/mangaonelove/src/MangaOneLove.kt @@ -4,4 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class MangaOneLove : Madara("Manga One Love", "https://mangaonelove.site/", "ru", SimpleDateFormat("dd.MM.yyyy", Locale.US)) +class MangaOneLove : Madara("Manga One Love", "https://mangaonelove.site", "ru", SimpleDateFormat("dd.MM.yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/pikiranwibu/PikiranWibu.kt b/multisrc/overrides/madara/pikiranwibu/PikiranWibu.kt deleted file mode 100644 index 11119216c..000000000 --- a/multisrc/overrides/madara/pikiranwibu/PikiranWibu.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.id.pikiranwibu - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class PikiranWibu : Madara( - "Pikiran Wibu", - "https://pikiran-wibu.com", - "id", - SimpleDateFormat("dd MMM yy", Locale("en")), -) { - - // popular is the latest - override val supportsLatest = false - - override val filterNonMangaItems = false - - override val mangaSubString = "" -} diff --git a/multisrc/overrides/hikariscan/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/hikariscan/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/hikariscan/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/hikariscan/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/hikariscan/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/hikariscan/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/hikariscan/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/hikariscan/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/mangathemesia/hikariscan/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/hikariscan/src/HikariScan.kt b/multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt similarity index 100% rename from multisrc/overrides/hikariscan/src/HikariScan.kt rename to multisrc/overrides/mangathemesia/hikariscan/src/HikariScan.kt diff --git a/multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt b/multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt index 3bc87fcbe..53d4b3816 100644 --- a/multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt +++ b/multisrc/overrides/mangathemesia/rawkuma/src/Rawkuma.kt @@ -4,7 +4,7 @@ import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia import eu.kanade.tachiyomi.network.interceptor.rateLimit import okhttp3.OkHttpClient -class Rawkuma : MangaThemesia("Rawkuma", "https://rawkuma.com/", "ja") { +class Rawkuma : MangaThemesia("Rawkuma", "https://rawkuma.com", "ja") { override val client: OkHttpClient = super.client.newBuilder() .rateLimit(4) diff --git a/multisrc/overrides/zeistmanga/sobatmanku/SobatManKu.kt b/multisrc/overrides/zeistmanga/sobatmanku/SobatManKu.kt deleted file mode 100644 index bd08c5c1d..000000000 --- a/multisrc/overrides/zeistmanga/sobatmanku/SobatManKu.kt +++ /dev/null @@ -1,19 +0,0 @@ -package eu.kanade.tachiyomi.extension.id.sobatmanku - -import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga -import eu.kanade.tachiyomi.source.model.SChapter -import okhttp3.Response - -class SobatManKu : ZeistManga("SobatManKu", "https://www.sobatmanku19.site", "id") { - - override val hasFilters = true - - override fun chapterListParse(response: Response): List { - return super.chapterListParse(response).onEach { - // fix some chapter name - it.name = it.name.run { - substring(indexOf("Chapter")) - } - } - } -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt index 4c9bc812c..d5602412b 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt @@ -352,8 +352,7 @@ abstract class LibGroup( } } - private fun sortChaptersByTranslator - (sortingList: String?, chaptersList: JsonArray?, slug: String, userId: String, branches: List): List? { + private fun sortChaptersByTranslator(sortingList: String?, chaptersList: JsonArray?, slug: String, userId: String, branches: List): List? { var chapters: List? = null val volume = "(?<=/v)[0-9]+(?=/c[0-9]+)".toRegex() val tempChaptersList = mutableListOf() @@ -394,8 +393,7 @@ abstract class LibGroup( return chapters } - private fun chapterFromElement - (chapterItem: JsonElement, sortingList: String?, slug: String, userId: String, teamIdParam: Int? = null, branches: List? = null, teams: List? = null, chaptersList: JsonArray? = null): SChapter { + private fun chapterFromElement(chapterItem: JsonElement, sortingList: String?, slug: String, userId: String, teamIdParam: Int? = null, branches: List? = null, teams: List? = null, chaptersList: JsonArray? = null): SChapter { val chapter = SChapter.create() val volume = chapterItem.jsonObject["chapter_volume"]!!.jsonPrimitive.int diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index c996f0a0c..be390bdbb 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -25,7 +25,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Adonis Fansub", "https://manga.adonisfansub.com", "tr", overrideVersionCode = 1), SingleLang("Adult Webtoon", "https://adultwebtoon.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Akimangá", "https://akimanga.com", "pt-BR", isNsfw = true, className = "Akimanga"), - SingleLang("AkuManga", "https://akumanga.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Akuzenai Arts", "https://akuzenaiarts.org", "en"), SingleLang("AllPornComic", "https://allporncomic.com", "en", isNsfw = true), SingleLang("Amuy", "https://apenasmaisumyaoi.com", "pt-BR", isNsfw = true, overrideVersionCode = 1), @@ -220,7 +219,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga Mammy", "https://mangamammy.ru", "ru", isNsfw = true), SingleLang("Manga Mitsu", "https://mangamitsu.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Manga Nerds", "https://manganerds.com", "en"), - SingleLang("Manga One Love", "https://mangaonelove.site/", "ru", isNsfw = true), + SingleLang("Manga One Love", "https://mangaonelove.site", "ru", isNsfw = true, overrideVersionCode = 1), SingleLang("Manga Online Team", "https://mangaonlineteam.com", "en"), SingleLang("Manga Queen", "https://mangaqueen.net", "en"), SingleLang("Manga Queen.com", "https://mangaqueen.com", "en", isNsfw = true, className = "MangaQueenCom"), @@ -397,7 +396,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Paw Manga", "https://pawmanga.com", "en", isNsfw = true), SingleLang("Petrotechsociety", "https://www.petrotechsociety.org", "en", isNsfw = true), SingleLang("Pian Manga", "https://pianmanga.me", "en", isNsfw = true, overrideVersionCode = 1), - SingleLang("Pikiran Wibu", "https://pikiran-wibu.com", "id"), SingleLang("Pink Sea Unicorn", "https://psunicorn.com", "pt-BR", isNsfw = true), SingleLang("Pirulito Rosa", "https://pirulitorosa.site", "pt-BR", isNsfw = true), SingleLang("Platinum Crown", "https://platinumscans.com", "en", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt index 54623e47d..53cefb9af 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangathemesia/MangaThemesiaGenerator.kt @@ -49,7 +49,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Gremory Mangas", "https://gremorymangas.com", "es"), SingleLang("Hanuman Scan", "https://hanumanscan.com", "en"), SingleLang("Heroxia", "https://heroxia.com", "id", isNsfw = true), - SingleLang("Hikari Scan", "https://hikariscan.org", "pt-BR", isNsfw = true, overrideVersionCode = 1), + SingleLang("Hikari Scan", "https://hikariscan.org", "pt-BR", isNsfw = true, overrideVersionCode = 2), SingleLang("Imagine Scan", "https://imaginescan.com.br", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("InariManga", "https://inarimanga.com", "es", overrideVersionCode = 7), SingleLang("Infernal Void Scans", "https://void-scans.com", "en", overrideVersionCode = 5), @@ -117,7 +117,7 @@ class MangaThemesiaGenerator : ThemeSourceGenerator { SingleLang("Quantum Scans", "https://readers-point.space", "en"), SingleLang("Raiki Scan", "https://raikiscan.com", "es"), SingleLang("Raven Scans", "https://ravenscans.com", "en", overrideVersionCode = 1), - SingleLang("Rawkuma", "https://rawkuma.com/", "ja"), + SingleLang("Rawkuma", "https://rawkuma.com", "ja", overrideVersionCode = 1), SingleLang("ReadGojo", "https://readgojo.com", "en"), SingleLang("Readkomik", "https://readkomik.com", "en", className = "ReadKomik", overrideVersionCode = 1), SingleLang("Sekaikomik", "https://sekaikomik.bio", "id", isNsfw = true, overrideVersionCode = 11), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt index da30259f5..429104f2f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaAltGenerator.kt @@ -12,7 +12,7 @@ class PaprikaAltGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - SingleLang("MangaReader.cc", "http://mangareader.cc/", "en", className = "MangaReaderCC", overrideVersionCode = 1), // more sites in the future might use MangaReader.cc 's overrides as they did in the past + SingleLang("MangaReader.cc", "http://mangareader.cc", "en", className = "MangaReaderCC", overrideVersionCode = 2), // more sites in the future might use MangaReader.cc 's overrides as they did in the past ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt index edb0c9234..b2445d846 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/ProgressiveParser.kt @@ -1,6 +1,6 @@ package eu.kanade.tachiyomi.multisrc.sinmh -internal class ProgressiveParser(private val text: String) { +class ProgressiveParser(private val text: String) { private var startIndex = 0 fun substringBetween(left: String, right: String): String = with(text) { val leftIndex = indexOf(left, startIndex) + left.length diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt index 31a865701..47bb38d23 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt @@ -28,7 +28,6 @@ class ZeistMangaGenerator : ThemeSourceGenerator { SingleLang("Mikrokosmos Fansub", "https://mikrokosmosfb.blogspot.com", "tr", isNsfw = true), SingleLang("Shadow Çeviri", "https://shadowceviri.blogspot.com", "tr", className = "ShadowCeviri"), SingleLang("ShiyuraSub", "https://shiyurasub.blogspot.com", "id"), - SingleLang("SobatManKu", "https://www.sobatmanku19.site", "id"), SingleLang("Tooncubus", "https://www.tooncubus.top", "id", isNsfw = true), SingleLang("Tyrant Scans", "https://www.tyrantscans.com", "pt-BR"), SingleLang("Yokai", "https://yokai-team.blogspot.com", "ar", overrideVersionCode = 1),