diff --git a/multisrc/overrides/madara/animangaes/src/AniMangaEs.kt b/multisrc/overrides/madara/animangaes/src/AniMangaEs.kt deleted file mode 100644 index 886db9bf6..000000000 --- a/multisrc/overrides/madara/animangaes/src/AniMangaEs.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.animangaes - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.source.model.SChapter -import okhttp3.Response - -class AniMangaEs : Madara("AniMangaEs", "https://animangaes.com", "en") { - override val pageListParseSelector = "div.text-left noscript" - override val chapterUrlSuffix = "" - override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() -} diff --git a/multisrc/overrides/madara/manga4all/src/Manga4All.kt b/multisrc/overrides/madara/manga4all/src/Manga4All.kt new file mode 100644 index 000000000..adbd58faf --- /dev/null +++ b/multisrc/overrides/madara/manga4all/src/Manga4All.kt @@ -0,0 +1,14 @@ +package eu.kanade.tachiyomi.extension.en.manga4all + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class Manga4All : Madara( + "Manga4All", + "https://manga4all.net", + "en", + dateFormat = SimpleDateFormat("dd MMMMMM yyyy ", Locale.US) +) { + +} diff --git a/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt b/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt index d5135480c..c35a4b2fb 100644 --- a/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt +++ b/multisrc/overrides/madara/mangalazy/src/MangaLazy.kt @@ -3,8 +3,11 @@ package eu.kanade.tachiyomi.extension.en.mangalazy import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.source.model.Page import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element @Nsfw class MangaLazy : Madara("MangaLazy", "https://mangalazy.com", "en") { @@ -13,6 +16,13 @@ class MangaLazy : Madara("MangaLazy", "https://mangalazy.com", "en") { .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - override val pageListParseSelector = ".reading-content div.text-left div.imgs.loaded-inner :has(>img)" - + override fun pageListParse(document: Document): List { + return document.select(pageListParseSelector).mapIndexed { index, element -> + Page( + index, + "", + element.select("img.d-block.mx-auto").attr("src") + ) + } + } } diff --git a/multisrc/overrides/madara/mangame/mangame/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/mangame/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..6b9ced936 Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangame/mangame/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/mangame/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..45e9b09c6 Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangame/mangame/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..1e2c0bb4a Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..05deb3fe4 Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..c0c9c5b7d Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/mangame/mangame/res/web_hi_res_512.png b/multisrc/overrides/madara/mangame/mangame/res/web_hi_res_512.png new file mode 100644 index 000000000..ce80be44e Binary files /dev/null and b/multisrc/overrides/madara/mangame/mangame/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/mangame/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index d7044f324..000000000 Binary files a/multisrc/overrides/madara/mangame/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 0bf5afcff..000000000 Binary files a/multisrc/overrides/madara/mangame/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 472e52f9b..000000000 Binary files a/multisrc/overrides/madara/mangame/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 5711a845b..000000000 Binary files a/multisrc/overrides/madara/mangame/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/mangame/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 42fb8dd08..000000000 Binary files a/multisrc/overrides/madara/mangame/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/res/web_hi_res_512.png b/multisrc/overrides/madara/mangame/res/web_hi_res_512.png deleted file mode 100644 index 808045b49..000000000 Binary files a/multisrc/overrides/madara/mangame/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/mangame/src/MangaMe.kt b/multisrc/overrides/madara/mangame/src/MangaMe.kt new file mode 100644 index 000000000..05ffa8b95 --- /dev/null +++ b/multisrc/overrides/madara/mangame/src/MangaMe.kt @@ -0,0 +1,14 @@ +package eu.kanade.tachiyomi.extension.en.mangame + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class MangaMe : Madara( + "MangaMe", + "https://mangame.org", + "en", + dateFormat = SimpleDateFormat("dd.MM.yyyy ", Locale.US) +) { + +} diff --git a/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt b/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt index 4e98488c3..6ce36f138 100644 --- a/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt +++ b/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt @@ -1,10 +1,12 @@ package eu.kanade.tachiyomi.extension.en.mangaweebs import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale import eu.kanade.tachiyomi.source.model.Page import org.jsoup.nodes.Document -class MangaWeebs : Madara("Manga Weebs", "https://mangaweebs.in", "en") { +class MangaWeebs : Madara("Manga Weebs", "https://mangaweebs.in", "en", dateFormat = SimpleDateFormat("dd MMMM HH:mm", Locale.US)) { override fun pageListParse(document: Document): List { return document.select(pageListParseSelector).mapIndexed { index, element -> Page( diff --git a/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt b/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt new file mode 100644 index 000000000..625b5a09e --- /dev/null +++ b/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt @@ -0,0 +1,14 @@ +package eu.kanade.tachiyomi.extension.en.manhuadex + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import java.text.SimpleDateFormat +import java.util.Locale + +class ManhuaDex : Madara( + "ManhuaDex", + "https://manhuadex.com", + "en", + dateFormat = SimpleDateFormat("dd MMMM yyyy ", Locale.US) +) { + +} diff --git a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt index fa6f121bc..cacf0e401 100644 --- a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt +++ b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt @@ -2,6 +2,19 @@ package eu.kanade.tachiyomi.extension.en.midnightmessscans import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.source.model.SManga +import org.jsoup.nodes.Document @Nsfw -class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.org", "en") +class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.org", "en") { + + override fun mangaDetailsParse(document: Document): SManga { + val manga = SManga.create() + + document.select("div.post-content").let { + manga.description = it.select("div.manga-excerpt").text() + } + + return manga + } +} diff --git a/multisrc/overrides/madara/shieldmanga/additional.gradle.kts b/multisrc/overrides/madara/shieldmanga/additional.gradle.kts deleted file mode 100644 index 10beb8157..000000000 --- a/multisrc/overrides/madara/shieldmanga/additional.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ - -dependencies { - implementation project(':lib-ratelimit') -} 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 335800101..d6d6dffd9 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 @@ -134,7 +134,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga SY", "https://www.mangasy.com", "en", overrideVersionCode = 1), SingleLang("Manga Starz", "https://mangastarz.com", "ar"), SingleLang("Manga Too", "https://mangatoo.com/", "en", overrideVersionCode = 1), - SingleLang("Manga Weebs", "https://mangaweebs.in", "en", overrideVersionCode = 1), + SingleLang("Manga Weebs", "https://mangaweebs.in", "en", overrideVersionCode = 2), SingleLang("Manga-Online.co", "https://www.manga-online.co", "th", className = "MangaOnlineCo"), SingleLang("Manga-Scantrad", "https://manga-scantrad.net", "fr", className = "MangaScantrad", overrideVersionCode = 1), SingleLang("Manga18 Fx", "https://manga18fx.com", "en", overrideVersionCode = 1), @@ -142,7 +142,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga1st.online", "https://manga1st.online", "en", className = "MangaFirstOnline", overrideVersionCode = 1), SingleLang("Manga347", "https://manga347.com", "en", overrideVersionCode = 3), SingleLang("Manga3S", "https://manga3s.com", "en", overrideVersionCode = 1), - SingleLang("Manga4All", "https://manga4all.net", "en"), + SingleLang("Manga4All", "https://manga4all.net", "en", overrideVersionCode = 1), SingleLang("Manga68", "https://manga68.com", "en", overrideVersionCode = 1), SingleLang("MangaBaz", "https://mangabaz.com", "tr"), SingleLang("MangaBob", "https://mangabob.com", "en", overrideVersionCode = 1), @@ -153,9 +153,9 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 1), SingleLang("MangaKitsune", "https://mangakitsune.com", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("MangaKomi", "https://mangakomi.com", "en", overrideVersionCode = 3), - SingleLang("MangaLazy", "https://mangalazy.com", "en", isNsfw = true), + SingleLang("MangaLazy", "https://mangalazy.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("MangaLionz", "https://mangalionz.com", "ar"), - SingleLang("MangaMe", "https://mangame.org", "en"), + SingleLang("MangaMe", "https://mangame.org", "en", overrideVersionCode = 1), SingleLang("MangaPL", "https://mangapl.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("MangaRave", "https://www.mangarave.com", "en", overrideVersionCode = 2), SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg", overrideVersionCode = 1), @@ -184,7 +184,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manhua Plus", "https://manhuaplus.com", "en", overrideVersionCode = 3), SingleLang("Manhua SY", "https://www.manhuasy.com", "en", overrideVersionCode = 1), SingleLang("ManhuaBox", "https://manhuabox.net", "en", overrideVersionCode = 2), - SingleLang("ManhuaDex", "https://manhuadex.com", "en"), + SingleLang("ManhuaDex", "https://manhuadex.com", "en", overrideVersionCode = 1), SingleLang("ManhuaFast", "https://manhuafast.com", "en", overrideVersionCode = 1), SingleLang("ManhuaPro", "https://manhuapro.com", "en", overrideVersionCode = 2), SingleLang("ManhuaUS", "https://manhuaus.com", "en", overrideVersionCode = 2), @@ -205,7 +205,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Mark Scans", "https://markscans.online", "pt-BR", overrideVersionCode = 2), SingleLang("MHentais", "https://mhentais.com", "pt-BR", isNsfw = true), SingleLang("NeoXXX Scans", "https://xxx.neoxscans.net", "pt-BR", isNsfw = true), - SingleLang("Midnight Mess Scans", "https://midnightmess.org", "en", isNsfw = true, overrideVersionCode = 2), + SingleLang("Midnight Mess Scans", "https://midnightmess.org", "en", isNsfw = true, overrideVersionCode = 3), SingleLang("Milftoon", "https://milftoon.xxx", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Mixed Manga", "https://mixedmanga.com", "en", overrideVersionCode = 1), SingleLang("Mode Scanlator", "https://modescanlator.com", "pt-BR", overrideVersionCode = 1),