From d0793a1741a80b22537c77327810d4fc2185baa1 Mon Sep 17 00:00:00 2001 From: Aria Moradi Date: Sun, 22 Aug 2021 19:59:08 +0430 Subject: [PATCH] add linting to multisrc (#8740) * add linting to multisrc * remove generated blocks * lint again * re-format the file * remove buildScript block * manaully format * remove groups --- multisrc/build.gradle.kts | 14 +++- .../fmreader/epikmanga/src/EpikManga.kt | 20 +++--- .../fmreader/kisslove/src/KissLove.kt | 2 +- .../fmreader/ksgroupscans/src/KSGroupScans.kt | 1 - .../overrides/fmreader/mangatr/src/MangaTR.kt | 16 ++--- .../manhwa18net/src/Manhwa18NetFactory.kt | 8 +-- .../genkan/lynxscans/src/LynxScans.kt | 3 +- .../overrides/madara/ayatoon/src/AYATOON.kt | 1 - .../overrides/madara/boyslove/src/BoysLove.kt | 2 +- .../madara/dragontea/src/DragonTea.kt | 4 +- .../overrides/madara/egymanga/src/EGYManga.kt | 2 +- .../madara/eternalscans/src/EternalScans.kt | 4 +- .../madara/fastmanhwa/src/FastManhwa.kt | 6 +- .../firstkissmanga/src/FirstKissManga.kt | 2 - .../overrides/madara/fizmanga/src/FizManga.kt | 1 - .../madara/freemanga/src/FreeManga.kt | 4 +- .../fukushuunoyuusha/src/FukushuunoYuusha.kt | 5 +- .../overrides/madara/hentai20/src/Hentai20.kt | 4 +- .../madara/hentaidexy/src/Hentaidexy.kt | 4 +- .../madara/hentaimanga/src/HentaiManga.kt | 6 +- .../madara/hentairead/src/Hentairead.kt | 6 +- .../madara/hentaiwebtoon/src/HentaiWebtoon.kt | 2 +- .../madara/hentaixcomic/src/HentaiXComic.kt | 6 +- .../madara/hentaixyuri/src/HentaiXYuri.kt | 6 +- .../overrides/madara/hiperdex/src/Hiperdex.kt | 2 +- multisrc/overrides/madara/hm2d/src/HM2D.kt | 5 +- .../overrides/madara/hmanhwa/src/hManhwa.kt | 2 +- .../madara/hunterfansub/src/HunterFansub.kt | 2 +- .../immortalupdates/src/ImmortalUpdates.kt | 1 - .../madara/inmortalscan/src/InmortalScan.kt | 1 - .../madara/jirocomics/src/JiroComics.kt | 3 +- .../madara/kokomanga/src/Kokomanga.kt | 4 +- .../leviatanscans/src/LeviatanScansFactory.kt | 2 - .../madara/lordmanga/src/LordManga.kt | 4 +- .../madara/madaradex/src/MadaraDex.kt | 6 +- .../overrides/madara/manga347/src/Manga347.kt | 4 +- .../overrides/madara/manga47/src/Manga47.kt | 3 +- .../madara/manga4all/src/Manga4All.kt | 4 +- .../madara/mangaclash/src/MangaClash.kt | 4 +- .../overrides/madara/mangacv/src/MangaCV.kt | 2 +- .../madara/mangadistrict/src/MangaDistrict.kt | 6 +- .../madara/mangadropout/src/MangaDropOut.kt | 1 - .../madara/mangafastcom/src/Mangafastcom.kt | 4 +- .../mangaforfree/src/MangaForFreeFactory.kt | 6 +- .../madara/mangagreat/src/MangaGreat.kt | 4 +- .../madara/mangahentai/src/MangaHentai.kt | 3 +- .../madara/mangahero/src/MangaHero.kt | 3 +- .../overrides/madara/mangahz/src/MangaHZ.kt | 2 +- .../overrides/madara/mangakio/src/MangaKio.kt | 6 +- .../madara/mangakitsune/src/MangaKitsune.kt | 6 +- .../madara/mangakomi/src/MangaKomi.kt | 2 - .../overrides/madara/mangame/src/MangaMe.kt | 4 +- .../madara/mangamitsu/src/MangaMitsu.kt | 2 +- .../madara/manganatoinfo/src/Manganatoinfo.kt | 4 +- .../overrides/madara/mangapl/src/MangaPL.kt | 4 +- .../mangasorigines/src/MangasOrigines.kt | 1 - .../overrides/madara/mangatk/src/MangaTK.kt | 6 -- .../madara/mangatuli/src/MangaTuli.kt | 4 +- .../overrides/madara/mangaus/src/MangaUS.kt | 2 - .../madara/mangaweebs/src/MangaWeebs.kt | 2 - .../madara/manhuadex/src/ManhuaDex.kt | 4 +- .../madara/manhuafast/src/ManhuaFast.kt | 4 +- .../madara/manhuapro/src/ManhuaPro.kt | 2 - .../overrides/madara/manhuaus/src/ManhuaUS.kt | 4 +- .../madara/manhuazone/src/ManhuaZone.kt | 4 +- .../madara/manhwa18app/src/Manhwa18app.kt | 6 +- .../manhwa18cc/src/Manhwa18CcFactory.kt | 5 -- .../madara/manhwa365/src/Manhwa365.kt | 2 +- .../overrides/madara/manhwa68/src/Manhwa68.kt | 4 +- .../madara/manhwabiz/src/Manhwabiz.kt | 2 +- .../madara/manhwuafans/src/Manhwuafans.kt | 6 +- .../overrides/madara/manytoon/src/ManyToon.kt | 1 - .../madara/manytoonme/src/ManyToonMe.kt | 3 +- .../src/MidnightMessScans.kt | 28 +------- .../overrides/madara/milftoon/src/Milftoon.kt | 2 +- .../madara/ohnomanga/src/OhNoManga.kt | 4 +- .../overrides/madara/pornwha/src/Pornwha.kt | 2 +- .../madara/rawmangas/src/RawMangas.kt | 2 +- .../madara/readadult/src/ReadAdult.kt | 2 +- .../overrides/madara/scansraw/src/ScansRaw.kt | 1 - .../madara/seafoamscans/src/SeafoamScans.kt | 2 +- .../madara/shinobiscans/src/ShinobiScans.kt | 1 - .../madara/siyahmelek/src/Siyahmelek.kt | 2 +- .../overrides/madara/skymanga/src/Skymanga.kt | 2 +- .../madara/sugarbabies/src/SugarBabies.kt | 2 +- .../src/SunshineButterflyScans.kt | 2 +- .../overrides/madara/toonily/src/Toonily.kt | 2 +- .../madara/toonilynet/src/Toonilynet.kt | 2 +- .../overrides/madara/toonmany/src/ToonMany.kt | 6 +- .../madara/turkcemanga/src/TurkceManga.kt | 14 ---- .../twentyfourhmanga/src/TwentyFourhManga.kt | 6 +- .../madara/uyuyanbalik/src/UyuyanBalik.kt | 1 - .../madara/webtoon18/src/WebToon18.kt | 2 +- .../madara/webtoon69/src/WebToon69.kt | 2 +- .../madara/webtoonstop/src/WebtoonsTOP.kt | 6 +- .../overrides/madara/xmanga/src/XManga.kt | 2 +- .../madara/yaoihentai/src/YaoiHentai.kt | 6 +- .../madara/yaoimanga/src/YaoiManga.kt | 4 +- .../overrides/madara/yaoiscan/src/YaoiScan.kt | 4 +- .../overrides/madara/yaoitoon/src/YaoiToon.kt | 6 +- .../ReadAttackOnTitanShingekiNoKyojinManga.kt | 12 +--- .../readberserkmanga/src/ReadBerserkManga.kt | 10 +-- ...adBokuNoHeroAcademiaMyHeroAcademiaManga.kt | 2 - .../src/ReadChainsawManMangaOnline.kt | 2 - .../src/ReadDragonBallSuperChouMangaOnline.kt | 2 - .../src/ReadDrStoneMangaOnline.kt | 2 - .../src/ReadFairyTailEdensZeroMangaOnline.kt | 2 - .../src/ReadGoblinSlayerMangaOnline.kt | 10 +-- .../src/ReadHaikyuuMangaOnline.kt | 2 - .../src/ReadHunterxHunterMangaOnline.kt | 2 - .../src/ReadJujutsuKaisenMangaOnline.kt | 2 - .../src/ReadKaguyaSamaMangaOnline.kt | 2 - .../src/ReadKingdomMangaOnline.kt | 2 - ...adNanatsuNoTaizai7DeadlySinsMangaOnline.kt | 2 - .../ReadNarutoBorutoSamurai8MangaOnline.kt | 2 - .../src/ReadNoblesseManhwaOnline.kt | 10 +-- .../src/ReadOnePieceMangaOnline.kt | 2 - .../src/ReadOnePunchManMangaOnlineTwo.kt | 10 +-- .../src/ReadSoloLevelingMangaManhwaOnline.kt | 2 - .../src/ReadSwordArtOnlineMangaOnline.kt | 10 +-- .../ReadThePromisedNeverlandMangaOnline.kt | 2 - .../ReadTokyoGhoulReTokyoGhoulMangaOnline.kt | 2 - .../src/ReadTowerOfGodManhwaMangaOnline.kt | 2 - .../src/ReadVinlandSagaMangaOnline.kt | 2 - .../mmrcms/utsukushii/src/Utsukushii.kt | 8 +-- .../nyahentai/src/NyaHentaiFactory.kt | 2 +- .../dongmanmanhua/src/DongmanManhua.kt | 2 +- .../webtoons/webtoons/src/WebtoonsFactory.kt | 4 +- .../weebreader/naniscans/src/NaniScans.kt | 3 - .../wpcomics/nettruyen/src/NetTruyen.kt | 2 +- .../wpcomics/nhattruyen/src/NhatTruyen.kt | 2 +- .../wpcomics/truyenchon/src/TruyenChon.kt | 9 ++- .../src/DragonTranslation.kt | 2 +- .../fusionscanlation/src/FusionScanlation.kt | 4 +- .../wpmangareader/komikmama/src/KomikMama.kt | 6 +- .../luminousscans/src/LuminousScans.kt | 7 +- .../wpmangareader/mangasusu/src/Mangasusu.kt | 4 +- .../patatescans/src/Patatescans.kt | 2 +- .../sekaikomik/src/Sekaikomik.kt | 2 +- .../wpmangareader/turktoon/src/TurkToon.kt | 6 +- .../yugenmangas/src/YugenMangas.kt | 11 ++- .../asurascans/src/AsuraScans.kt | 7 +- .../wpmangastream/boosei/src/Boosei.kt | 2 +- .../wpmangastream/gurukomik/src/GURUKomik.kt | 5 +- .../kaisarkomik/src/KaisarKomik.kt | 2 +- .../wpmangastream/klankomik/src/KlanKomik.kt | 2 +- .../wpmangastream/komikav/src/KomikAV.kt | 4 +- .../wpmangastream/kumascans/src/KumaScans.kt | 2 +- .../liebeschneehiver/src/LiebeSchneeHiver.kt | 5 +- .../mangaindonesia/src/MangaIndonesia.kt | 4 +- .../wpmangastream/mangakyo/src/Mangakyo.kt | 2 +- .../wpmangastream/mangaproz/src/MangaProZ.kt | 6 +- .../mangaraworg/src/MangaRawOrg.kt | 8 +-- .../masterkomik/src/MasterKomik.kt | 2 +- .../wpmangastream/mihentai/src/Mihentai.kt | 2 +- .../nonstopscans/src/NonStopScans.kt | 2 +- .../wpmangastream/rawkuma/src/Rawkuma.kt | 2 +- .../wpmangastream/readkomik/src/ReadKomik.kt | 2 +- .../sektedoujin/src/SekteDoujin.kt | 7 +- .../wpmangastream/sheamanga/src/SheaManga.kt | 4 +- .../tempestmanga/src/TempestManga.kt | 8 +-- .../wpmangastream/westmanga/src/WestManga.kt | 9 ++- .../xcalibrscans/src/xCaliBRScans.kt | 2 - .../tachiyomi/multisrc/fmreader/FMReader.kt | 2 - .../multisrc/fmreader/FMReaderGenerator.kt | 4 +- .../tachiyomi/multisrc/foolslide/FoolSlide.kt | 2 - .../multisrc/foolslide/FoolSlideGenerator.kt | 2 +- .../multisrc/gattsu/GattsuGenerator.kt | 5 +- .../tachiyomi/multisrc/genkan/Genkan.kt | 7 +- .../multisrc/genkan/GenkanGenerator.kt | 1 - .../tachiyomi/multisrc/guya/GuyaGenerator.kt | 2 +- .../tachiyomi/multisrc/luscious/Luscious.kt | 29 +++----- .../multisrc/luscious/LusciousGenerator.kt | 3 +- .../tachiyomi/multisrc/madara/Madara.kt | 2 +- .../multisrc/madara/MadaraGenerator.kt | 6 +- .../multisrc/madara/MadaraUrlActivity.kt | 6 +- .../multisrc/mangacatalog/MangaCatalog.kt | 7 +- .../mangacatalog/MangaCatalogGenerator.kt | 2 +- .../multisrc/mangadventure/MangAdventure.kt | 58 ++++++++------- .../multisrc/mangamainac/MangaMainac.kt | 3 +- .../mangamainac/MangaMainacGenerator.kt | 10 +-- .../multisrc/mangasar/MangaSarGenerator.kt | 5 +- .../multisrc/mmrcms/MMRCMSGenerator.kt | 1 - .../multisrc/mmrcms/MMRCMSJsonGen.kt | 7 +- .../multisrc/mmrcms/MMRCMSSources.kt | 6 +- .../tachiyomi/multisrc/mmrcms/SourceData.kt | 2 +- .../tachiyomi/multisrc/nepnep/NepNep.kt | 22 +++--- .../multisrc/nyahentai/NyaHentaiGenerator.kt | 32 ++++----- .../nyahentai/NyaHentaiUrlActivity.kt | 1 - .../multisrc/paprika/PaprikaAltGenerator.kt | 2 +- .../multisrc/paprika/PaprikaGenerator.kt | 10 +-- .../multisrc/pizzareader/PizzaReaderDto.kt | 1 - .../multisrc/webtoons/WebtoonsGenerator.kt | 2 +- .../webtoons/WebtoonsTranslateGenerator.kt | 3 +- .../multisrc/weebreader/Weebreader.kt | 2 +- .../multisrc/wpcomics/WPComicsGenerator.kt | 10 +-- .../wpmangareader/WPMangaReaderGenerator.kt | 2 +- .../wpmangareader/WPMangaReaderUrlActivity.kt | 3 +- .../wpmangastream/WPMangaStreamGenerator.kt | 70 +++++++++---------- .../java/generator/ThemeSourceGenerator.kt | 50 +++++++------ 200 files changed, 399 insertions(+), 658 deletions(-) diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index 4181abd12..d1fd7e6ab 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -29,8 +29,8 @@ tasks { val isWindows = System.getProperty("os.name").toString().toLowerCase().contains("win") var classPath = (configurations.debugCompileOnly.get().asFileTree.toList() + listOf( - configurations.androidApis.get().asFileTree.first().absolutePath, // android.jar path - "$projectDir/build/intermediates/aar_main_jar/debug/classes.jar" // jar made from this module + configurations.androidApis.get().asFileTree.first().absolutePath, // android.jar path + "$projectDir/build/intermediates/aar_main_jar/debug/classes.jar" // jar made from this module )) .joinToString(if (isWindows) ";" else ":") @@ -63,6 +63,14 @@ tasks { throw Exception("Java process failed with exit code: $exitCode") } } - dependsOn("assembleDebug") + dependsOn("ktFormat", "ktLint", "assembleDebug") + } + + register("ktLint") { + source(files("src", "overrides")) + } + + register("ktFormat") { + source(files("src", "overrides")) } } diff --git a/multisrc/overrides/fmreader/epikmanga/src/EpikManga.kt b/multisrc/overrides/fmreader/epikmanga/src/EpikManga.kt index 689fbf3c0..8df81dab3 100644 --- a/multisrc/overrides/fmreader/epikmanga/src/EpikManga.kt +++ b/multisrc/overrides/fmreader/epikmanga/src/EpikManga.kt @@ -22,21 +22,21 @@ class EpikManga : FMReader("Epik Manga", "https://www.epikmanga.com", "tr") { // search wasn't working on source's website override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { return client.newCall(searchMangaRequest(page, query, filters)) - .asObservableSuccess() - .map { response -> - searchMangaParse(response, query) - } + .asObservableSuccess() + .map { response -> + searchMangaParse(response, query) + } } override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request = GET("$baseUrl/seri-listesi?type=text", headers) private fun searchMangaParse(response: Response, query: String): MangasPage { val mangas = response.asJsoup().select("div.char.col-lg-4 a") - .filter { it.text().contains(query, ignoreCase = true) } - .map { - SManga.create().apply { - setUrlWithoutDomain(it.attr("href")) - title = it.text() - } + .filter { it.text().contains(query, ignoreCase = true) } + .map { + SManga.create().apply { + setUrlWithoutDomain(it.attr("href")) + title = it.text() } + } return MangasPage(mangas, false) } override fun mangaDetailsParse(document: Document): SManga { diff --git a/multisrc/overrides/fmreader/kisslove/src/KissLove.kt b/multisrc/overrides/fmreader/kisslove/src/KissLove.kt index b2df5120a..35d326eda 100644 --- a/multisrc/overrides/fmreader/kisslove/src/KissLove.kt +++ b/multisrc/overrides/fmreader/kisslove/src/KissLove.kt @@ -6,4 +6,4 @@ import org.jsoup.nodes.Document class KissLove : FMReader("KissLove", "https://kissaway.net", "ja") { override fun pageListParse(document: Document): List = base64PageListParse(document) -} \ No newline at end of file +} diff --git a/multisrc/overrides/fmreader/ksgroupscans/src/KSGroupScans.kt b/multisrc/overrides/fmreader/ksgroupscans/src/KSGroupScans.kt index 27b0bb585..9e4bc4226 100644 --- a/multisrc/overrides/fmreader/ksgroupscans/src/KSGroupScans.kt +++ b/multisrc/overrides/fmreader/ksgroupscans/src/KSGroupScans.kt @@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.source.model.SChapter import org.jsoup.nodes.Element import java.util.Calendar - class KSGroupScans : FMReader("KSGroupScans", "https://ksgroupscans.com", "en") { override fun chapterFromElement(element: Element, mangaTitle: String): SChapter { return SChapter.create().apply { diff --git a/multisrc/overrides/fmreader/mangatr/src/MangaTR.kt b/multisrc/overrides/fmreader/mangatr/src/MangaTR.kt index ceecde634..988f0439f 100644 --- a/multisrc/overrides/fmreader/mangatr/src/MangaTR.kt +++ b/multisrc/overrides/fmreader/mangatr/src/MangaTR.kt @@ -30,8 +30,8 @@ class MangaTR : FMReader("Manga-TR", "https://manga-tr.com", "tr") { val mangas = mutableListOf() response.asJsoup().select("div.row a[data-toggle]") - .filterNot { it.siblingElements().text().contains("Novel") } - .map { mangas.add(searchMangaFromElement(it)) } + .filterNot { it.siblingElements().text().contains("Novel") } + .map { mangas.add(searchMangaFromElement(it)) } return MangasPage(mangas, false) } @@ -66,10 +66,10 @@ class MangaTR : FMReader("Manga-TR", "https://manga-tr.com", "tr") { override fun fetchChapterList(manga: SManga): Observable> { val requestUrl = "$baseUrl/cek/fetch_pages_manga.php?manga_cek=${manga.url.substringAfter("manga-").substringBefore(".")}" return client.newCall(GET(requestUrl, chapterListHeaders)) - .asObservableSuccess() - .map { response -> - chapterListParse(response, requestUrl) - } + .asObservableSuccess() + .map { response -> + chapterListParse(response, requestUrl) + } } private fun chapterListParse(response: Response, requestUrl: String): List { @@ -83,8 +83,8 @@ class MangaTR : FMReader("Manga-TR", "https://manga-tr.com", "tr") { document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } if (document.select("a[data-page=$nextPage]").isNotEmpty()) { val body = FormBody.Builder() - .add("page", nextPage.toString()) - .build() + .add("page", nextPage.toString()) + .build() document = client.newCall(POST(requestUrl, chapterListHeaders, body)).execute().asJsoup() nextPage++ } else { diff --git a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt index 63a63d4fa..db68dcecc 100644 --- a/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt +++ b/multisrc/overrides/fmreader/manhwa18net/src/Manhwa18NetFactory.kt @@ -10,18 +10,18 @@ import okhttp3.Request class Manhwa18NetFactory : SourceFactory { override fun createSources(): List = listOf( - Manhwa18Net(), - Manhwa18NetRaw(), + Manhwa18Net(), + Manhwa18NetRaw(), ) } @Nsfw class Manhwa18Net : FMReader("Manhwa18.net", "https://manhwa18.net", "en") { override fun popularMangaRequest(page: Int): Request = - GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=views&sort_type=DESC&ungenre=raw", headers) + GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=views&sort_type=DESC&ungenre=raw", headers) override fun latestUpdatesRequest(page: Int): Request = - GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=last_update&sort_type=DESC&ungenre=raw", headers) + GET("$baseUrl/$requestPath?listType=pagination&page=$page&sort=last_update&sort_type=DESC&ungenre=raw", headers) override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { val noRawsUrl = super.searchMangaRequest(page, query, filters).url.newBuilder().addQueryParameter("ungenre", "raw").toString() diff --git a/multisrc/overrides/genkan/lynxscans/src/LynxScans.kt b/multisrc/overrides/genkan/lynxscans/src/LynxScans.kt index 614193484..4c8fa0e04 100644 --- a/multisrc/overrides/genkan/lynxscans/src/LynxScans.kt +++ b/multisrc/overrides/genkan/lynxscans/src/LynxScans.kt @@ -1,14 +1,13 @@ package eu.kanade.tachiyomi.extension.en.lynxscans import eu.kanade.tachiyomi.multisrc.genkan.Genkan -import org.jsoup.nodes.Document import eu.kanade.tachiyomi.source.model.Page +import org.jsoup.nodes.Document class LynxScans : Genkan("LynxScans", "https://lynxscans.com", "en") { override fun pageListParse(document: Document): List { val pages = mutableListOf() - val allImages = document.select("div#pages-container + script").first().data() .substringAfter("[").substringBefore("];") .replace(Regex("""["\\]"""), "") diff --git a/multisrc/overrides/madara/ayatoon/src/AYATOON.kt b/multisrc/overrides/madara/ayatoon/src/AYATOON.kt index e3a1c6fa3..a676b0db5 100644 --- a/multisrc/overrides/madara/ayatoon/src/AYATOON.kt +++ b/multisrc/overrides/madara/ayatoon/src/AYATOON.kt @@ -4,5 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale - class AYATOON : Madara("AYATOON", "https://ayatoon.com", "tr", SimpleDateFormat("dd MMM yyyy", Locale("tr"))) diff --git a/multisrc/overrides/madara/boyslove/src/BoysLove.kt b/multisrc/overrides/madara/boyslove/src/BoysLove.kt index 7323a1dfb..8fe9c1f4a 100644 --- a/multisrc/overrides/madara/boyslove/src/BoysLove.kt +++ b/multisrc/overrides/madara/boyslove/src/BoysLove.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class BoysLove : Madara("BoysLove", "https://boyslove.me", "en") { - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/dragontea/src/DragonTea.kt b/multisrc/overrides/madara/dragontea/src/DragonTea.kt index f03df4a08..aa692d13b 100644 --- a/multisrc/overrides/madara/dragontea/src/DragonTea.kt +++ b/multisrc/overrides/madara/dragontea/src/DragonTea.kt @@ -9,6 +9,4 @@ class DragonTea : Madara( "https://dragontea.ink/", "en", dateFormat = SimpleDateFormat("MM/dd/yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/egymanga/src/EGYManga.kt b/multisrc/overrides/madara/egymanga/src/EGYManga.kt index 376dbc255..b93f7a50d 100644 --- a/multisrc/overrides/madara/egymanga/src/EGYManga.kt +++ b/multisrc/overrides/madara/egymanga/src/EGYManga.kt @@ -6,7 +6,7 @@ import okhttp3.Response import java.text.SimpleDateFormat import java.util.Locale -class EGYManga : Madara( "EGY Manga", "https://egymanga.net", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))) { +class EGYManga : Madara("EGY Manga", "https://egymanga.net", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))) { override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() override val pageListParseSelector = "div.separator" } diff --git a/multisrc/overrides/madara/eternalscans/src/EternalScans.kt b/multisrc/overrides/madara/eternalscans/src/EternalScans.kt index a1928cb86..b79f90198 100644 --- a/multisrc/overrides/madara/eternalscans/src/EternalScans.kt +++ b/multisrc/overrides/madara/eternalscans/src/EternalScans.kt @@ -9,6 +9,4 @@ class EternalScans : Madara( "https://eternalscans.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt index 88149a648..08ee83496 100644 --- a/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt +++ b/multisrc/overrides/madara/fastmanhwa/src/FastManhwa.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.fastmanhwa -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.net", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { - -} +class FastManhwa : Madara("FastManhwa", "https://fastmanhwa.net", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt index cedb21b06..da5e075b1 100644 --- a/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt +++ b/multisrc/overrides/madara/firstkissmanga/src/FirstKissManga.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.firstkissmanga import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.Headers -import java.text.SimpleDateFormat -import java.util.Locale class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.com", "en") { override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl) diff --git a/multisrc/overrides/madara/fizmanga/src/FizManga.kt b/multisrc/overrides/madara/fizmanga/src/FizManga.kt index 82db6fe17..91dd0cb75 100644 --- a/multisrc/overrides/madara/fizmanga/src/FizManga.kt +++ b/multisrc/overrides/madara/fizmanga/src/FizManga.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.fizmanga import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.Headers - class FizManga : Madara("Fiz Manga", "https://fizmanga.com", "en") { override fun headersBuilder(): Headers.Builder = super.headersBuilder() .add("Referer", baseUrl) diff --git a/multisrc/overrides/madara/freemanga/src/FreeManga.kt b/multisrc/overrides/madara/freemanga/src/FreeManga.kt index 38f0a82b9..880db7d3f 100644 --- a/multisrc/overrides/madara/freemanga/src/FreeManga.kt +++ b/multisrc/overrides/madara/freemanga/src/FreeManga.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.freemanga -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class FreeManga : Madara("Free Manga", "https://freemanga.me", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/fukushuunoyuusha/src/FukushuunoYuusha.kt b/multisrc/overrides/madara/fukushuunoyuusha/src/FukushuunoYuusha.kt index 783e7e172..668f66478 100644 --- a/multisrc/overrides/madara/fukushuunoyuusha/src/FukushuunoYuusha.kt +++ b/multisrc/overrides/madara/fukushuunoyuusha/src/FukushuunoYuusha.kt @@ -5,5 +5,6 @@ import java.text.SimpleDateFormat import java.util.Locale class FukushuunoYuusha : Madara( - "Fukushuu no Yuusha", "https://fny-scantrad.com", - "fr", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US)) + "Fukushuu no Yuusha", "https://fny-scantrad.com", + "fr", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US) +) diff --git a/multisrc/overrides/madara/hentai20/src/Hentai20.kt b/multisrc/overrides/madara/hentai20/src/Hentai20.kt index 4163f571a..b00380ff1 100644 --- a/multisrc/overrides/madara/hentai20/src/Hentai20.kt +++ b/multisrc/overrides/madara/hentai20/src/Hentai20.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentai20 -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class Hentai20 : Madara("Hentai20", "https://hentai20.com", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt b/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt index 7ef64097f..5a47108d6 100644 --- a/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt +++ b/multisrc/overrides/madara/hentaidexy/src/Hentaidexy.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentaidexy -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class Hentaidexy : Madara("Hentaidexy", "https://hentaidexy.com", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt b/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt index 95d2251a0..4e3e4a2d7 100644 --- a/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt +++ b/multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentaimanga -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class HentaiManga : Madara( "https://hentaimanga.me", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/hentairead/src/Hentairead.kt b/multisrc/overrides/madara/hentairead/src/Hentairead.kt index ae09622bb..5cc0b2fc9 100644 --- a/multisrc/overrides/madara/hentairead/src/Hentairead.kt +++ b/multisrc/overrides/madara/hentairead/src/Hentairead.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.hentairead -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) { - -} +class Hentairead : Madara("HentaiRead", "https://hentairead.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt index 318a0ec35..e2e9ae800 100644 --- a/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt +++ b/multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentaiwebtoon -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class HentaiWebtoon : Madara("HentaiWebtoon", "https://hentaiwebtoon.com", "en") diff --git a/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt b/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt index ba9af8148..f39d35252 100644 --- a/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt +++ b/multisrc/overrides/madara/hentaixcomic/src/HentaiXComic.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentaixcomic -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class HentaiXComic : Madara( "https://hentaixcomic.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt b/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt index ba6f888f8..113aeea17 100644 --- a/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt +++ b/multisrc/overrides/madara/hentaixyuri/src/HentaiXYuri.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hentaixyuri -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class HentaiXYuri : Madara( "https://hentaixyuri.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt b/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt index 87371f5c5..1098f7577 100644 --- a/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt +++ b/multisrc/overrides/madara/hiperdex/src/Hiperdex.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hiperdex -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class Hiperdex : Madara("Hiperdex", "https://hiperdex.com", "en") { diff --git a/multisrc/overrides/madara/hm2d/src/HM2D.kt b/multisrc/overrides/madara/hm2d/src/HM2D.kt index 245a42f4f..16f5ba0e3 100644 --- a/multisrc/overrides/madara/hm2d/src/HM2D.kt +++ b/multisrc/overrides/madara/hm2d/src/HM2D.kt @@ -1,10 +1,10 @@ package eu.kanade.tachiyomi.extension.en.hm2d -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET -import okhttp3.Request import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale @@ -24,4 +24,3 @@ class HM2D : Madara( return GET(baseUrl + manga.url.removePrefix("/hdoujin/"), headers) } } - diff --git a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt index 09bc7e41f..a587ed0e0 100644 --- a/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt +++ b/multisrc/overrides/madara/hmanhwa/src/hManhwa.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.hmanhwa -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/hunterfansub/src/HunterFansub.kt b/multisrc/overrides/madara/hunterfansub/src/HunterFansub.kt index 87e0f0071..79d15e86b 100644 --- a/multisrc/overrides/madara/hunterfansub/src/HunterFansub.kt +++ b/multisrc/overrides/madara/hunterfansub/src/HunterFansub.kt @@ -8,4 +8,4 @@ class HunterFansub : Madara("Hunter Fansub", "https://hunterfansub.com", "es") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/biblioteca/page/$page?m_orderby=views", headers) override fun popularMangaNextPageSelector() = "div.nav-previous" override val popularMangaUrlSelector = "div.post-title a:last-child" -} \ No newline at end of file +} diff --git a/multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt b/multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt index 3a20bdc01..5af840681 100644 --- a/multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt +++ b/multisrc/overrides/madara/immortalupdates/src/ImmortalUpdates.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension.en.immortalupdates import eu.kanade.tachiyomi.multisrc.madara.Madara - class ImmortalUpdates : Madara("Immortal Updates", "https://immortalupdates.com", "en") { override val useNewChapterEndpoint: Boolean = true } diff --git a/multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt b/multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt index 74bce1e59..1631faa01 100644 --- a/multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt +++ b/multisrc/overrides/madara/inmortalscan/src/InmortalScan.kt @@ -4,5 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale - class InmortalScan : Madara("Inmortal Scan", "https://manga.mundodrama.site", "es", SimpleDateFormat("MMMM d, yyyy", Locale("es"))) diff --git a/multisrc/overrides/madara/jirocomics/src/JiroComics.kt b/multisrc/overrides/madara/jirocomics/src/JiroComics.kt index 7f7f4b041..7921eebd6 100644 --- a/multisrc/overrides/madara/jirocomics/src/JiroComics.kt +++ b/multisrc/overrides/madara/jirocomics/src/JiroComics.kt @@ -1,11 +1,10 @@ package eu.kanade.tachiyomi.extension.en.jirocomics -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SChapter import okhttp3.Response - @Nsfw class JiroComics : Madara("Jiro Comics", "https://jirocomics.com", "en") { override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() diff --git a/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt b/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt index c5f760523..bc4efa8fc 100644 --- a/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt +++ b/multisrc/overrides/madara/kokomanga/src/Kokomanga.kt @@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class Kokomanga : Madara("Kokomanga", "https://kokomanga.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { - -} +class Kokomanga : Madara("Kokomanga", "https://kokomanga.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/leviatanscans/src/LeviatanScansFactory.kt b/multisrc/overrides/madara/leviatanscans/src/LeviatanScansFactory.kt index 53dba9ced..4bcf22761 100644 --- a/multisrc/overrides/madara/leviatanscans/src/LeviatanScansFactory.kt +++ b/multisrc/overrides/madara/leviatanscans/src/LeviatanScansFactory.kt @@ -3,8 +3,6 @@ package eu.kanade.tachiyomi.extension.all.leviatanscans import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -import eu.kanade.tachiyomi.source.model.SChapter -import okhttp3.Response class LeviatanScansFactory : SourceFactory { override fun createSources(): List = listOf( diff --git a/multisrc/overrides/madara/lordmanga/src/LordManga.kt b/multisrc/overrides/madara/lordmanga/src/LordManga.kt index 552dbde8f..86b1de9cf 100644 --- a/multisrc/overrides/madara/lordmanga/src/LordManga.kt +++ b/multisrc/overrides/madara/lordmanga/src/LordManga.kt @@ -9,6 +9,4 @@ class LordManga : Madara( "https://lordmanga.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/madaradex/src/MadaraDex.kt b/multisrc/overrides/madara/madaradex/src/MadaraDex.kt index fd4b7dae0..fbb449647 100644 --- a/multisrc/overrides/madara/madaradex/src/MadaraDex.kt +++ b/multisrc/overrides/madara/madaradex/src/MadaraDex.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.madaradex -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class MadaraDex : Madara( "https://madaradex.org", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/manga347/src/Manga347.kt b/multisrc/overrides/madara/manga347/src/Manga347.kt index edcfeb9aa..1208905a5 100644 --- a/multisrc/overrides/madara/manga347/src/Manga347.kt +++ b/multisrc/overrides/madara/manga347/src/Manga347.kt @@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class Manga347 : Madara("Manga347", "https://manga347.com", "en", SimpleDateFormat("d MMM, yyyy", Locale.US)) { - -} +class Manga347 : Madara("Manga347", "https://manga347.com", "en", SimpleDateFormat("d MMM, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/manga47/src/Manga47.kt b/multisrc/overrides/madara/manga47/src/Manga47.kt index 9af7ddef9..abeb7abb2 100644 --- a/multisrc/overrides/madara/manga47/src/Manga47.kt +++ b/multisrc/overrides/madara/manga47/src/Manga47.kt @@ -6,6 +6,5 @@ import okhttp3.Response class Manga47 : Madara("Manga47", "https://manga47.net", "en") { - override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() - + 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 index 29bf0ac85..e09ad4347 100644 --- a/multisrc/overrides/madara/manga4all/src/Manga4All.kt +++ b/multisrc/overrides/madara/manga4all/src/Manga4All.kt @@ -9,6 +9,4 @@ class Manga4All : Madara( "https://manga4all.net", "en", dateFormat = SimpleDateFormat("d MMM yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangaclash/src/MangaClash.kt b/multisrc/overrides/madara/mangaclash/src/MangaClash.kt index 0ef116092..2c9ffded8 100644 --- a/multisrc/overrides/madara/mangaclash/src/MangaClash.kt +++ b/multisrc/overrides/madara/mangaclash/src/MangaClash.kt @@ -2,9 +2,9 @@ package eu.kanade.tachiyomi.extension.en.mangaclash import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara +import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit class MangaClash : Madara( @@ -17,7 +17,7 @@ class MangaClash : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("4-koma", "4-koma"), Genre("Action", "action"), diff --git a/multisrc/overrides/madara/mangacv/src/MangaCV.kt b/multisrc/overrides/madara/mangacv/src/MangaCV.kt index c69f2d336..8810410ea 100644 --- a/multisrc/overrides/madara/mangacv/src/MangaCV.kt +++ b/multisrc/overrides/madara/mangacv/src/MangaCV.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class MangaCV : Madara("MangaCV", "https://mangacv.com", "en") { - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt b/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt index 4e3f54e35..8f0cf4160 100644 --- a/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt +++ b/multisrc/overrides/madara/mangadistrict/src/MangaDistrict.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangadistrict -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class MangaDistrict : Madara( "https://mangadistrict.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangadropout/src/MangaDropOut.kt b/multisrc/overrides/madara/mangadropout/src/MangaDropOut.kt index 3ad824396..def0a9ee3 100644 --- a/multisrc/overrides/madara/mangadropout/src/MangaDropOut.kt +++ b/multisrc/overrides/madara/mangadropout/src/MangaDropOut.kt @@ -4,5 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale - class MangaDropOut : Madara("Manga Drop Out", "https://www.mangadropout.xyz", "id", SimpleDateFormat("dd/MM/yyyy", Locale("id"))) diff --git a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt index b234c64ce..0b8a3d314 100644 --- a/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt +++ b/multisrc/overrides/madara/mangafastcom/src/Mangafastcom.kt @@ -9,6 +9,4 @@ class Mangafastcom : Madara( "https://manga-fast.com", "en", dateFormat = SimpleDateFormat("d MMMM'،' yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt index c7680303d..3df10a0ed 100644 --- a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt +++ b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt @@ -1,12 +1,12 @@ package eu.kanade.tachiyomi.extension.all.mangaforfree +import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -import java.util.concurrent.TimeUnit -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import okhttp3.OkHttpClient -import eu.kanade.tachiyomi.annotations.Nsfw +import java.util.concurrent.TimeUnit class MangaForFreeFactory : SourceFactory { override fun createSources(): List = listOf( diff --git a/multisrc/overrides/madara/mangagreat/src/MangaGreat.kt b/multisrc/overrides/madara/mangagreat/src/MangaGreat.kt index 23c1acb1d..22a2b648d 100644 --- a/multisrc/overrides/madara/mangagreat/src/MangaGreat.kt +++ b/multisrc/overrides/madara/mangagreat/src/MangaGreat.kt @@ -2,6 +2,4 @@ package eu.kanade.tachiyomi.extension.en.mangagreat import eu.kanade.tachiyomi.multisrc.madara.Madara -class MangaGreat : Madara("MangaGreat", "https://mangagreat.com", "en") { - -} +class MangaGreat : Madara("MangaGreat", "https://mangagreat.com", "en") diff --git a/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt b/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt index 21eb0f684..980119868 100644 --- a/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt +++ b/multisrc/overrides/madara/mangahentai/src/MangaHentai.kt @@ -1,8 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangahentai -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw - +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class MangaHentai : Madara("Manga Hentai", "https://mangahentai.me", "en") { diff --git a/multisrc/overrides/madara/mangahero/src/MangaHero.kt b/multisrc/overrides/madara/mangahero/src/MangaHero.kt index 951f27b73..977c4154b 100644 --- a/multisrc/overrides/madara/mangahero/src/MangaHero.kt +++ b/multisrc/overrides/madara/mangahero/src/MangaHero.kt @@ -6,6 +6,5 @@ import okhttp3.Response class MangaHero : Madara("Manga Hero", "https://mangahero.xyz", "en") { - override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() - + override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() } diff --git a/multisrc/overrides/madara/mangahz/src/MangaHZ.kt b/multisrc/overrides/madara/mangahz/src/MangaHZ.kt index 61c37b81a..197b7b125 100644 --- a/multisrc/overrides/madara/mangahz/src/MangaHZ.kt +++ b/multisrc/overrides/madara/mangahz/src/MangaHZ.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangahz -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/mangakio/src/MangaKio.kt b/multisrc/overrides/madara/mangakio/src/MangaKio.kt index b0db60dad..b0d73c09c 100644 --- a/multisrc/overrides/madara/mangakio/src/MangaKio.kt +++ b/multisrc/overrides/madara/mangakio/src/MangaKio.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangakio -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class MangaKio : Madara( "https://mangakio.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt index 8624a006f..c142e8996 100644 --- a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt +++ b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt @@ -3,17 +3,17 @@ package eu.kanade.tachiyomi.extension.en.mangakitsune import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SChapter +import okhttp3.Response import java.text.SimpleDateFormat import java.util.Locale -import okhttp3.Response @Nsfw class MangaKitsune : Madara("MangaKitsune", "https://mangakitsune.com", "en", dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)) { - + override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() override val pageListParseSelector = ".reading-content div.text-left :has(>img)" - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/mangakomi/src/MangaKomi.kt b/multisrc/overrides/madara/mangakomi/src/MangaKomi.kt index f894c8c57..b8b1b2d75 100644 --- a/multisrc/overrides/madara/mangakomi/src/MangaKomi.kt +++ b/multisrc/overrides/madara/mangakomi/src/MangaKomi.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.mangakomi import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/madara/mangame/src/MangaMe.kt b/multisrc/overrides/madara/mangame/src/MangaMe.kt index 1384af31a..ff8cdca5f 100644 --- a/multisrc/overrides/madara/mangame/src/MangaMe.kt +++ b/multisrc/overrides/madara/mangame/src/MangaMe.kt @@ -9,6 +9,4 @@ class MangaMe : Madara( "https://mangame.org", "en", dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt b/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt index 0c50f7d5f..eb7f8e4a6 100644 --- a/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt +++ b/multisrc/overrides/madara/mangamitsu/src/MangaMitsu.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangamitsu -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class MangaMitsu : Madara("Manga Mitsu", "https://mangamitsu.com", "en") diff --git a/multisrc/overrides/madara/manganatoinfo/src/Manganatoinfo.kt b/multisrc/overrides/madara/manganatoinfo/src/Manganatoinfo.kt index b2f902d73..b592da5f4 100644 --- a/multisrc/overrides/madara/manganatoinfo/src/Manganatoinfo.kt +++ b/multisrc/overrides/madara/manganatoinfo/src/Manganatoinfo.kt @@ -9,6 +9,4 @@ class Manganatoinfo : Madara( "https://manganato.info", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/mangapl/src/MangaPL.kt b/multisrc/overrides/madara/mangapl/src/MangaPL.kt index fa50991ec..85b335c12 100644 --- a/multisrc/overrides/madara/mangapl/src/MangaPL.kt +++ b/multisrc/overrides/madara/mangapl/src/MangaPL.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangapl -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class MangaPL : Madara("MangaPL", "https://mangapl.com", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt b/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt index 747eb3511..b4fd221b3 100644 --- a/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt +++ b/multisrc/overrides/madara/mangasorigines/src/MangasOrigines.kt @@ -4,5 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale - class MangasOrigines : Madara("Mangas Origines", "https://mangas-origines.fr", "fr", SimpleDateFormat("dd MMM yyyy", Locale("fr"))) diff --git a/multisrc/overrides/madara/mangatk/src/MangaTK.kt b/multisrc/overrides/madara/mangatk/src/MangaTK.kt index 1342d8779..11dac69c0 100644 --- a/multisrc/overrides/madara/mangatk/src/MangaTK.kt +++ b/multisrc/overrides/madara/mangatk/src/MangaTK.kt @@ -2,14 +2,9 @@ package eu.kanade.tachiyomi.extension.en.mangatk import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SManga -import java.util.Locale -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request import org.jsoup.nodes.Document -import org.jsoup.nodes.Element class MangaTK : Madara("MangaTK", "https://mangatk.com", "en") { @@ -24,7 +19,6 @@ class MangaTK : Madara("MangaTK", "https://mangatk.com", "en") { return GET("$baseUrl/manga/page/$page?orderby=latest") } - override val pageListParseSelector = "div.read-content img" override fun pageListParse(document: Document): List { diff --git a/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt b/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt index 1b74918cc..1401b9a5e 100644 --- a/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt +++ b/multisrc/overrides/madara/mangatuli/src/MangaTuli.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mangatuli -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class MangaTuli : Madara("MangaTuli", "https://mangatuli.com", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("4-koma", "4-koma"), Genre("Action", "action"), diff --git a/multisrc/overrides/madara/mangaus/src/MangaUS.kt b/multisrc/overrides/madara/mangaus/src/MangaUS.kt index a45e904d3..3c217252a 100644 --- a/multisrc/overrides/madara/mangaus/src/MangaUS.kt +++ b/multisrc/overrides/madara/mangaus/src/MangaUS.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.mangaus import eu.kanade.tachiyomi.multisrc.madara.Madara - class MangaUS : Madara("MangaUS", "https://mangaus.xyz", "en") { override val pageListParseSelector = "img" } - diff --git a/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt b/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt index 11e469c40..dd316ca46 100644 --- a/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt +++ b/multisrc/overrides/madara/mangaweebs/src/MangaWeebs.kt @@ -3,7 +3,5 @@ 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", dateFormat = SimpleDateFormat("dd MMMM HH:mm", Locale.US)) diff --git a/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt b/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt index a33675e2c..330fd9c4a 100644 --- a/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt +++ b/multisrc/overrides/madara/manhuadex/src/ManhuaDex.kt @@ -9,6 +9,4 @@ class ManhuaDex : Madara( "https://manhuadex.com", "en", dateFormat = SimpleDateFormat("dd MMMM yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt b/multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt index 624481f6d..d6bae9584 100644 --- a/multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt +++ b/multisrc/overrides/madara/manhuafast/src/ManhuaFast.kt @@ -2,6 +2,4 @@ package eu.kanade.tachiyomi.extension.en.manhuafast import eu.kanade.tachiyomi.multisrc.madara.Madara -class ManhuaFast : Madara("ManhuaFast", "https://manhuafast.com", "en") { - -} +class ManhuaFast : Madara("ManhuaFast", "https://manhuafast.com", "en") diff --git a/multisrc/overrides/madara/manhuapro/src/ManhuaPro.kt b/multisrc/overrides/madara/manhuapro/src/ManhuaPro.kt index 793d23448..89d7ef636 100644 --- a/multisrc/overrides/madara/manhuapro/src/ManhuaPro.kt +++ b/multisrc/overrides/madara/manhuapro/src/ManhuaPro.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.extension.en.manhuapro import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt b/multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt index d73995a56..b18a2bf99 100644 --- a/multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt +++ b/multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt @@ -2,6 +2,4 @@ package eu.kanade.tachiyomi.extension.en.manhuaus import eu.kanade.tachiyomi.multisrc.madara.Madara -class ManhuaUS : Madara("ManhuaUS", "https://manhuaus.com", "en") { - -} +class ManhuaUS : Madara("ManhuaUS", "https://manhuaus.com", "en") diff --git a/multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt b/multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt index 1317b06fe..ff7a7c98a 100644 --- a/multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt +++ b/multisrc/overrides/madara/manhuazone/src/ManhuaZone.kt @@ -9,6 +9,4 @@ class ManhuaZone : Madara( "https://manhuazone.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt index 0404393fc..8a18f2ab2 100644 --- a/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt +++ b/multisrc/overrides/madara/manhwa18app/src/Manhwa18app.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.manhwa18app -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class Manhwa18app : Madara("Manhwa18.app", "https://manhwa18.app", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { - -} +class Manhwa18app : Madara("Manhwa18.app", "https://manhwa18.app", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt b/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt index c0993d11a..de69da419 100644 --- a/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt +++ b/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt @@ -4,13 +4,9 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceFactory -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SManga -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request import org.jsoup.nodes.Document -import org.jsoup.nodes.Element class Manhwa18CcFactory : SourceFactory { override fun createSources(): List = listOf( @@ -37,7 +33,6 @@ abstract class Manhwa18Cc( override fun popularMangaSelector() = "div.manga-item" override val popularMangaUrlSelector = "div.data > h3 > a" - override fun popularMangaRequest(page: Int): Request { return GET("$baseUrl/webtoons/$page?orderby=trending") } diff --git a/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt b/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt index 977b01683..f2e965dc1 100644 --- a/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt +++ b/multisrc/overrides/madara/manhwa365/src/Manhwa365.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manhwa365 -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt index 7c7b86d3f..43d58a46d 100644 --- a/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt +++ b/multisrc/overrides/madara/manhwa68/src/Manhwa68.kt @@ -11,6 +11,4 @@ class Manhwa68 : Madara( "https://manhwa68.com", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt index 97ee889ef..3da8e6c13 100644 --- a/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt +++ b/multisrc/overrides/madara/manhwabiz/src/Manhwabiz.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.manhwabiz -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request import java.text.SimpleDateFormat diff --git a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt index 758b1c767..848c028c8 100644 --- a/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt +++ b/multisrc/overrides/madara/manhwuafans/src/Manhwuafans.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.manhwuafans -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class Manhwuafans : Madara("Manhwua.fans", "https://manhwua.fans", "en", dateFormat = SimpleDateFormat("yyyy'年'M'月'd", Locale.US)) { - -} +class Manhwuafans : Madara("Manhwua.fans", "https://manhwua.fans", "en", dateFormat = SimpleDateFormat("yyyy'年'M'月'd", Locale.US)) diff --git a/multisrc/overrides/madara/manytoon/src/ManyToon.kt b/multisrc/overrides/madara/manytoon/src/ManyToon.kt index df4650331..a3d516333 100644 --- a/multisrc/overrides/madara/manytoon/src/ManyToon.kt +++ b/multisrc/overrides/madara/manytoon/src/ManyToon.kt @@ -62,5 +62,4 @@ class ManyToon : Madara("ManyToon", "https://manytoon.com", "en") { Genre("Yaoi", "yaoi"), Genre("Yuri", "yuri"), ) - } diff --git a/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt b/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt index 40e8e9197..443bad9d7 100644 --- a/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt +++ b/multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class ManyToonMe : Madara("ManyToon.me", "https://manytoon.me", "en") { - + override val useNewChapterEndpoint: Boolean = true override fun getGenreList() = listOf( @@ -57,5 +57,4 @@ class ManyToonMe : Madara("ManyToon.me", "https://manytoon.me", "en") { Genre("Yaoi", "yaoi"), Genre("Yuri", "yuri"), ) - } diff --git a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt index 100e22c74..21e0af904 100644 --- a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt +++ b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt @@ -1,36 +1,10 @@ package eu.kanade.tachiyomi.extension.en.midnightmessscans -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.network.asObservable -import eu.kanade.tachiyomi.source.model.Filter -import eu.kanade.tachiyomi.source.model.FilterList -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SChapter +import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.CacheControl -import okhttp3.FormBody -import okhttp3.Headers -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.RequestBody.Companion.toRequestBody -import okhttp3.Response import org.jsoup.nodes.Document -import org.jsoup.nodes.Element -import rx.Observable -import java.text.ParseException -import java.text.SimpleDateFormat -import java.util.Calendar import java.util.Locale -import java.util.concurrent.TimeUnit -import kotlin.math.absoluteValue -import kotlin.random.Random @Nsfw class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.org", "en") { diff --git a/multisrc/overrides/madara/milftoon/src/Milftoon.kt b/multisrc/overrides/madara/milftoon/src/Milftoon.kt index 25e94eefa..9b9ae7c7f 100644 --- a/multisrc/overrides/madara/milftoon/src/Milftoon.kt +++ b/multisrc/overrides/madara/milftoon/src/Milftoon.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.milftoon -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET import okhttp3.Request diff --git a/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt b/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt index 622832085..84689231f 100644 --- a/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt +++ b/multisrc/overrides/madara/ohnomanga/src/OhNoManga.kt @@ -4,6 +4,4 @@ import eu.kanade.tachiyomi.annotations.Nsfw import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw -class OhNoManga : Madara("Oh No Manga", "https://ohnomanga.com", "en") { - -} +class OhNoManga : Madara("Oh No Manga", "https://ohnomanga.com", "en") diff --git a/multisrc/overrides/madara/pornwha/src/Pornwha.kt b/multisrc/overrides/madara/pornwha/src/Pornwha.kt index 758f7c41c..da63f28ac 100644 --- a/multisrc/overrides/madara/pornwha/src/Pornwha.kt +++ b/multisrc/overrides/madara/pornwha/src/Pornwha.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.pornwha -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class Pornwha : Madara("Pornwha", "https://pornwha.com", "en") diff --git a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt index 5f7233d86..98886139e 100644 --- a/multisrc/overrides/madara/rawmangas/src/RawMangas.kt +++ b/multisrc/overrides/madara/rawmangas/src/RawMangas.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.ja.rawmangas -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/readadult/src/ReadAdult.kt b/multisrc/overrides/madara/readadult/src/ReadAdult.kt index fbc53b2c9..a279a6f3c 100644 --- a/multisrc/overrides/madara/readadult/src/ReadAdult.kt +++ b/multisrc/overrides/madara/readadult/src/ReadAdult.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.readadult -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class ReadAdult : Madara("Read Adult", "https://readadult.net", "en") diff --git a/multisrc/overrides/madara/scansraw/src/ScansRaw.kt b/multisrc/overrides/madara/scansraw/src/ScansRaw.kt index 5497d2553..b8d9a4741 100644 --- a/multisrc/overrides/madara/scansraw/src/ScansRaw.kt +++ b/multisrc/overrides/madara/scansraw/src/ScansRaw.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.extension.en.scansraw import eu.kanade.tachiyomi.multisrc.madara.Madara - class ScansRaw : Madara("Scans Raw", "https://scansraw.com", "en") { override val useNewChapterEndpoint: Boolean = true } diff --git a/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt b/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt index 07fe15665..09575add2 100644 --- a/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt +++ b/multisrc/overrides/madara/seafoamscans/src/SeafoamScans.kt @@ -3,4 +3,4 @@ package eu.kanade.tachiyomi.extension.en.seafoamscans import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat -class SeafoamScans : Madara("Seafoam Scans", "https://seafoamscans.com", "en", SimpleDateFormat("dd/MM/yyyy")) +class SeafoamScans : Madara("Seafoam Scans", "https://seafoamscans.com", "en", SimpleDateFormat("dd/MM/yyyy")) diff --git a/multisrc/overrides/madara/shinobiscans/src/ShinobiScans.kt b/multisrc/overrides/madara/shinobiscans/src/ShinobiScans.kt index e501c167d..ce9744ad3 100644 --- a/multisrc/overrides/madara/shinobiscans/src/ShinobiScans.kt +++ b/multisrc/overrides/madara/shinobiscans/src/ShinobiScans.kt @@ -4,5 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale - class ShinobiScans : Madara("ShinobiScans", "https://shinobiscans.com", "it", SimpleDateFormat("MMMM d, yyyy", Locale("it"))) diff --git a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt index 4da084841..b468746aa 100644 --- a/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt +++ b/multisrc/overrides/madara/siyahmelek/src/Siyahmelek.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.tr.siyahmelek -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/skymanga/src/Skymanga.kt b/multisrc/overrides/madara/skymanga/src/Skymanga.kt index f0d06b72b..ea7c1ccb0 100644 --- a/multisrc/overrides/madara/skymanga/src/Skymanga.kt +++ b/multisrc/overrides/madara/skymanga/src/Skymanga.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.skymanga -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class Skymanga : Madara("Skymanga", "https://skymanga.co", "en") diff --git a/multisrc/overrides/madara/sugarbabies/src/SugarBabies.kt b/multisrc/overrides/madara/sugarbabies/src/SugarBabies.kt index 5266c5ac4..458c5a457 100644 --- a/multisrc/overrides/madara/sugarbabies/src/SugarBabies.kt +++ b/multisrc/overrides/madara/sugarbabies/src/SugarBabies.kt @@ -2,4 +2,4 @@ package eu.kanade.tachiyomi.extension.en.sugarbabies import eu.kanade.tachiyomi.multisrc.madara.Madara -class SugarBabies : Madara("Sugar Babies", "https://sugarbscan.com", "en") \ No newline at end of file +class SugarBabies : Madara("Sugar Babies", "https://sugarbscan.com", "en") diff --git a/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt b/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt index c0a286db6..4e0560e96 100644 --- a/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt +++ b/multisrc/overrides/madara/sunshinebutterflyscans/src/SunshineButterflyScans.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.sunshinebutterflyscans -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class SunshineButterflyScans : Madara("Sunshine Butterfly Scans", "https://sunshinebutterflyscan.com", "en") diff --git a/multisrc/overrides/madara/toonily/src/Toonily.kt b/multisrc/overrides/madara/toonily/src/Toonily.kt index 00a07da32..1c6cfe139 100644 --- a/multisrc/overrides/madara/toonily/src/Toonily.kt +++ b/multisrc/overrides/madara/toonily/src/Toonily.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.toonily -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class Toonily : Madara("Toonily", "https://toonily.com", "en") { diff --git a/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt index 743a3e2e4..852c8b19e 100644 --- a/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt +++ b/multisrc/overrides/madara/toonilynet/src/Toonilynet.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.toonilynet -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class Toonilynet : Madara("Toonily.net", "https://toonily.net", "en") diff --git a/multisrc/overrides/madara/toonmany/src/ToonMany.kt b/multisrc/overrides/madara/toonmany/src/ToonMany.kt index d4bdbc153..56d4156cf 100644 --- a/multisrc/overrides/madara/toonmany/src/ToonMany.kt +++ b/multisrc/overrides/madara/toonmany/src/ToonMany.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.toonmany -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class ToonMany : Madara("ToonMany", "https://toonmany.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { - -} +class ToonMany : Madara("ToonMany", "https://toonmany.com", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/turkcemanga/src/TurkceManga.kt b/multisrc/overrides/madara/turkcemanga/src/TurkceManga.kt index 13f3c9c2a..1d0714960 100644 --- a/multisrc/overrides/madara/turkcemanga/src/TurkceManga.kt +++ b/multisrc/overrides/madara/turkcemanga/src/TurkceManga.kt @@ -2,23 +2,9 @@ package eu.kanade.tachiyomi.extension.tr.turkcemanga import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.network.POST -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory -import eu.kanade.tachiyomi.source.model.FilterList -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import okhttp3.CacheControl -import okhttp3.Headers -import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.Response -import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit class TurkceManga : Madara("Türkçe Manga", "https://turkcemanga.com", "tr") { override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/page/$page/?s&post_type=wp-manga&m_orderby=views", headers) diff --git a/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt b/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt index 5edb9015b..62db64fc1 100644 --- a/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt +++ b/multisrc/overrides/madara/twentyfourhmanga/src/TwentyFourhManga.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.twentyfourhmanga -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class TwentyFourhManga : Madara("24hManga", "https://24hmanga.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) { - -} +class TwentyFourhManga : Madara("24hManga", "https://24hmanga.com", "en", dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/uyuyanbalik/src/UyuyanBalik.kt b/multisrc/overrides/madara/uyuyanbalik/src/UyuyanBalik.kt index c97685fdd..c24868ba1 100644 --- a/multisrc/overrides/madara/uyuyanbalik/src/UyuyanBalik.kt +++ b/multisrc/overrides/madara/uyuyanbalik/src/UyuyanBalik.kt @@ -5,4 +5,3 @@ import java.text.SimpleDateFormat import java.util.Locale class UyuyanBalik : Madara("Uyuyan Balik", "https://uyuyanbalik.com/", "tr", SimpleDateFormat("dd MMMM yyyy", Locale.US)) - diff --git a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt index 6ba1aacf9..95de4b3d5 100644 --- a/multisrc/overrides/madara/webtoon18/src/WebToon18.kt +++ b/multisrc/overrides/madara/webtoon18/src/WebToon18.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.webtoon18 -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/madara/webtoon69/src/WebToon69.kt b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt index e52b4302d..8c06f2ac9 100644 --- a/multisrc/overrides/madara/webtoon69/src/WebToon69.kt +++ b/multisrc/overrides/madara/webtoon69/src/WebToon69.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.webtoon69 -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class WebToon69 : Madara("WebToon69", "https://webtoon69.com", "en") diff --git a/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt b/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt index a0bedc8ed..5c61f8e57 100644 --- a/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt +++ b/multisrc/overrides/madara/webtoonstop/src/WebtoonsTOP.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.webtoonstop -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @@ -11,6 +11,4 @@ class WebtoonsTOP : Madara( "https://webtoons.top", "en", dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US) -) { - -} +) diff --git a/multisrc/overrides/madara/xmanga/src/XManga.kt b/multisrc/overrides/madara/xmanga/src/XManga.kt index a62487631..19739acd4 100644 --- a/multisrc/overrides/madara/xmanga/src/XManga.kt +++ b/multisrc/overrides/madara/xmanga/src/XManga.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.xmanga -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class XManga : Madara("XManga", "https://xmanga.io", "en") diff --git a/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt b/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt index 0909322ff..dc0f33394 100644 --- a/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt +++ b/multisrc/overrides/madara/yaoihentai/src/YaoiHentai.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.yaoihentai -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class YaoiHentai : Madara("Yaoi Hentai", "https://yaoihentai.me", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) { - -} +class YaoiHentai : Madara("Yaoi Hentai", "https://yaoihentai.me", "en", dateFormat = SimpleDateFormat("MMMM d, yyyy", Locale.US)) diff --git a/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt b/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt index 401859274..a7be92bc3 100644 --- a/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt +++ b/multisrc/overrides/madara/yaoimanga/src/YaoiManga.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.yaoimanga -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.madara.Madara import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit @@ -12,7 +12,7 @@ class YaoiManga : Madara("Yaoi.mobi", "https://yaoi.mobi", "en") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 1, TimeUnit.SECONDS)) .build() - + override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt b/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt index ee7389839..38c274a12 100644 --- a/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt +++ b/multisrc/overrides/madara/yaoiscan/src/YaoiScan.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.en.yaoiscan -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw -import java.text.SimpleDateFormat -import java.util.Locale +import eu.kanade.tachiyomi.multisrc.madara.Madara @Nsfw class YaoiScan : Madara("YaoiScan", "https://yaoiscan.com", "en") diff --git a/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt b/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt index 5ddeba672..ddbebeba4 100644 --- a/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt +++ b/multisrc/overrides/madara/yaoitoon/src/YaoiToon.kt @@ -1,11 +1,9 @@ package eu.kanade.tachiyomi.extension.en.yaoitoon -import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale @Nsfw -class YaoiToon : Madara("YaoiToon", "https://yaoitoon.com", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) { - -} +class YaoiToon : Madara("YaoiToon", "https://yaoitoon.com", "en", dateFormat = SimpleDateFormat("d MMMM, yyyy", Locale.US)) diff --git a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt b/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt index 8c84155e9..fdf24e505 100644 --- a/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt +++ b/multisrc/overrides/mangacatalog/readattackontitanshingekinokyojinmanga/src/ReadAttackOnTitanShingekiNoKyojinManga.kt @@ -1,17 +1,7 @@ package eu.kanade.tachiyomi.extension.en.readattackontitanshingekinokyojinmanga import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter -import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable -import org.jsoup.nodes.Document import org.jsoup.nodes.Element class ReadAttackOnTitanShingekiNoKyojinManga : MangaCatalog("Read Attack on Titan Shingeki no Kyojin Manga", "https://ww7.readsnk.com", "en") { @@ -35,7 +25,7 @@ class ReadAttackOnTitanShingekiNoKyojinManga : MangaCatalog("Read Attack on Tita override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { val name1 = element.select(".flex > a.text-gray-900").text() val name2 = element.select(".flex > div.text-xs").text() - if (name2 == ""){ + if (name2 == "") { name = name1 } else { name = "$name1 - $name2" diff --git a/multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt b/multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt index 0055a673f..cacba110d 100644 --- a/multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt +++ b/multisrc/overrides/mangacatalog/readberserkmanga/src/ReadBerserkManga.kt @@ -1,16 +1,8 @@ package eu.kanade.tachiyomi.extension.en.readberserkmanga import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -34,6 +26,6 @@ class ReadBerserkManga : MangaCatalog("Read Berserk Manga", "https://readberserk override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.select("td:first-child").text() url = element.select("a.btn-primary").attr("abs:href") - date_upload = System.currentTimeMillis() //I have no idear how to parse Date stuff + date_upload = System.currentTimeMillis() // I have no idear how to parse Date stuff } } diff --git a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt b/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt index 85575cd8e..0db1cdd1f 100644 --- a/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt +++ b/multisrc/overrides/mangacatalog/readbokunoheroacademiamyheroacademiamanga/src/ReadBokuNoHeroAcademiaMyHeroAcademiaManga.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readbokunoheroacademiamyheroacademiamanga import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadBokuNoHeroAcademiaMyHeroAcademiaManga : MangaCatalog("Read Boku no Hero Academia My Hero Academia Manga", "https://ww6.readmha.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt b/multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt index c1725e765..b491ff473 100644 --- a/multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readchainsawmanmangaonline/src/ReadChainsawManMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readchainsawmanmangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadChainsawManMangaOnline : MangaCatalog("Read Chainsaw Man Manga Online", "https://ww1.readchainsawman.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt b/multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt index 179ddc8f2..80afcf3f8 100644 --- a/multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readdragonballsuperchoumangaonline/src/ReadDragonBallSuperChouMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readdragonballsuperchoumangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadDragonBallSuperChouMangaOnline : MangaCatalog("Read Dragon Ball Super Chou Manga Online", "https://ww6.dbsmanga.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt b/multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt index 70572cc1d..53e1a4fe2 100644 --- a/multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readdrstonemangaonline/src/ReadDrStoneMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readdrstonemangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadDrStoneMangaOnline : MangaCatalog("Read Dr. Stone Manga Online", "https://ww3.readdrstone.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt b/multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt index 3d067f924..8f76f4404 100644 --- a/multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readfairytailedenszeromangaonline/src/ReadFairyTailEdensZeroMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readfairytailedenszeromangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadFairyTailEdensZeroMangaOnline : MangaCatalog("Read Fairy Tail & Edens Zero Manga Online", "https://ww4.readfairytail.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt b/multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt index af667fce6..449a67108 100644 --- a/multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readgoblinslayermangaonline/src/ReadGoblinSlayerMangaOnline.kt @@ -1,16 +1,8 @@ package eu.kanade.tachiyomi.extension.en.readgoblinslayermangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -31,6 +23,6 @@ class ReadGoblinSlayerMangaOnline : MangaCatalog("Read Goblin Slayer Manga Onlin override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.select("td:first-child").text() url = element.select("a.btn-primary").attr("abs:href") - date_upload = System.currentTimeMillis() //I have no idear how to parse Date stuff + date_upload = System.currentTimeMillis() // I have no idear how to parse Date stuff } } diff --git a/multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt b/multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt index ddfa43f05..4beb70925 100644 --- a/multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readhaikyuumangaonline/src/ReadHaikyuuMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readhaikyuumangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadHaikyuuMangaOnline : MangaCatalog("Read Haikyuu!! Manga Online", "https://ww6.readhaikyuu.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt b/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt index 8f462ae29..e824d5588 100644 --- a/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readhunterxhuntermangaonline/src/ReadHunterxHunterMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readhunterxhuntermangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadHunterxHunterMangaOnline : MangaCatalog("Read Hunter x Hunter Manga Online", "https://ww2.readhxh.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt b/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt index a78112608..a876abfa1 100644 --- a/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readjujutsukaisenmangaonline/src/ReadJujutsuKaisenMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readjujutsukaisenmangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadJujutsuKaisenMangaOnline : MangaCatalog("Read Jujutsu Kaisen Manga Online", "https://ww1.readjujutsukaisen.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt b/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt index 4b4a60bf2..1bf897e4e 100644 --- a/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readkaguyasamamangaonline/src/ReadKaguyaSamaMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readkaguyasamamangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadKaguyaSamaMangaOnline : MangaCatalog("Read Kaguya-sama Manga Online", "https://ww1.readkaguyasama.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt b/multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt index 0e3859bdd..90a9311ee 100644 --- a/multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readkingdommangaonline/src/ReadKingdomMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readkingdommangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadKingdomMangaOnline : MangaCatalog("Read Kingdom Manga Online", "https://ww2.readkingdom.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt b/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt index dfa990038..c87bb16dc 100644 --- a/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readnanatsunotaizai7deadlysinsmangaonline/src/ReadNanatsuNoTaizai7DeadlySinsMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readnanatsunotaizai7deadlysinsmangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadNanatsuNoTaizai7DeadlySinsMangaOnline : MangaCatalog("Read Nanatsu no Taizai 7 Deadly Sins Manga Online", "https://ww3.read7deadlysins.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt b/multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt index 6a4f53eca..80ba912aa 100644 --- a/multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readnarutoborutosamurai8mangaonline/src/ReadNarutoBorutoSamurai8MangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readnarutoborutosamurai8mangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadNarutoBorutoSamurai8MangaOnline : MangaCatalog("Read Naruto Boruto Samurai 8 Manga Online", "https://ww7.readnaruto.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt b/multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt index 4129f8d92..5d08d013e 100644 --- a/multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt +++ b/multisrc/overrides/mangacatalog/readnoblessemanhwaonline/src/ReadNoblesseManhwaOnline.kt @@ -1,16 +1,8 @@ package eu.kanade.tachiyomi.extension.en.readnoblessemanhwaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -32,7 +24,7 @@ class ReadNoblesseManhwaOnline : MangaCatalog("Read Noblesse Manhwa Online", "ht override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { val name1 = element.select(".flex-col > a:not(.text-xs)").text() val name2 = element.select(".text-xs:not(a)").text() - if (name2 == ""){ + if (name2 == "") { name = name1 } else { name = "$name1 - $name2" diff --git a/multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt b/multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt index 69be7f42d..7ff22896f 100644 --- a/multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readonepiecemangaonline/src/ReadOnePieceMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readonepiecemangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadOnePieceMangaOnline : MangaCatalog("Read One Piece Manga Online", "https://ww8.readonepiece.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt b/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt index 3d95ba7c0..365e0a1fb 100644 --- a/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt +++ b/multisrc/overrides/mangacatalog/readonepunchmanmangaonlinetwo/src/ReadOnePunchManMangaOnlineTwo.kt @@ -1,16 +1,8 @@ package eu.kanade.tachiyomi.extension.en.readonepunchmanmangaonlinetwo import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -33,6 +25,6 @@ class ReadOnePunchManMangaOnlineTwo : MangaCatalog("Read One-Punch Man Manga Onl override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.select("td:first-child").text() url = element.select("a").attr("abs:href") - date_upload = System.currentTimeMillis() //I have no idear how to parse Date stuff + date_upload = System.currentTimeMillis() // I have no idear how to parse Date stuff } } diff --git a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt b/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt index 86686d91a..286a5096e 100644 --- a/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt +++ b/multisrc/overrides/mangacatalog/readsololevelingmangamanhwaonline/src/ReadSoloLevelingMangaManhwaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readsololevelingmangamanhwaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadSoloLevelingMangaManhwaOnline : MangaCatalog("Read Solo Leveling Manga Manhwa Online", "https://readsololeveling.org", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readswordartonlinemangaonline/src/ReadSwordArtOnlineMangaOnline.kt b/multisrc/overrides/mangacatalog/readswordartonlinemangaonline/src/ReadSwordArtOnlineMangaOnline.kt index c7e7bf185..373e2015c 100644 --- a/multisrc/overrides/mangacatalog/readswordartonlinemangaonline/src/ReadSwordArtOnlineMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readswordartonlinemangaonline/src/ReadSwordArtOnlineMangaOnline.kt @@ -1,16 +1,8 @@ package eu.kanade.tachiyomi.extension.en.readswordartonlinemangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.online.ParsedHttpSource -import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element @@ -40,6 +32,6 @@ class ReadSwordArtOnlineMangaOnline : MangaCatalog("Read Sword Art Online Manga override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.select("td:first-child").text() url = element.select("a.btn-primary").attr("abs:href") - date_upload = System.currentTimeMillis() //I have no idear how to parse Date stuff + date_upload = System.currentTimeMillis() // I have no idear how to parse Date stuff } } diff --git a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt b/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt index a6c92fecd..be221701a 100644 --- a/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readthepromisedneverlandmangaonline/src/ReadThePromisedNeverlandMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readthepromisedneverlandmangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadThePromisedNeverlandMangaOnline : MangaCatalog("Read The Promised Neverland Manga Online", "https://ww3.readneverland.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt b/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt index bc0f2043d..fec751471 100644 --- a/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readtokyoghoulretokyoghoulmangaonline/src/ReadTokyoGhoulReTokyoGhoulMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readtokyoghoulretokyoghoulmangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadTokyoGhoulReTokyoGhoulMangaOnline : MangaCatalog("Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online", "https://ww8.tokyoghoulre.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt b/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt index 2423e5907..939b9a1c1 100644 --- a/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readtowerofgodmanhwamangaonline/src/ReadTowerOfGodManhwaMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readtowerofgodmanhwamangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadTowerOfGodManhwaMangaOnline : MangaCatalog("Read Tower of God Manhwa Manga Online", "https://ww1.readtowerofgod.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt b/multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt index 941ff8f26..10a0c66e4 100644 --- a/multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt +++ b/multisrc/overrides/mangacatalog/readvinlandsagamangaonline/src/ReadVinlandSagaMangaOnline.kt @@ -1,8 +1,6 @@ package eu.kanade.tachiyomi.extension.en.readvinlandsagamangaonline import eu.kanade.tachiyomi.multisrc.mangacatalog.MangaCatalog -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.util.asJsoup class ReadVinlandSagaMangaOnline : MangaCatalog("Read Vinland Saga Manga Online", "https://ww1.readvinlandsaga.com", "en") { override val sourceList = listOf( diff --git a/multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt b/multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt index 11c360486..6a736a080 100644 --- a/multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt +++ b/multisrc/overrides/mmrcms/utsukushii/src/Utsukushii.kt @@ -1,16 +1,10 @@ package eu.kanade.tachiyomi.extension.bg.utsukushii import eu.kanade.tachiyomi.multisrc.mmrcms.MMRCMS -import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.OkHttpClient import okhttp3.Request -import okhttp3.Response -class Utsukushii : MMRCMS("Utsukushii", "https://manga.utsukushii-bg.com", "bg"){ +class Utsukushii : MMRCMS("Utsukushii", "https://manga.utsukushii-bg.com", "bg") { override fun popularMangaRequest(page: Int): Request { return GET("$baseUrl/manga-list", headers) } diff --git a/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt b/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt index c967fedf1..fa42a79cd 100644 --- a/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt +++ b/multisrc/overrides/nyahentai/nyahentai/src/NyaHentaiFactory.kt @@ -12,7 +12,7 @@ class NyaHentaiFactory : SourceFactory { NyaHentaiALL(), ) } -class NyaHentaiEN : NyaHentai("NyaHentai", "https://nyahentai.com", "en"){ +class NyaHentaiEN : NyaHentai("NyaHentai", "https://nyahentai.com", "en") { override val id = 9170089554867447899 } class NyaHentaiJA : NyaHentai("NyaHentai", "https://nyahentai.com", "ja") diff --git a/multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt b/multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt index f76da3101..04af41e8e 100644 --- a/multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt +++ b/multisrc/overrides/webtoons/dongmanmanhua/src/DongmanManhua.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.zh.dongmanmanhua -import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.multisrc.webtoons.Webtoons +import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga diff --git a/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt b/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt index 85ba1fb0c..10708fb0a 100644 --- a/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt +++ b/multisrc/overrides/webtoons/webtoons/src/WebtoonsFactory.kt @@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.source.SourceFactory import java.text.SimpleDateFormat import java.util.GregorianCalendar import java.util.Locale -import java.util.Calendar class WebtoonsFactory : SourceFactory { override fun createSources(): List = listOf( @@ -17,13 +16,12 @@ class WebtoonsFactory : SourceFactory { WebtoonsFR(), WebtoonsZH(), ) - } class WebtoonsEN : Webtoons("Webtoons.com", "https://www.webtoons.com", "en") class WebtoonsID : Webtoons("Webtoons.com", "https://www.webtoons.com", "id") { // Override ID as part of the name was removed to be more consiten with other enteries override val id: Long = 8749627068478740298 - + // Android seems to be unable to parse Indonesian dates; we'll use a short hard-coded table // instead. private val dateMap: Array = arrayOf( diff --git a/multisrc/overrides/weebreader/naniscans/src/NaniScans.kt b/multisrc/overrides/weebreader/naniscans/src/NaniScans.kt index 02c7f4ac6..9b1c35109 100644 --- a/multisrc/overrides/weebreader/naniscans/src/NaniScans.kt +++ b/multisrc/overrides/weebreader/naniscans/src/NaniScans.kt @@ -2,9 +2,6 @@ package eu.kanade.tachiyomi.extension.en.naniscans import eu.kanade.tachiyomi.multisrc.weebreader.Weebreader - - - class NaniScans : Weebreader("NANI? Scans", "https://naniscans.com", "en") { override val versionId = 2 } diff --git a/multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt b/multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt index 362fa3552..19b1894af 100644 --- a/multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt +++ b/multisrc/overrides/wpcomics/nettruyen/src/NetTruyen.kt @@ -4,8 +4,8 @@ import eu.kanade.tachiyomi.multisrc.wpcomics.WPComics import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.Page -import okhttp3.Request import okhttp3.Headers +import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt b/multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt index 243b9dd4c..24a74f76f 100644 --- a/multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt +++ b/multisrc/overrides/wpcomics/nhattruyen/src/NhatTruyen.kt @@ -4,8 +4,8 @@ import eu.kanade.tachiyomi.multisrc.wpcomics.WPComics import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.Page -import okhttp3.Request import okhttp3.Headers +import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/wpcomics/truyenchon/src/TruyenChon.kt b/multisrc/overrides/wpcomics/truyenchon/src/TruyenChon.kt index f698f6eb0..b83cba0aa 100644 --- a/multisrc/overrides/wpcomics/truyenchon/src/TruyenChon.kt +++ b/multisrc/overrides/wpcomics/truyenchon/src/TruyenChon.kt @@ -5,12 +5,11 @@ import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SManga -import okhttp3.Request import okhttp3.Headers +import okhttp3.Request +import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -import org.jsoup.nodes.Document -import org.jsoup.nodes.Element class TruyenChon : WPComics("TruyenChon", "http://truyenchon.com", "vi", SimpleDateFormat("dd/MM/yy", Locale.getDefault()), null) { override val searchPath = "the-loai" @@ -25,7 +24,7 @@ class TruyenChon : WPComics("TruyenChon", "http://truyenchon.com", "vi", SimpleD override fun popularMangaFromElement(element: Element): SManga { return SManga.create().apply { element.select("h3 a").let { - title = it.text().replace("Truyện tranh ","") + title = it.text().replace("Truyện tranh ", "") setUrlWithoutDomain(it.attr("abs:href")) } thumbnail_url = imageOrNull(element.select("div.image:first-of-type img").first()) @@ -33,7 +32,7 @@ class TruyenChon : WPComics("TruyenChon", "http://truyenchon.com", "vi", SimpleD } override fun searchMangaFromElement(element: Element): SManga { return SManga.create().apply { - title = element.attr("title").replace("Truyện tranh ","") + title = element.attr("title").replace("Truyện tranh ", "") setUrlWithoutDomain(element.attr("href")) thumbnail_url = imageOrNull(element.select("img").first()) } diff --git a/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt b/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt index 894f47e6e..5bac3dfe9 100644 --- a/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt +++ b/multisrc/overrides/wpmangareader/dragontranslation/src/DragonTranslation.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.es.dragontranslation -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader @Nsfw class DragonTranslation : WPMangaReader("DragonTranslation", "https://dragontranslation.com", "es") diff --git a/multisrc/overrides/wpmangareader/fusionscanlation/src/FusionScanlation.kt b/multisrc/overrides/wpmangareader/fusionscanlation/src/FusionScanlation.kt index 6448f3fad..23d5be570 100644 --- a/multisrc/overrides/wpmangareader/fusionscanlation/src/FusionScanlation.kt +++ b/multisrc/overrides/wpmangareader/fusionscanlation/src/FusionScanlation.kt @@ -3,12 +3,12 @@ package eu.kanade.tachiyomi.extension.es.fusionscanlation import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit import java.text.SimpleDateFormat import java.util.Locale +import java.util.concurrent.TimeUnit class FusionScanlation : WPMangaReader("Fusion Scanlation", "https://fusionscanlation.com", "es", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("es"))) { - private val rateLimitInterceptor = RateLimitInterceptor(1,2) + private val rateLimitInterceptor = RateLimitInterceptor(1, 2) override val client: OkHttpClient = network.cloudflareClient.newBuilder() .connectTimeout(10, TimeUnit.SECONDS) diff --git a/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt b/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt index 2320f889e..b18e8e1b9 100644 --- a/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt +++ b/multisrc/overrides/wpmangareader/komikmama/src/KomikMama.kt @@ -4,5 +4,7 @@ import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale -class KomikMama : WPMangaReader("KomikMama", "https://komikmama.net", "id", - dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id"))) +class KomikMama : WPMangaReader( + "KomikMama", "https://komikmama.net", "id", + dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale("id")) +) diff --git a/multisrc/overrides/wpmangareader/luminousscans/src/LuminousScans.kt b/multisrc/overrides/wpmangareader/luminousscans/src/LuminousScans.kt index f201323ac..3a0f76705 100644 --- a/multisrc/overrides/wpmangareader/luminousscans/src/LuminousScans.kt +++ b/multisrc/overrides/wpmangareader/luminousscans/src/LuminousScans.kt @@ -1,10 +1,5 @@ -/* ktlint-disable */ -// THIS FILE IS AUTO-GENERATED; DO NOT EDIT package eu.kanade.tachiyomi.extension.en.luminousscans import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader - - - -class LuminousScans : WPMangaReader("Luminous Scans", "https://www.luminousscans.com", "en", mangaUrlDirectory="/series") +class LuminousScans : WPMangaReader("Luminous Scans", "https://www.luminousscans.com", "en", mangaUrlDirectory = "/series") diff --git a/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt b/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt index 2e19d12b2..868a32af0 100644 --- a/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt +++ b/multisrc/overrides/wpmangareader/mangasusu/src/Mangasusu.kt @@ -1,9 +1,7 @@ package eu.kanade.tachiyomi.extension.id.mangasusu -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader - import eu.kanade.tachiyomi.annotations.Nsfw - +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader @Nsfw class Mangasusu : WPMangaReader("Mangasusu", "https://mangasusu.co.in", "id", "/komik") diff --git a/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt b/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt index 850c90306..563ec9a45 100644 --- a/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt +++ b/multisrc/overrides/wpmangareader/patatescans/src/Patatescans.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.fr.patatescans -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader @Nsfw class Patatescans : WPMangaReader("Patatescans", "https://patatescans.com", "fr") diff --git a/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt b/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt index 7beb7ea40..2d6d9aaa7 100644 --- a/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt +++ b/multisrc/overrides/wpmangareader/sekaikomik/src/Sekaikomik.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.sekaikomik -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale diff --git a/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt b/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt index 5fc0f4984..7ed32f486 100644 --- a/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt +++ b/multisrc/overrides/wpmangareader/turktoon/src/TurkToon.kt @@ -4,5 +4,7 @@ import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale -class TurkToon : WPMangaReader("TurkToon", "https://turktoon.com", "tr", - dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("tr"))) +class TurkToon : WPMangaReader( + "TurkToon", "https://turktoon.com", "tr", + dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("tr")) +) diff --git a/multisrc/overrides/wpmangareader/yugenmangas/src/YugenMangas.kt b/multisrc/overrides/wpmangareader/yugenmangas/src/YugenMangas.kt index 69a437922..49c1f544f 100644 --- a/multisrc/overrides/wpmangareader/yugenmangas/src/YugenMangas.kt +++ b/multisrc/overrides/wpmangareader/yugenmangas/src/YugenMangas.kt @@ -1,13 +1,10 @@ -/* ktlint-disable */ -// THIS FILE IS AUTO-GENERATED; DO NOT EDIT package eu.kanade.tachiyomi.extension.es.yugenmangas import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import java.text.SimpleDateFormat import java.util.Locale - - - -class YugenMangas : WPMangaReader("YugenMangas", "https://yugenmangas.com", "es", - dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("es"))) +class YugenMangas : WPMangaReader( + "YugenMangas", "https://yugenmangas.com", "es", + dateFormat = SimpleDateFormat("MMM d, yyyy", Locale("es")) +) diff --git a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt index 31d8354b3..87751a2d8 100644 --- a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt +++ b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt @@ -2,11 +2,10 @@ package eu.kanade.tachiyomi.extension.en.asurascans import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream -import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit -import org.jsoup.nodes.Document import eu.kanade.tachiyomi.source.model.Page - +import okhttp3.OkHttpClient +import org.jsoup.nodes.Document +import java.util.concurrent.TimeUnit class AsuraScans : WPMangaStream("AsuraScans", "https://www.asurascans.com", "en") { diff --git a/multisrc/overrides/wpmangastream/boosei/src/Boosei.kt b/multisrc/overrides/wpmangastream/boosei/src/Boosei.kt index 82539966b..6e65a5000 100644 --- a/multisrc/overrides/wpmangastream/boosei/src/Boosei.kt +++ b/multisrc/overrides/wpmangastream/boosei/src/Boosei.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.boosei -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/gurukomik/src/GURUKomik.kt b/multisrc/overrides/wpmangastream/gurukomik/src/GURUKomik.kt index c731e77a0..07826d38e 100644 --- a/multisrc/overrides/wpmangastream/gurukomik/src/GURUKomik.kt +++ b/multisrc/overrides/wpmangastream/gurukomik/src/GURUKomik.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.extension.id.gurukomik +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream +import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class GURUKomik : WPMangaStream("GURU Komik", "https://gurukomik.com", "id", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("id"))) { private val rateLimitInterceptor = RateLimitInterceptor(4) @@ -15,5 +15,4 @@ class GURUKomik : WPMangaStream("GURU Komik", "https://gurukomik.com", "id", Sim .readTimeout(30, TimeUnit.SECONDS) .addNetworkInterceptor(rateLimitInterceptor) .build() - } diff --git a/multisrc/overrides/wpmangastream/kaisarkomik/src/KaisarKomik.kt b/multisrc/overrides/wpmangastream/kaisarkomik/src/KaisarKomik.kt index ba41edb0a..2ff3035d6 100644 --- a/multisrc/overrides/wpmangastream/kaisarkomik/src/KaisarKomik.kt +++ b/multisrc/overrides/wpmangastream/kaisarkomik/src/KaisarKomik.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.kaisarkomik -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/klankomik/src/KlanKomik.kt b/multisrc/overrides/wpmangastream/klankomik/src/KlanKomik.kt index ad4cff295..18b75a9a1 100644 --- a/multisrc/overrides/wpmangastream/klankomik/src/KlanKomik.kt +++ b/multisrc/overrides/wpmangastream/klankomik/src/KlanKomik.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.klankomik -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/komikav/src/KomikAV.kt b/multisrc/overrides/wpmangastream/komikav/src/KomikAV.kt index f49528f70..8ad55d3c9 100644 --- a/multisrc/overrides/wpmangastream/komikav/src/KomikAV.kt +++ b/multisrc/overrides/wpmangastream/komikav/src/KomikAV.kt @@ -1,14 +1,14 @@ package eu.kanade.tachiyomi.extension.id.komikav +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Page +import okhttp3.OkHttpClient import okhttp3.Request import java.text.SimpleDateFormat import java.util.Locale -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class KomikAV : WPMangaStream( "Komik AV (WP Manga Stream)", diff --git a/multisrc/overrides/wpmangastream/kumascans/src/KumaScans.kt b/multisrc/overrides/wpmangastream/kumascans/src/KumaScans.kt index 5630d2c2f..5f2fba959 100644 --- a/multisrc/overrides/wpmangastream/kumascans/src/KumaScans.kt +++ b/multisrc/overrides/wpmangastream/kumascans/src/KumaScans.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.kumascans -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/liebeschneehiver/src/LiebeSchneeHiver.kt b/multisrc/overrides/wpmangastream/liebeschneehiver/src/LiebeSchneeHiver.kt index 5d8a5bec5..05fc06f60 100644 --- a/multisrc/overrides/wpmangastream/liebeschneehiver/src/LiebeSchneeHiver.kt +++ b/multisrc/overrides/wpmangastream/liebeschneehiver/src/LiebeSchneeHiver.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.extension.tr.liebeschneehiver +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream +import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class LiebeSchneeHiver : WPMangaStream( "Liebe Schnee Hiver", @@ -20,5 +20,4 @@ class LiebeSchneeHiver : WPMangaStream( .readTimeout(30, TimeUnit.SECONDS) .addNetworkInterceptor(rateLimitInterceptor) .build() - } diff --git a/multisrc/overrides/wpmangastream/mangaindonesia/src/MangaIndonesia.kt b/multisrc/overrides/wpmangastream/mangaindonesia/src/MangaIndonesia.kt index 95823ae49..db9c03de0 100644 --- a/multisrc/overrides/wpmangastream/mangaindonesia/src/MangaIndonesia.kt +++ b/multisrc/overrides/wpmangastream/mangaindonesia/src/MangaIndonesia.kt @@ -1,15 +1,15 @@ package eu.kanade.tachiyomi.extension.id.mangaindonesia +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.OkHttpClient import okhttp3.Request import org.jsoup.nodes.Element -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class MangaIndonesia : WPMangaStream("MangaIndonesia", "https://mangaindonesia.net", "id") { private val rateLimitInterceptor = RateLimitInterceptor(4) diff --git a/multisrc/overrides/wpmangastream/mangakyo/src/Mangakyo.kt b/multisrc/overrides/wpmangastream/mangakyo/src/Mangakyo.kt index 1d382b264..154dd0bc9 100644 --- a/multisrc/overrides/wpmangastream/mangakyo/src/Mangakyo.kt +++ b/multisrc/overrides/wpmangastream/mangakyo/src/Mangakyo.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.mangakyo -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/mangaproz/src/MangaProZ.kt b/multisrc/overrides/wpmangastream/mangaproz/src/MangaProZ.kt index 6d45b6ee5..d01e0f30f 100644 --- a/multisrc/overrides/wpmangastream/mangaproz/src/MangaProZ.kt +++ b/multisrc/overrides/wpmangastream/mangaproz/src/MangaProZ.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.extension.ar.mangaproz +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.source.model.SChapter -import org.jsoup.nodes.Element -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor -import java.util.concurrent.TimeUnit import okhttp3.OkHttpClient +import org.jsoup.nodes.Element +import java.util.concurrent.TimeUnit class MangaProZ : WPMangaStream("Manga Pro Z", "https://mangaproz.com", "ar") { private val rateLimitInterceptor = RateLimitInterceptor(4) diff --git a/multisrc/overrides/wpmangastream/mangaraworg/src/MangaRawOrg.kt b/multisrc/overrides/wpmangastream/mangaraworg/src/MangaRawOrg.kt index 06e86916b..e71570aeb 100644 --- a/multisrc/overrides/wpmangastream/mangaraworg/src/MangaRawOrg.kt +++ b/multisrc/overrides/wpmangastream/mangaraworg/src/MangaRawOrg.kt @@ -1,21 +1,21 @@ package eu.kanade.tachiyomi.extension.ja.mangaraworg +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream 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.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import eu.kanade.tachiyomi.network.asObservableSuccess -import eu.kanade.tachiyomi.util.asJsoup import rx.Observable -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class MangaRawOrg : WPMangaStream("Manga Raw.org", "https://mangaraw.org", "ja") { // Formerly "Manga Raw" from WPMangaStream diff --git a/multisrc/overrides/wpmangastream/masterkomik/src/MasterKomik.kt b/multisrc/overrides/wpmangastream/masterkomik/src/MasterKomik.kt index 014567de0..ddf8d757b 100644 --- a/multisrc/overrides/wpmangastream/masterkomik/src/MasterKomik.kt +++ b/multisrc/overrides/wpmangastream/masterkomik/src/MasterKomik.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.id.masterkomik -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt b/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt index 3fe5f1d14..90f18c50a 100644 --- a/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt +++ b/multisrc/overrides/wpmangastream/mihentai/src/Mihentai.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.mihentai -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.annotations.Nsfw +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream @Nsfw class Mihentai : WPMangaStream("Mihentai", "https://mihentai.com", "en") diff --git a/multisrc/overrides/wpmangastream/nonstopscans/src/NonStopScans.kt b/multisrc/overrides/wpmangastream/nonstopscans/src/NonStopScans.kt index b98ae916d..7aa99a2d0 100644 --- a/multisrc/overrides/wpmangastream/nonstopscans/src/NonStopScans.kt +++ b/multisrc/overrides/wpmangastream/nonstopscans/src/NonStopScans.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.nonstopscans -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/rawkuma/src/Rawkuma.kt b/multisrc/overrides/wpmangastream/rawkuma/src/Rawkuma.kt index 72992adb7..7f004f902 100644 --- a/multisrc/overrides/wpmangastream/rawkuma/src/Rawkuma.kt +++ b/multisrc/overrides/wpmangastream/rawkuma/src/Rawkuma.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.ja.rawkuma -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/readkomik/src/ReadKomik.kt b/multisrc/overrides/wpmangastream/readkomik/src/ReadKomik.kt index 364896a5e..2fda1be3a 100644 --- a/multisrc/overrides/wpmangastream/readkomik/src/ReadKomik.kt +++ b/multisrc/overrides/wpmangastream/readkomik/src/ReadKomik.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.extension.en.readkomik -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.util.concurrent.TimeUnit diff --git a/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt b/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt index 8f3aaa9f7..2d90916eb 100644 --- a/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt +++ b/multisrc/overrides/wpmangastream/sektedoujin/src/SekteDoujin.kt @@ -1,12 +1,12 @@ package eu.kanade.tachiyomi.extension.id.sektedoujin -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.annotations.Nsfw -import java.util.concurrent.TimeUnit +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale +import java.util.concurrent.TimeUnit @Nsfw class SekteDoujin : WPMangaStream("Sekte Doujin", "https://sektedoujin.xyz", "id", SimpleDateFormat("MMMM dd, yyyy", Locale.forLanguageTag("id"))) { @@ -18,4 +18,3 @@ class SekteDoujin : WPMangaStream("Sekte Doujin", "https://sektedoujin.xyz", "id .addNetworkInterceptor(rateLimitInterceptor) .build() } - diff --git a/multisrc/overrides/wpmangastream/sheamanga/src/SheaManga.kt b/multisrc/overrides/wpmangastream/sheamanga/src/SheaManga.kt index b79604e84..15ac6f285 100644 --- a/multisrc/overrides/wpmangastream/sheamanga/src/SheaManga.kt +++ b/multisrc/overrides/wpmangastream/sheamanga/src/SheaManga.kt @@ -1,11 +1,11 @@ package eu.kanade.tachiyomi.extension.id.sheamanga +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream +import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient class SheaManga : WPMangaStream( "Shea Manga", diff --git a/multisrc/overrides/wpmangastream/tempestmanga/src/TempestManga.kt b/multisrc/overrides/wpmangastream/tempestmanga/src/TempestManga.kt index 7683fceff..f5e273944 100644 --- a/multisrc/overrides/wpmangastream/tempestmanga/src/TempestManga.kt +++ b/multisrc/overrides/wpmangastream/tempestmanga/src/TempestManga.kt @@ -1,13 +1,14 @@ package eu.kanade.tachiyomi.extension.tr.tempestmanga +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream +import okhttp3.OkHttpClient import java.text.SimpleDateFormat import java.util.Locale -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import java.util.concurrent.TimeUnit -import okhttp3.OkHttpClient -class TempestManga : WPMangaStream("Tempest Manga", "https://manga.tempestfansub.com", "tr", +class TempestManga : WPMangaStream( + "Tempest Manga", "https://manga.tempestfansub.com", "tr", SimpleDateFormat("MMMM dd, yyyy", Locale("tr")) ) { private val rateLimitInterceptor = RateLimitInterceptor(4) @@ -17,5 +18,4 @@ class TempestManga : WPMangaStream("Tempest Manga", "https://manga.tempestfansub .readTimeout(30, TimeUnit.SECONDS) .addNetworkInterceptor(rateLimitInterceptor) .build() - } diff --git a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt index b5b98cdfd..ebca0beed 100644 --- a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt +++ b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt @@ -1,12 +1,11 @@ package eu.kanade.tachiyomi.extension.id.westmanga +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream import eu.kanade.tachiyomi.source.model.SManga -import org.jsoup.nodes.Document -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor -import java.util.concurrent.TimeUnit import okhttp3.OkHttpClient - +import org.jsoup.nodes.Document +import java.util.concurrent.TimeUnit class WestManga : WPMangaStream("West Manga", "https://westmanga.info", "id") { // Formerly "West Manga (WP Manga Stream)" @@ -38,7 +37,7 @@ class WestManga : WPMangaStream("West Manga", "https://westmanga.info", "id") { // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isBlank().not() && it !="N/A" && it != "-") { + if (it.isBlank().not() && it != "N/A" && it != "-") { description = when { description.isNullOrBlank() -> altName + it else -> description + "\n\n$altName" + it diff --git a/multisrc/overrides/wpmangastream/xcalibrscans/src/xCaliBRScans.kt b/multisrc/overrides/wpmangastream/xcalibrscans/src/xCaliBRScans.kt index 5ced48d89..790fba3b1 100644 --- a/multisrc/overrides/wpmangastream/xcalibrscans/src/xCaliBRScans.kt +++ b/multisrc/overrides/wpmangastream/xcalibrscans/src/xCaliBRScans.kt @@ -2,9 +2,7 @@ package eu.kanade.tachiyomi.extension.en.xcalibrscans import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream -import eu.kanade.tachiyomi.source.model.Page import okhttp3.OkHttpClient -import org.jsoup.nodes.Document import java.util.concurrent.TimeUnit class xCaliBRScans : WPMangaStream("xCaliBR Scans", "https://xcalibrscans.com", "en") { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt index 000d8d8e6..762bab18b 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt @@ -313,7 +313,6 @@ abstract class FMReader( } } - override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") private class TextField(name: String, val key: String) : Filter.Text(name) @@ -471,5 +470,4 @@ abstract class FMReader( Genre("Western"), Genre("Zombies") ) - } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt index 444f73d76..58497529f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReaderGenerator.kt @@ -26,8 +26,8 @@ class FMReaderGenerator : ThemeSourceGenerator { SingleLang("Say Truyen", "https://saytruyen.net", "vi", overrideVersionCode = 1), SingleLang("KSGroupScans", "https://ksgroupscans.com", "en"), // Sites that went down - //SingleLang("18LHPlus", "https://18lhplus.com", "en", className = "EighteenLHPlus"), - //SingleLang("HanaScan (RawQQ)", "https://hanascan.com", "ja", className = "HanaScanRawQQ"), + // SingleLang("18LHPlus", "https://18lhplus.com", "en", className = "EighteenLHPlus"), + // SingleLang("HanaScan (RawQQ)", "https://hanascan.com", "ja", className = "HanaScanRawQQ"), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt index f5c230518..c17f6dd97 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlide.kt @@ -1,10 +1,8 @@ package eu.kanade.tachiyomi.multisrc.foolslide import android.app.Application -import android.os.Build import androidx.preference.CheckBoxPreference import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.POST import eu.kanade.tachiyomi.source.ConfigurableSource diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt index 0495a12ac..1e36165d2 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/foolslide/FoolSlideGenerator.kt @@ -21,7 +21,7 @@ class FoolSlideGenerator : ThemeSourceGenerator { SingleLang("Evil Flowers", "https://reader.evilflowers.com", "en"), SingleLang("Русификация", "https://rusmanga.ru", "ru", className = "Russification"), SingleLang("PowerManga", "https://reader.powermanga.org", "it", className = "PowerMangaIT"), - MultiLang("FoolSlide Customizable", "", listOf("other")), + MultiLang("FoolSlide Customizable", "", listOf("other")), SingleLang("Menudo-Fansub", "https://www.menudo-fansub.com", "es", className = "MenudoFansub", overrideVersionCode = 1), SingleLang("Sense-Scans", "https://sensescans.com", "en", className = "SenseScans", overrideVersionCode = 1), SingleLang("Kirei Cake", "https://reader.kireicake.com", "en"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt index 7f1f08fbb..80be9ec34 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/gattsu/GattsuGenerator.kt @@ -12,8 +12,8 @@ class GattsuGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - SingleLang("Hentai Kai", "https://hentaikai.com", "pt-BR", isNsfw = true), - SingleLang("Hentai Season", "https://hentaiseason.com", "pt-BR", isNsfw = true), + SingleLang("Hentai Kai", "https://hentaikai.com", "pt-BR", isNsfw = true), + SingleLang("Hentai Season", "https://hentaiseason.com", "pt-BR", isNsfw = true), SingleLang("Universo Hentai", "https://universohentai.com", "pt-BR", isNsfw = true) ) @@ -24,4 +24,3 @@ class GattsuGenerator : ThemeSourceGenerator { } } } - diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/Genkan.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/Genkan.kt index 92a32b8ef..c9884e9be 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/Genkan.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/Genkan.kt @@ -8,15 +8,14 @@ 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 java.text.SimpleDateFormat -import java.util.Calendar -import java.util.Locale import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import org.jsoup.select.Elements +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Locale open class Genkan( override val name: String, diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanGenerator.kt index e3d8b6274..a7035bfb5 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanGenerator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.multisrc.genkan -import generator.ThemeSourceData.MultiLang import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt index 54b2a2293..ebdaf7259 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/guya/GuyaGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.guya -import generator.ThemeSourceData.SingleLang import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator class GuyaGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt index 4b0291000..315a23681 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt @@ -50,7 +50,7 @@ abstract class Luscious( private val lusLang: String = toLusLang(lang) - private fun toLusLang (lang: String): String { + private fun toLusLang(lang: String): String { return when (lang) { "all" -> FILTER_VALUE_IGNORE "en" -> "1" @@ -71,7 +71,6 @@ abstract class Luscious( Injekt.get().getSharedPreferences("source_$id", 0x0000) } - // Common private fun buildAlbumListRequestInput(page: Int, filters: FilterList, query: String = ""): JsonObject { @@ -119,7 +118,7 @@ abstract class Luscious( add(this.toJsonObject("audience_ids")) } - if (lusLang != FILTER_VALUE_IGNORE){ + if (lusLang != FILTER_VALUE_IGNORE) { add( languagesFilter.toJsonObject("language_ids").apply { set("value", "+$lusLang${get("value").asString}") @@ -234,12 +233,12 @@ abstract class Luscious( private fun parseAlbumPicturesResponse(response: Response, mangaUrl: String): List { val chapters = mutableListOf() - when (getMergeChapterPref()){ + when (getMergeChapterPref()) { true -> { val chapter = SChapter.create() chapter.url = mangaUrl chapter.name = "Merged Chapter" - //chapter.date_upload = it["created"].asLong // not parsing correctly for some reason + // chapter.date_upload = it["created"].asLong // not parsing correctly for some reason chapter.chapter_number = 1F chapters.add(chapter) } @@ -258,7 +257,7 @@ abstract class Luscious( nextPage = data["info"]["has_next_page"].asBoolean data["items"].asJsonArray.map { val chapter = SChapter.create() - chapter.url = when (getResolutionPref()){ + chapter.url = when (getResolutionPref()) { "-1" -> it["url_to_original"].asString else -> it["thumbnails"][getResolutionPref()?.toInt()!!]["url"].asString } @@ -275,7 +274,6 @@ abstract class Luscious( page++ } } - } return chapters.reversed() @@ -333,12 +331,11 @@ abstract class Luscious( nextPage = data["info"]["has_next_page"].asBoolean data["items"].asJsonArray.map { val index = it["position"].asInt - val url = when (getResolutionPref()){ + val url = when (getResolutionPref()) { "-1" -> it["url_to_original"].asString else -> it["thumbnails"][getResolutionPref()?.toInt()!!]["url"].asString } - pages.add(Page(index, url, url)) } if (nextPage) { @@ -364,7 +361,6 @@ abstract class Luscious( Observable.just(listOf(Page(0, chapter.url, chapter.url))) } } - } override fun pageListParse(response: Response): List = throw UnsupportedOperationException("Not used") @@ -382,11 +378,10 @@ abstract class Luscious( val data = gson.fromJson(it.body!!.string()).let { data -> data["data"]["picture"]["list"].asJsonObject } - when (getResolutionPref()){ + when (getResolutionPref()) { "-1" -> data["items"].asJsonArray[page.index % 50].asJsonObject["url_to_original"].asString else -> data["items"].asJsonArray[page.index % 50].asJsonObject["thumbnails"][getResolutionPref()?.toInt()!!]["url"].asString } - } } @@ -424,7 +419,7 @@ abstract class Luscious( } for ((i, _) in this["tags"].asJsonArray.withIndex()) { genreList = "$genreList, ${this["tags"][i]["text"].asString}" - if (this["tags"][i]["text"].asString.contains("Artist:")){ + if (this["tags"][i]["text"].asString.contains("Artist:")) { manga.artist = this["tags"][i]["text"].asString.substringAfter(":").trim() manga.author = manga.artist } @@ -457,7 +452,7 @@ abstract class Luscious( ) override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { - return if (query.startsWith("ID:")){ + return if (query.startsWith("ID:")) { val id = query.substringAfterLast("ID:") client.newCall(buildAlbumInfoRequest(id)) .asObservableSuccess() @@ -540,7 +535,6 @@ abstract class Luscious( FavoriteTextFilters(), ) - private fun getSortFilters(): List { val sortOptions = mutableListOf() listOf( @@ -662,7 +656,6 @@ abstract class Luscious( CheckboxFilterOption("Thai", toLusLang("th"), false) ).filterNot { it.value == lusLang } - private fun getGenreFilters() = listOf( TriStateFilterOption("3D / Digital Art", "25"), TriStateFilterOption("Amateurs", "20"), @@ -724,12 +717,12 @@ abstract class Luscious( private inline fun Iterable<*>.findInstance() = find { it is T } as? T - private fun validYears(): List{ + private fun validYears(): List { val years = mutableListOf() val current = Calendar.getInstance() val currentYear = current.get(Calendar.YEAR) var firstYear = 2013 - while (currentYear != firstYear -1) { + while (currentYear != firstYear - 1) { years.add(firstYear) firstYear++ } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt index 15b850d36..4c70ef38e 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.multisrc.luscious import generator.ThemeSourceData.MultiLang -import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator class LusciousGenerator : ThemeSourceGenerator { @@ -14,7 +13,7 @@ class LusciousGenerator : ThemeSourceGenerator { override val sources = listOf( MultiLang("Luscious", "https://www.luscious.net", listOf("en", "ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt-BR", "th", "all"), isNsfw = true, className = "LusciousFactory", overrideVersionCode = 2), - MultiLang("Luscious (Members)", "https://members.luscious.net", listOf("en", "ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt-BR", "th", "all"), isNsfw = true, className = "LusciousMembersFactory", pkgName = "lusciousmembers"),//Requires Account + MultiLang("Luscious (Members)", "https://members.luscious.net", listOf("en", "ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt-BR", "th", "all"), isNsfw = true, className = "LusciousMembersFactory", pkgName = "lusciousmembers"), // Requires Account MultiLang("Luscious (API)", "https://api.luscious.net", listOf("en", "ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt-BR", "th", "all"), isNsfw = true, className = "LusciousAPIFactory", pkgName = "lusciousapi") ) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index df7dd9131..8c7ec1bbb 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -478,7 +478,7 @@ abstract class Madara( // Added "title" alternative chapter.date_upload = select("img").firstOrNull()?.attr("alt")?.let { parseRelativeDate(it) } ?: select("span a").firstOrNull()?.attr("title")?.let { parseRelativeDate(it) } - ?: parseChapterDate(select("span.chapter-release-date i").firstOrNull()?.text()) + ?: parseChapterDate(select("span.chapter-release-date i").firstOrNull()?.text()) } return chapter 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 4eda58802..41436037a 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 @@ -14,7 +14,7 @@ class MadaraGenerator : ThemeSourceGenerator { override val sources = listOf( MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 6), - MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all") , isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1), + MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all"), isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1), MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc"), SingleLang("1st Kiss Manga.love", "https://1stkissmanga.love", "en", className = "FirstKissMangaLove"), SingleLang("1st Kiss", "https://1stkissmanga.com", "en", className = "FirstKissManga", pkgName = "firstkissmanga", overrideVersionCode = 5), @@ -129,7 +129,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Kami Sama Explorer", "https://kamisama.com.br", "pt-BR"), SingleLang("KawaScans", "https://kawascans.com", "en"), SingleLang("KisekiManga", "https://kisekimanga.com", "en", overrideVersionCode = 1), - SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className= "KissmangaIn", overrideVersionCode = 2), + SingleLang("Kissmanga.in", "https://kissmanga.in", "en", className = "KissmangaIn", overrideVersionCode = 2), SingleLang("KlikManga", "https://klikmanga.com", "id", overrideVersionCode = 1), SingleLang("Kokomanga", "https://kokomanga.com", "en"), SingleLang("Kun Manga", "https://kunmanga.com", "en", overrideVersionCode = 1), @@ -239,7 +239,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("MangaYami", "https://www.mangayami.club", "en", overrideVersionCode = 2), SingleLang("Mangaka3rb", "https://mangaka3rb.com", "ar"), SingleLang("Mangakik", "https://mangakik.com", "en"), - SingleLang("Mangas Origines", "https://mangas-origines.fr", "fr" , true, overrideVersionCode = 1), + SingleLang("Mangas Origines", "https://mangas-origines.fr", "fr", true, overrideVersionCode = 1), SingleLang("Mangasushi", "https://mangasushi.net", "en", overrideVersionCode = 1), SingleLang("Mangauptocats", "https://mangauptocats.online", "th", overrideVersionCode = 1), SingleLang("Mangazuki.me", "https://mangazuki.me", "en", className = "MangazukiMe", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt index 3de566730..4b3c9a0bd 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraUrlActivity.kt @@ -5,20 +5,18 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle import android.util.Log -import eu.kanade.tachiyomi.multisrc.madara.Madara import kotlin.system.exitProcess -class MadaraUrlActivity: Activity() { +class MadaraUrlActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val pathSegments = intent?.data?.pathSegments if (pathSegments != null && pathSegments.size >= 2) { - val mainIntent = Intent().apply { action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query","${getSLUG(pathSegments)}") + putExtra("query", "${getSLUG(pathSegments)}") putExtra("filter", packageName) } try { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt index 20bdeabac..3f94bec97 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalog.kt @@ -3,15 +3,14 @@ package eu.kanade.tachiyomi.multisrc.mangacatalog import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage +import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga -import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.online.ParsedHttpSource import okhttp3.Request -import rx.Observable import org.jsoup.nodes.Document import org.jsoup.nodes.Element - +import rx.Observable // Based On the original manga maniac source // MangaCatalog is a network of sites for single franshise sites @@ -91,7 +90,7 @@ abstract class MangaCatalog( override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { val name1 = element.select(".col-span-3 > a").text() val name2 = element.select(".text-xs:not(a)").text() - if (name2 == ""){ + if (name2 == "") { name = name1 } else { name = "$name1 - $name2" diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt index af31485d8..7bdbc0945 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangacatalog/MangaCatalogGenerator.kt @@ -13,7 +13,7 @@ class MangaCatalogGenerator : ThemeSourceGenerator { override val sources = listOf( SingleLang("Read Boku no Hero Academia My Hero Academia Manga", "https://ww6.readmha.com", "en", className = "ReadBokuNoHeroAcademiaMyHeroAcademiaManga", overrideVersionCode = 2), - SingleLang("Read One-Punch Man Manga Online", "https://ww3.readopm.com", "en", className = "ReadOnePunchManMangaOnlineTwo", pkgName = "readonepunchmanmangaonlinetwo", overrideVersionCode = 1), //exact same name as the one in mangamainac extension + SingleLang("Read One-Punch Man Manga Online", "https://ww3.readopm.com", "en", className = "ReadOnePunchManMangaOnlineTwo", pkgName = "readonepunchmanmangaonlinetwo", overrideVersionCode = 1), // exact same name as the one in mangamainac extension SingleLang("Read Tokyo Ghoul Re & Tokyo Ghoul Manga Online", "https://ww8.tokyoghoulre.com", "en", className = "ReadTokyoGhoulReTokyoGhoulMangaOnline", overrideVersionCode = 1), SingleLang("Read Nanatsu no Taizai 7 Deadly Sins Manga Online", "https://ww3.read7deadlysins.com", "en", className = "ReadNanatsuNoTaizai7DeadlySinsMangaOnline", overrideVersionCode = 2), SingleLang("Read Kaguya-sama Manga Online", "https://ww1.readkaguyasama.com", "en", className = "ReadKaguyaSamaMangaOnline", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt index fcecf337d..788d984c8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventure.kt @@ -107,33 +107,38 @@ abstract class MangAdventure( override fun latestUpdatesParse(response: Response) = json.parseToJsonElement(response.body!!.string()).run { - MangasPage(jsonArray.map { - val obj = it.jsonObject - SManga.create().apply { - url = obj["url"]!!.jsonPrimitive.content - title = obj["title"]!!.jsonPrimitive.content - thumbnail_url = obj["cover"]!!.jsonPrimitive.content - // A bit of a hack to sort by date - val latest = obj["latest_chapter"]!!.jsonObject - description = httpDateToTimestamp( - latest["date"]!!.jsonPrimitive.content - ).toString() - } - }.sortedByDescending(SManga::description), false) + MangasPage( + jsonArray.map { + val obj = it.jsonObject + SManga.create().apply { + url = obj["url"]!!.jsonPrimitive.content + title = obj["title"]!!.jsonPrimitive.content + thumbnail_url = obj["cover"]!!.jsonPrimitive.content + // A bit of a hack to sort by date + val latest = obj["latest_chapter"]!!.jsonObject + description = httpDateToTimestamp( + latest["date"]!!.jsonPrimitive.content + ).toString() + } + }.sortedByDescending(SManga::description), + false + ) } override fun chapterListParse(response: Response) = json.parseToJsonElement(response.body!!.string()) .jsonObject["volumes"]!!.jsonObject.entries.flatMap { vol -> - vol.value.jsonObject.entries.map { ch -> - SChapter.create().fromJSON(JsonObject( + vol.value.jsonObject.entries.map { ch -> + SChapter.create().fromJSON( + JsonObject( ch.value.jsonObject.toMutableMap().also { it["volume"] = JsonPrimitive(vol.key) it["chapter"] = JsonPrimitive(ch.key) } - )) - } + ) + ) } + } override fun mangaDetailsParse(response: Response) = SManga.create().fromJSON( @@ -151,14 +156,17 @@ abstract class MangAdventure( override fun searchMangaParse(response: Response) = json.parseToJsonElement(response.body!!.string()).run { - MangasPage(jsonArray.map { - val obj = it.jsonObject - SManga.create().apply { - url = obj["url"]!!.jsonPrimitive.content - title = obj["title"]!!.jsonPrimitive.content - thumbnail_url = obj["cover"]!!.jsonPrimitive.content - } - }.sortedBy(SManga::title), false) + MangasPage( + jsonArray.map { + val obj = it.jsonObject + SManga.create().apply { + url = obj["url"]!!.jsonPrimitive.content + title = obj["title"]!!.jsonPrimitive.content + thumbnail_url = obj["cover"]!!.jsonPrimitive.content + } + }.sortedBy(SManga::title), + false + ) } override fun getFilterList() = diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainac.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainac.kt index af7082b13..d9097cc82 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainac.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainac.kt @@ -14,7 +14,6 @@ import org.jsoup.nodes.Document import org.jsoup.nodes.Element import java.util.Calendar - // Based On TCBScans sources // MangaManiac is a network of sites built by Animemaniac.co. @@ -36,7 +35,7 @@ abstract class MangaMainac( override fun popularMangaFromElement(element: Element): SManga { val manga = SManga.create() manga.thumbnail_url = element.select(".mangainfo_body > img").attr("src") - manga.url = "" //element.select("#primary-menu .menu-item:first-child").attr("href") + manga.url = "" // element.select("#primary-menu .menu-item:first-child").attr("href") manga.title = element.select(".intro_content h2").text() return manga } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainacGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainacGenerator.kt index a1e9ef658..14b3d940c 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainacGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangamainac/MangaMainacGenerator.kt @@ -25,12 +25,12 @@ class MangaMainacGenerator : ThemeSourceGenerator { SingleLang("Read Shingeki no Kyojin Manga", "https://readshingekinokyojin.com/", "en"), SingleLang("Read Nanatsu no Taizai Manga", "https://w1.readnanatsutaizai.net/", "en"), SingleLang("Read Rent a Girlfriend Manga", "https://kanojo-okarishimasu.com/", "en"), - //Sites that are currently down from my end, should be rechecked by some one else at some point + // Sites that are currently down from my end, should be rechecked by some one else at some point // - //SingleLang("", "https://5-toubunnohanayome.net/", "en"), //Down at time of creating this generator - //SingleLang("", "http://beastars.net/", "en"), //Down at time of creating this generator - //SingleLang("", "https://neverlandmanga.net/", "en"), //Down at time of creating this generator - //SingleLang("", "https://ww1.readhunterxhunter.net/", "en"), //Down at time of creating this generator + // SingleLang("", "https://5-toubunnohanayome.net/", "en"), //Down at time of creating this generator + // SingleLang("", "http://beastars.net/", "en"), //Down at time of creating this generator + // SingleLang("", "https://neverlandmanga.net/", "en"), //Down at time of creating this generator + // SingleLang("", "https://ww1.readhunterxhunter.net/", "en"), //Down at time of creating this generator ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasar/MangaSarGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasar/MangaSarGenerator.kt index b2aa25992..5d6f6312e 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasar/MangaSarGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangasar/MangaSarGenerator.kt @@ -12,8 +12,8 @@ class MangaSarGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 4 override val sources = listOf( - SingleLang("MangaTube", "https://mangatube.site", "pt-BR"), - SingleLang("Meus Mangás", "https://meusmangas.net", "pt-BR", isNsfw = true, className = "MeusMangas") + SingleLang("MangaTube", "https://mangatube.site", "pt-BR"), + SingleLang("Meus Mangás", "https://meusmangas.net", "pt-BR", isNsfw = true, className = "MeusMangas") ) companion object { @@ -23,4 +23,3 @@ class MangaSarGenerator : ThemeSourceGenerator { } } } - diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt index 154fccd87..04ed227f7 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSGenerator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.multisrc.mmrcms -import generator.ThemeSourceData import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSJsonGen.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSJsonGen.kt index 4409a3bc6..ab219ace9 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSJsonGen.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSJsonGen.kt @@ -9,7 +9,6 @@ import okhttp3.OkHttpClient import okhttp3.Request import org.jsoup.Jsoup import org.jsoup.nodes.Document -import java.io.File import java.io.PrintWriter import java.security.cert.CertificateException import java.time.ZonedDateTime @@ -27,11 +26,11 @@ import javax.net.ssl.X509TrustManager */ class MMRCMSJsonGen { - //private var preRunTotal: String + // private var preRunTotal: String init { System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3") - //preRunTotal = Regex("""-> (\d+)""").findAll(File(relativePath).readText(Charsets.UTF_8)).last().groupValues[1] + // preRunTotal = Regex("""-> (\d+)""").findAll(File(relativePath).readText(Charsets.UTF_8)).last().groupValues[1] } @TargetApi(Build.VERSION_CODES.O) @@ -101,7 +100,7 @@ class MMRCMSJsonGen { buffer.append(" }\n") buffer.append(" }\n") buffer.append("}\n") - //println("Pre-run sources: $preRunTotal") + // println("Pre-run sources: $preRunTotal") println("Post-run sources: ${number - 1}") val writer = PrintWriter(relativePath) writer.write(buffer.toString()) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSSources.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSSources.kt index 33d77544b..e20490c6d 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSSources.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/MMRCMSSources.kt @@ -68,13 +68,13 @@ class MMRCMSSources { SourceData.Single("Ama Scans", "https://amascan.com", "pt-BR", isNsfw = true, overrideVersionCode = 1), // NOTE: THIS SOURCE CONTAINS A CUSTOM LANGUAGE SYSTEM (which will be ignored)! SourceData.Single("HentaiShark", "https://www.hentaishark.com", "all", isNsfw = true), - //MultiLang("HentaiShark", "https://www.hentaishark.com", listOf("en", "ja", "zh", "de", "nl", "ko", "cz", "eo", "mn", "ar", "sk", "la", "ua", "ceb", "tl", "fi", "bg", "tr"), isNsfw = true, className = "HentaiSharkFactory"), + // MultiLang("HentaiShark", "https://www.hentaishark.com", listOf("en", "ja", "zh", "de", "nl", "ko", "cz", "eo", "mn", "ar", "sk", "la", "ua", "ceb", "tl", "fi", "bg", "tr"), isNsfw = true, className = "HentaiSharkFactory"), ) } } -//SingleLang("Mangás Yuri", "https://mangasyuri.net", "pt-BR", className = "MangasYuri"), override val id: Long = 6456162511058446409 -//SingleLang("FR Scan", "https://www.frscan.me", "fr"), +// SingleLang("Mangás Yuri", "https://mangasyuri.net", "pt-BR", className = "MangasYuri"), override val id: Long = 6456162511058446409 +// SingleLang("FR Scan", "https://www.frscan.me", "fr"), // Reference from old Factory Source // Changed CMS // SourceData("es", "Tumangaonline.co", "http://tumangaonline.com"), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/SourceData.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/SourceData.kt index 252d8ae7a..7bf3be163 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/SourceData.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mmrcms/SourceData.kt @@ -5,7 +5,7 @@ package eu.kanade.tachiyomi.multisrc.mmrcms class SourceData() { companion object { - fun giveMetaData(url:String): String{ + fun giveMetaData(url: String): String { return when (url) { "https://onma.me" -> """{"name":"مانجا اون لاين","base_url":"https://onma.me","supports_latest":true,"item_url":"https://onma.me/manga/","categories":[{"id":"1","name":"أكشن"},{"id":"2","name":"مغامرة"},{"id":"3","name":"كوميدي"},{"id":"4","name":"شياطين"},{"id":"5","name":"دراما"},{"id":"6","name":"إيتشي"},{"id":"7","name":"خيال"},{"id":"8","name":"انحراف جنسي"},{"id":"9","name":"حريم"},{"id":"10","name":"تاريخي"},{"id":"11","name":"رعب"},{"id":"12","name":"جوسي"},{"id":"13","name":"فنون قتالية"},{"id":"14","name":"ناضج"},{"id":"15","name":"ميكا"},{"id":"16","name":"غموض"},{"id":"17","name":"وان شوت"},{"id":"18","name":"نفسي"},{"id":"19","name":"رومنسي"},{"id":"20","name":"حياة مدرسية"},{"id":"21","name":"خيال علمي"},{"id":"22","name":"سينين"},{"id":"23","name":"شوجو"},{"id":"24","name":"شوجو أي"},{"id":"25","name":"شونين"},{"id":"26","name":"شونين أي"},{"id":"27","name":"شريحة من الحياة"},{"id":"28","name":"رياضة"},{"id":"29","name":"خارق للطبيعة"},{"id":"30","name":"مأساة"},{"id":"31","name":"مصاصي الدماء"},{"id":"32","name":"سحر"},{"id":"33","name":"ويب تون"},{"id":"34","name":"دوجينشي"}],"tags":"null"}""" "https://readcomicsonline.ru" -> """{"name":"Read Comics Online","base_url":"https://readcomicsonline.ru","supports_latest":true,"item_url":"https://readcomicsonline.ru/comic/","categories":[{"id":"1","name":"One Shots \u0026 TPBs"},{"id":"2","name":"DC Comics"},{"id":"3","name":"Marvel Comics"},{"id":"4","name":"Boom Studios"},{"id":"5","name":"Dynamite"},{"id":"6","name":"Rebellion"},{"id":"7","name":"Dark Horse"},{"id":"8","name":"IDW"},{"id":"9","name":"Archie"},{"id":"10","name":"Graphic India"},{"id":"11","name":"Darby Pop"},{"id":"12","name":"Oni Press"},{"id":"13","name":"Icon Comics"},{"id":"14","name":"United Plankton"},{"id":"15","name":"Udon"},{"id":"16","name":"Image Comics"},{"id":"17","name":"Valiant"},{"id":"18","name":"Vertigo"},{"id":"19","name":"Devils Due"},{"id":"20","name":"Aftershock Comics"},{"id":"21","name":"Antartic Press"},{"id":"22","name":"Action Lab"},{"id":"23","name":"American Mythology"},{"id":"24","name":"Zenescope"},{"id":"25","name":"Top Cow"},{"id":"26","name":"Hermes Press"},{"id":"27","name":"451"},{"id":"28","name":"Black Mask"},{"id":"29","name":"Chapterhouse Comics"},{"id":"30","name":"Red 5"},{"id":"31","name":"Heavy Metal"},{"id":"32","name":"Bongo"},{"id":"33","name":"Top Shelf"},{"id":"34","name":"Bubble"},{"id":"35","name":"Boundless"},{"id":"36","name":"Avatar Press"},{"id":"37","name":"Space Goat Productions"},{"id":"38","name":"BroadSword Comics"},{"id":"39","name":"AAM-Markosia"},{"id":"40","name":"Fantagraphics"},{"id":"41","name":"Aspen"},{"id":"42","name":"American Gothic Press"},{"id":"43","name":"Vault"},{"id":"44","name":"215 Ink"},{"id":"45","name":"Abstract Studio"},{"id":"46","name":"Albatross"},{"id":"47","name":"ARH Comix"},{"id":"48","name":"Legendary Comics"},{"id":"49","name":"Monkeybrain"},{"id":"50","name":"Joe Books"},{"id":"51","name":"MAD"},{"id":"52","name":"Comics Experience"},{"id":"53","name":"Alterna Comics"},{"id":"54","name":"Lion Forge"},{"id":"55","name":"Benitez"},{"id":"56","name":"Storm King"},{"id":"57","name":"Sucker"},{"id":"58","name":"Amryl Entertainment"},{"id":"59","name":"Ahoy Comics"},{"id":"60","name":"Mad Cave"},{"id":"61","name":"Coffin Comics"},{"id":"62","name":"Magnetic Press"},{"id":"63","name":"Ablaze"},{"id":"64","name":"Europe Comics"},{"id":"65","name":"Humanoids"},{"id":"66","name":"TKO"},{"id":"67","name":"Soleil"},{"id":"68","name":"SAF Comics"},{"id":"69","name":"Scholastic"},{"id":"70","name":"Upshot"},{"id":"71","name":"Stranger Comics"},{"id":"72","name":"Inverse"},{"id":"73","name":"Virus"}],"tags":"null"}""" diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt index 966184617..3b24acc72 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNep.kt @@ -145,10 +145,10 @@ abstract class NepNep( .filter { // Comparing query with display name it.getString("s")!!.contains(trimmedQuery, ignoreCase = true) or - // Comparing query with list of alternate names - it.getArray("al").any { altName -> - altName.jsonPrimitive.content.contains(trimmedQuery, ignoreCase = true) - } + // Comparing query with list of alternate names + it.getArray("al").any { altName -> + altName.jsonPrimitive.content.contains(trimmedQuery, ignoreCase = true) + } } val genres = mutableListOf() @@ -309,13 +309,13 @@ abstract class NepNep( val pageTotal = curChapter.getString("Page")!!.toInt() val host = "https://" + - script - .substringAfter("vm.CurPathName = \"", "") - .substringBefore("\"") - .also { - if (it.isEmpty()) - throw Exception("$name is overloaded and blocking Tachiyomi right now. Wait for unblock.") - } + script + .substringAfter("vm.CurPathName = \"", "") + .substringBefore("\"") + .also { + if (it.isEmpty()) + throw Exception("$name is overloaded and blocking Tachiyomi right now. Wait for unblock.") + } val titleURI = script.substringAfter("vm.IndexName = \"").substringBefore("\"") val seasonURI = curChapter.getString("Directory")!! .let { if (it.isEmpty()) "" else "$it/" } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt index e9c56146d..4ede207db 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiGenerator.kt @@ -12,22 +12,22 @@ class NyaHentaiGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 2 override val sources = listOf( - MultiLang("NyaHentai", "https://nyahentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFactory", overrideVersionCode = 3), - MultiLang("NyaHentai.site", "https://nyahentai.site", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiSiteFactory", pkgName = "nyahentaisite"), - MultiLang("NyaHentai.me", "https://ja.nyahentai.me", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiMeFactory", pkgName = "nyahentaime"), - MultiLang("NyaHentai.fun", "https://nyahentai.fun", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFunFactory", pkgName = "nyahentaifun"), - MultiLang("NyaHentai.club", "https://nyahentai.club", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiClubFactory", pkgName = "nyahentaiclub"), - MultiLang("NyaHentai2.com", "https://nyahentai2.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiTwoComFactory", pkgName = "nyahentaitwocom"), - MultiLang("NyaHentai.co", "https://nyahentai.co", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiCoFactory", pkgName = "nyahentaico"), - MultiLang("NyaHentai3.com", "https://nyahentai3.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "NyaHentaiThreeComFactory", pkgName = "nyahentaithreecom"), - MultiLang("CatHentai", "https://cathentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "CatHentaiFactory"), - MultiLang("DogHentai", "https://zhb.doghentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "DogHentaiFactory"), - MultiLang("BugHentai (ja)", "https://ja.bughentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "BugHentaiJaFactory", pkgName = "bughentaija"), - MultiLang("BugHentai (en)", "https://en.bughentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "BugHentaiEnFactory", pkgName = "bughentaien"), - MultiLang("QQHentai", "https://zhb.qqhentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "QQHentaiFactory"), - MultiLang("FoxHentai", "https://ja.foxhentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "FoxHentaiFactory"), - MultiLang("DDHentai", "https://zh.ddhentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "DDHentaiFactory"), - MultiLang("DDHentai A", "https://zha.ddhentai.com", listOf("en","ja", "zh", "all"), isNsfw = true, className = "DDHentaiAFactory"), + MultiLang("NyaHentai", "https://nyahentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFactory", overrideVersionCode = 3), + MultiLang("NyaHentai.site", "https://nyahentai.site", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiSiteFactory", pkgName = "nyahentaisite"), + MultiLang("NyaHentai.me", "https://ja.nyahentai.me", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiMeFactory", pkgName = "nyahentaime"), + MultiLang("NyaHentai.fun", "https://nyahentai.fun", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiFunFactory", pkgName = "nyahentaifun"), + MultiLang("NyaHentai.club", "https://nyahentai.club", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiClubFactory", pkgName = "nyahentaiclub"), + MultiLang("NyaHentai2.com", "https://nyahentai2.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiTwoComFactory", pkgName = "nyahentaitwocom"), + MultiLang("NyaHentai.co", "https://nyahentai.co", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiCoFactory", pkgName = "nyahentaico"), + MultiLang("NyaHentai3.com", "https://nyahentai3.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "NyaHentaiThreeComFactory", pkgName = "nyahentaithreecom"), + MultiLang("CatHentai", "https://cathentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "CatHentaiFactory"), + MultiLang("DogHentai", "https://zhb.doghentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DogHentaiFactory"), + MultiLang("BugHentai (ja)", "https://ja.bughentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "BugHentaiJaFactory", pkgName = "bughentaija"), + MultiLang("BugHentai (en)", "https://en.bughentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "BugHentaiEnFactory", pkgName = "bughentaien"), + MultiLang("QQHentai", "https://zhb.qqhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "QQHentaiFactory"), + MultiLang("FoxHentai", "https://ja.foxhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "FoxHentaiFactory"), + MultiLang("DDHentai", "https://zh.ddhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DDHentaiFactory"), + MultiLang("DDHentai A", "https://zha.ddhentai.com", listOf("en", "ja", "zh", "all"), isNsfw = true, className = "DDHentaiAFactory"), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt index dc5647a80..379a4b16e 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nyahentai/NyaHentaiUrlActivity.kt @@ -5,7 +5,6 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle import android.util.Log -import eu.kanade.tachiyomi.multisrc.nyahentai.NyaHentai import kotlin.system.exitProcess /** 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 fb881a040..6672ea06e 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") // 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") // 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/paprika/PaprikaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt index 3eb3482d4..fec2a4be1 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/paprika/PaprikaGenerator.kt @@ -12,13 +12,13 @@ class PaprikaGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - SingleLang("MangaStream.xyz", "http://mangastream.xyz", "en", className = "MangaStreamXYZ"), - SingleLang("ReadMangaFox", "http://readmangafox.xyz", "en"), + SingleLang("MangaStream.xyz", "http://mangastream.xyz", "en", className = "MangaStreamXYZ"), + SingleLang("ReadMangaFox", "http://readmangafox.xyz", "en"), // SingleLang("MangaZuki.xyz", "http://mangazuki.xyz", "en", className = "MangaZuki"), // SingleLang("MangaTensei", "http://www.mangatensei.com", "en"), - SingleLang("MangaNelos.com", "http://manganelos.com", "en", className = "MangaNelosCom"), - SingleLang("MangaDogs.fun", "http://mangadogs.fun", "en", className = "MangaDogsFun"), - SingleLang("MangaHere.today", "http://mangahere.today", "en", className = "MangaHereToday"), + SingleLang("MangaNelos.com", "http://manganelos.com", "en", className = "MangaNelosCom"), + SingleLang("MangaDogs.fun", "http://mangadogs.fun", "en", className = "MangaDogsFun"), + SingleLang("MangaHere.today", "http://mangahere.today", "en", className = "MangaHereToday"), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt index 144029a4d..a3113de39 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/pizzareader/PizzaReaderDto.kt @@ -53,4 +53,3 @@ data class PizzaChapterDto( data class PizzaTeamDto( val name: String = "" ) - diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt index d24123d9e..c504b6d64 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.webtoons -import generator.ThemeSourceData.SingleLang import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator class WebtoonsGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt index c2b3b0e81..3ed1dcc19 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/webtoons/WebtoonsTranslateGenerator.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.multisrc.webtoons -import generator.ThemeSourceData.SingleLang import generator.ThemeSourceData.MultiLang import generator.ThemeSourceGenerator @@ -12,7 +11,7 @@ class WebtoonsTranslateGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 2 override val sources = listOf( - MultiLang("Webtoons.com Translations", "https://translate.webtoons.com", listOf("en", "zh-hans", "zh-hant", "th", "id", "fr", "vi", "ru", "ar", "fil", "de", "hi", "it", "ja", "pt-BR", "tr", "ms", "pl", "pt", "bg", "da", "nl", "ro", "mn", "el", "lt", "cs", "sv", "bn", "fa", "uk", "es"), className = "WebtoonsTranslateFactory", pkgName = "webtoonstranslate", overrideVersionCode = 1), + MultiLang("Webtoons.com Translations", "https://translate.webtoons.com", listOf("en", "zh-hans", "zh-hant", "th", "id", "fr", "vi", "ru", "ar", "fil", "de", "hi", "it", "ja", "pt-BR", "tr", "ms", "pl", "pt", "bg", "da", "nl", "ro", "mn", "el", "lt", "cs", "sv", "bn", "fa", "uk", "es"), className = "WebtoonsTranslateFactory", pkgName = "webtoonstranslate", overrideVersionCode = 1), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/weebreader/Weebreader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/weebreader/Weebreader.kt index acc1addc2..63a389fcd 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/weebreader/Weebreader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/weebreader/Weebreader.kt @@ -25,7 +25,7 @@ abstract class Weebreader( override val name: String, override val baseUrl: String, override val lang: String, -): HttpSource() { +) : HttpSource() { override val supportsLatest = true diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt index 74a50aad6..de6408409 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpcomics/WPComicsGenerator.kt @@ -13,11 +13,11 @@ class WPComicsGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - MultiLang("MangaToro", "https://mangatoro.com", listOf("en", "ja")), - SingleLang("NetTruyen", "http://www.nettruyenvip.com", "vi", overrideVersionCode = 4), - SingleLang("NhatTruyen", "http://nhattruyenhay.com", "vi", overrideVersionCode = 4), - SingleLang("TruyenChon", "http://truyenchon.com", "vi", overrideVersionCode = 3), - SingleLang("XOXO Comics", "https://xoxocomics.com", "en", className = "XoxoComics", overrideVersionCode = 1), + MultiLang("MangaToro", "https://mangatoro.com", listOf("en", "ja")), + SingleLang("NetTruyen", "http://www.nettruyenvip.com", "vi", overrideVersionCode = 4), + SingleLang("NhatTruyen", "http://nhattruyenhay.com", "vi", overrideVersionCode = 4), + SingleLang("TruyenChon", "http://truyenchon.com", "vi", overrideVersionCode = 3), + SingleLang("XOXO Comics", "https://xoxocomics.com", "en", className = "XoxoComics", overrideVersionCode = 1), ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index 645666a33..7a673f81a 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -31,7 +31,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { SingleLang("Skull Scans", "https://www.skullscans.com", "en"), SingleLang("Luminous Scans", "https://www.luminousscans.com", "en"), SingleLang("Azure Scans", "https://azuremanga.com", "en"), - SingleLang("ReaperScans.fr (GS)", "https://reaperscans.fr", "fr", className = "ReaperScansFR", pkgName = "gsnation", overrideVersionCode = 2), + SingleLang("ReaperScans.fr (GS)", "https://reaperscans.fr", "fr", className = "ReaperScansFR", pkgName = "gsnation", overrideVersionCode = 2), SingleLang("YugenMangas", "https://yugenmangas.com", "es"), SingleLang("DragonTranslation", "https://dragontranslation.com", "es", isNsfw = true, overrideVersionCode = 1), SingleLang("Patatescans", "https://patatescans.com", "fr", isNsfw = true, overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderUrlActivity.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderUrlActivity.kt index cf9969c33..b897b063c 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderUrlActivity.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderUrlActivity.kt @@ -5,7 +5,6 @@ import android.content.ActivityNotFoundException import android.content.Intent import android.os.Bundle import android.util.Log -import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import kotlin.system.exitProcess class WPMangaReaderUrlActivity : Activity() { @@ -18,7 +17,7 @@ class WPMangaReaderUrlActivity : Activity() { val mainIntent = Intent().apply { action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query","${WPMangaReader.URL_SEARCH_PREFIX}${intent?.data?.toString()}") + putExtra("query", "${WPMangaReader.URL_SEARCH_PREFIX}${intent?.data?.toString()}") putExtra("filter", packageName) } try { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index df299cc54..7b5d7c00a 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt @@ -12,41 +12,41 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 11 override val sources = listOf( - SingleLang("Asura Scans", "https://www.asurascans.com", "en", overrideVersionCode = 5), - SingleLang("KlanKomik", "https://klankomik.com", "id", overrideVersionCode = 1), - SingleLang("MasterKomik", "https://masterkomik.com", "id", overrideVersionCode = 1), - SingleLang("Kaisar Komik", "https://kaisarkomik.com", "id", overrideVersionCode = 1), - SingleLang("Rawkuma", "https://rawkuma.com/", "ja"), - SingleLang("Boosei", "https://boosei.com", "id", overrideVersionCode = 1), - SingleLang("Mangakyo", "https://www.mangakyo.me", "id"), - SingleLang("Sekte Komik", "https://sektekomik.com", "id", overrideVersionCode = 3), - SingleLang("Komik Station", "https://komikstation.com", "id", overrideVersionCode = 2), - SingleLang("Non-Stop Scans", "https://www.nonstopscans.com", "en", className = "NonStopScans"), - SingleLang("KomikIndo.co", "https://komikindo.co", "id", className = "KomikindoCo", overrideVersionCode = 2), - SingleLang("Readkomik", "https://readkomik.com", "en", className = "ReadKomik", overrideVersionCode = 1), - SingleLang("MangaIndonesia", "https://mangaindonesia.net", "id"), - SingleLang("Liebe Schnee Hiver", "https://www.liebeschneehiver.com", "tr"), - SingleLang("GoGoManga", "https://gogomanga.org", "en"), - SingleLang("GURU Komik", "https://gurukomik.com", "id"), - SingleLang("Shea Manga", "https://sheamanga.my.id", "id", overrideVersionCode = 1), - SingleLang("Komik AV", "https://komikav.com", "id", overrideVersionCode = 1), - SingleLang("Komik Cast", "https://komikcast.com", "id", overrideVersionCode = 7), - SingleLang("West Manga", "https://westmanga.info", "id", overrideVersionCode = 1), - SingleLang("MangaSwat", "https://mangaswat.com", "ar", overrideVersionCode = 3), - SingleLang("Manga Raw.org", "https://mangaraw.org", "ja", className = "MangaRawOrg", overrideVersionCode = 1), - SingleLang("Manga Pro Z", "https://mangaproz.com", "ar"), - SingleLang("Mihentai", "https://mihentai.com", "en", isNsfw = true), - SingleLang("Kuma Scans (Kuma Translation)", "https://kumascans.com", "en", className = "KumaScans", overrideVersionCode = 1), - SingleLang("Tempest Manga", "https://manga.tempestfansub.com", "tr"), - SingleLang("xCaliBR Scans", "https://xcalibrscans.com", "en", overrideVersionCode = 2), - SingleLang("NoxSubs", "https://noxsubs.com", "tr"), - SingleLang("World Romance Translation", "https://wrt.my.id", "id", overrideVersionCode = 3), - SingleLang("The Apollo Team", "https://theapollo.team", "en"), - SingleLang("Sekte Doujin", "https://sektedoujin.xyz", "id", isNsfw = true, overrideVersionCode = 2), - SingleLang("Lemon Juice Scan", "https://lemonjuicescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 1), - SingleLang("Phoenix Fansub", "https://phoenixfansub.com", "es"), - SingleLang("Geass Scanlator", "https://geassscan.xyz", "pt-BR", overrideVersionCode = 2), - SingleLang("Imagine Scan", "https://imaginescan.com.br", "pt-BR", isNsfw = true) + SingleLang("Asura Scans", "https://www.asurascans.com", "en", overrideVersionCode = 5), + SingleLang("KlanKomik", "https://klankomik.com", "id", overrideVersionCode = 1), + SingleLang("MasterKomik", "https://masterkomik.com", "id", overrideVersionCode = 1), + SingleLang("Kaisar Komik", "https://kaisarkomik.com", "id", overrideVersionCode = 1), + SingleLang("Rawkuma", "https://rawkuma.com/", "ja"), + SingleLang("Boosei", "https://boosei.com", "id", overrideVersionCode = 1), + SingleLang("Mangakyo", "https://www.mangakyo.me", "id"), + SingleLang("Sekte Komik", "https://sektekomik.com", "id", overrideVersionCode = 3), + SingleLang("Komik Station", "https://komikstation.com", "id", overrideVersionCode = 2), + SingleLang("Non-Stop Scans", "https://www.nonstopscans.com", "en", className = "NonStopScans"), + SingleLang("KomikIndo.co", "https://komikindo.co", "id", className = "KomikindoCo", overrideVersionCode = 2), + SingleLang("Readkomik", "https://readkomik.com", "en", className = "ReadKomik", overrideVersionCode = 1), + SingleLang("MangaIndonesia", "https://mangaindonesia.net", "id"), + SingleLang("Liebe Schnee Hiver", "https://www.liebeschneehiver.com", "tr"), + SingleLang("GoGoManga", "https://gogomanga.org", "en"), + SingleLang("GURU Komik", "https://gurukomik.com", "id"), + SingleLang("Shea Manga", "https://sheamanga.my.id", "id", overrideVersionCode = 1), + SingleLang("Komik AV", "https://komikav.com", "id", overrideVersionCode = 1), + SingleLang("Komik Cast", "https://komikcast.com", "id", overrideVersionCode = 7), + SingleLang("West Manga", "https://westmanga.info", "id", overrideVersionCode = 1), + SingleLang("MangaSwat", "https://mangaswat.com", "ar", overrideVersionCode = 3), + SingleLang("Manga Raw.org", "https://mangaraw.org", "ja", className = "MangaRawOrg", overrideVersionCode = 1), + SingleLang("Manga Pro Z", "https://mangaproz.com", "ar"), + SingleLang("Mihentai", "https://mihentai.com", "en", isNsfw = true), + SingleLang("Kuma Scans (Kuma Translation)", "https://kumascans.com", "en", className = "KumaScans", overrideVersionCode = 1), + SingleLang("Tempest Manga", "https://manga.tempestfansub.com", "tr"), + SingleLang("xCaliBR Scans", "https://xcalibrscans.com", "en", overrideVersionCode = 2), + SingleLang("NoxSubs", "https://noxsubs.com", "tr"), + SingleLang("World Romance Translation", "https://wrt.my.id", "id", overrideVersionCode = 3), + SingleLang("The Apollo Team", "https://theapollo.team", "en"), + SingleLang("Sekte Doujin", "https://sektedoujin.xyz", "id", isNsfw = true, overrideVersionCode = 2), + SingleLang("Lemon Juice Scan", "https://lemonjuicescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 1), + SingleLang("Phoenix Fansub", "https://phoenixfansub.com", "es"), + SingleLang("Geass Scanlator", "https://geassscan.xyz", "pt-BR", overrideVersionCode = 2), + SingleLang("Imagine Scan", "https://imaginescan.com.br", "pt-BR", isNsfw = true) ) companion object { diff --git a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt index cbd0c725e..d5251ba3e 100644 --- a/multisrc/src/main/java/generator/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -59,7 +59,8 @@ interface ThemeSourceGenerator { "SOURCEHOST" to source.baseUrl.toHttpUrlOrNull()?.host, "SOURCESCHEME" to source.baseUrl.toHttpUrlOrNull()?.scheme ).filter { it.value != null } - gradle.writeText(""" + gradle.writeText( + """ // THIS FILE IS AUTO-GENERATED; DO NOT EDIT apply plugin: 'com.android.application' apply plugin: 'kotlin-android' @@ -85,7 +86,8 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString ] } } - """.trimIndent()) + """.trimIndent() + ) } private fun writeAndroidManifest(androidManifestFile: File, manifestOverridesPath: String, defaultAndroidManifestPath: String) { @@ -96,11 +98,13 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString else if (defaultAndroidManifest.exists()) defaultAndroidManifest.copyTo(androidManifestFile) else - androidManifestFile.writeText(""" + androidManifestFile.writeText( + """ - """.trimIndent()) + """.trimIndent() + ) } private fun createGradleProject(source: ThemeSourceData, themePkg: String, themeClass: String, baseVersionCode: Int, userDir: String) { @@ -143,8 +147,8 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString themeDestFile.mkdirs() themeSrcFile.list()!! - .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") } - .forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) } + .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") } + .forEach { Files.copy(File("$themeSrcPath/$it").toPath(), File("$themeDestPath/$it").toPath(), StandardCopyOption.REPLACE_EXISTING) } } private fun copyResFiles(resOverridePath: String, defaultResPath: String, source: ThemeSourceData, projectRootPath: String): Any { @@ -190,7 +194,8 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString } } - File("$classPath/${source.className}.kt").writeText("""/* ktlint-disable */ + File("$classPath/${source.className}.kt").writeText( + """/* ktlint-disable */ // THIS FILE IS AUTO-GENERATED; DO NOT EDIT package eu.kanade.tachiyomi.extension.${pkgNameSuffix(source, ".")} @@ -200,7 +205,8 @@ ${placeholders.map { "${" ".repeat(28)}${it.key}: \"${it.value}\""}.joinToString ${if (source.isNsfw) "\n@Nsfw" else ""} ${factoryClassText()} - """.trimIndent()) + """.trimIndent() + ) } private fun cleanDirectory(dir: File) { @@ -230,23 +236,23 @@ sealed class ThemeSourceData { abstract val overrideVersionCode: Int data class SingleLang( - override val name: String, - override val baseUrl: String, - val lang: String, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", ""), - override val pkgName: String = className.toLowerCase(Locale.ENGLISH), - override val overrideVersionCode: Int = 0, + override val name: String, + override val baseUrl: String, + val lang: String, + override val isNsfw: Boolean = false, + override val className: String = name.replace(" ", ""), + override val pkgName: String = className.toLowerCase(Locale.ENGLISH), + override val overrideVersionCode: Int = 0, ) : ThemeSourceData() data class MultiLang( - override val name: String, - override val baseUrl: String, - val langs: List, - override val isNsfw: Boolean = false, - override val className: String = name.replace(" ", "") + "Factory", - override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH), - override val overrideVersionCode: Int = 0, + override val name: String, + override val baseUrl: String, + val langs: List, + override val isNsfw: Boolean = false, + override val className: String = name.replace(" ", "") + "Factory", + override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH), + override val overrideVersionCode: Int = 0, ) : ThemeSourceData() }