From 580754e668f4968d480d261a822e91f7d695f19f Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 9 Mar 2021 18:02:17 -0500 Subject: [PATCH] Separate out generator logic from the multisrc boilerplate itself --- .github/workflows/build_pull_request.yml | 4 +- .github/workflows/build_push.yml | 2 +- multisrc/build.gradle.kts | 5 +- .../multisrc/comicake/ComiCakeGenerator.kt | 4 +- .../multisrc/eromuse/EroMuseGenerator.kt | 12 ++- .../multisrc/fmreader/FMReaderGenerator.kt | 57 ++++++++++---- .../multisrc/foolslide/FoolSlideGenerator.kt | 76 +++++++++---------- .../multisrc/genkan/GenkanGenerator.kt | 6 +- .../genkan/GenkanOriginalGenerator.kt | 4 +- .../multisrc/madara/MadaraGenerator.kt | 6 +- .../multisrc/mangabox/MangaBoxGenerator.kt | 4 +- .../mangadventure/MangAdventureGenerator.kt | 4 +- .../multisrc/paprika/PaprikaAltGenerator.kt | 7 +- .../multisrc/paprika/PaprikaGenerator.kt | 7 +- .../multisrc/wpcomics/WPComicsGenerator.kt | 6 +- .../wpmangareader/WPMangaReaderGenerator.kt | 5 +- .../wpmangastream/WPMangaStreamGenerator.kt | 4 +- .../multisrc => generator}/GeneratorMain.kt | 2 +- .../ThemeSourceGenerator.kt | 2 +- 19 files changed, 120 insertions(+), 97 deletions(-) rename multisrc/src/main/java/{eu/kanade/tachiyomi/multisrc => generator}/GeneratorMain.kt (96%) rename multisrc/src/main/java/{eu/kanade/tachiyomi/multisrc => generator}/ThemeSourceGenerator.kt (99%) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index edddd3a3b..4e9ef82b1 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -41,7 +41,7 @@ jobs: env: CI_MULTISRC: "true" with: - arguments: :multisrc:multisrcGenerators + arguments: :multisrc:generateExtensions wrapper-cache-enabled: true dependencies-cache-enabled: true configuration-cache-enabled: true @@ -88,4 +88,4 @@ jobs: arguments: assembleRelease wrapper-cache-enabled: true dependencies-cache-enabled: true - configuration-cache-enabled: true \ No newline at end of file + configuration-cache-enabled: true diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 119e8b175..982b41723 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -51,7 +51,7 @@ jobs: with: build-root-directory: master wrapper-directory: master - arguments: :multisrc:multisrcGenerators + arguments: :multisrc:generateExtensions wrapper-cache-enabled: true dependencies-cache-enabled: true configuration-cache-enabled: true diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index 0ab32630d..c6253bc21 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -21,7 +21,7 @@ repositories { apply("$rootDir/common-dependencies.gradle") tasks { - val multisrcGenerators by registering { + val generateExtensions by registering { doLast { val isWindows = System.getProperty("os.name").toString().toLowerCase().contains("win") val classPath = (configurations.debugCompileOnly.get().asFileTree.toList() + @@ -32,8 +32,7 @@ tasks { .joinToString(if (isWindows) ";" else ":") val javaPath = "${System.getProperty("java.home")}/bin/java" - val mainClass = - "eu.kanade.tachiyomi.multisrc.GeneratorMainKt" // Main class we want to execute + val mainClass = "generator.GeneratorMainKt" // Main class we want to execute val javaCommand = if (isWindows) { "\"$javaPath\" -classpath $classPath $mainClass".replace("/", "\\") diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCakeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCakeGenerator.kt index 452415baa..7baa3aff5 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCakeGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/comicake/ComiCakeGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.comicake -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class ComiCakeGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt index 62aa6b35c..4e5d6e694 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/eromuse/EroMuseGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.eromuse -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class EroMuseGenerator : ThemeSourceGenerator { @@ -12,7 +12,13 @@ class EroMuseGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - SingleLang("8Muses", "https://comics.8muses.com", "en", className = "EightMuses", isNsfw = true), + SingleLang( + "8Muses", + "https://comics.8muses.com", + "en", + className = "EightMuses", + isNsfw = true + ), SingleLang("Erofus", "https://www.erofus.com", "en", isNsfw = true) ) 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 7ba3c2b48..5d091e0ac 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 @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.multisrc.fmreader -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class FMReaderGenerator : ThemeSourceGenerator { @@ -16,19 +16,44 @@ class FMReaderGenerator : ThemeSourceGenerator { * most likely the fix is to override popularMangaNextPageSelector() */ override val sources = listOf( - SingleLang("18LHPlus", "https://18lhplus.com", "en", className = "EighteenLHPlus"), - SingleLang("Epik Manga", "https://www.epikmanga.com", "tr"), - SingleLang("HanaScan (RawQQ)", "https://hanascan.com", "ja", className = "HanaScanRawQQ"), - SingleLang("HeroScan", "https://heroscan.com", "en"), - SingleLang("KissLove", "https://kissaway.net", "ja"), - SingleLang("LHTranslation", "https://lhtranslation.net", "en", overrideVersionCode = 1), - SingleLang("Manga-TR", "https://manga-tr.com", "tr", className = "MangaTR"), - SingleLang("ManhuaScan", "https://manhuascan.com", "en"), - SingleLang("Manhwa18", "https://manhwa18.com", "en"), - MultiLang("Manhwa18.net", "https://manhwa18.net", listOf("en", "ko"), className = "Manhwa18NetFactory"), - SingleLang("ManhwaSmut", "https://manhwasmut.com", "en", overrideVersionCode = 1), - SingleLang("RawLH", "https://lovehug.net", "ja"), - SingleLang("Say Truyen", "https://saytruyen.com", "vi"), + SingleLang( + "18LHPlus", + "https://18lhplus.com", + "en", + className = "EighteenLHPlus" + ), + SingleLang("Epik Manga", "https://www.epikmanga.com", "tr"), + SingleLang( + "HanaScan (RawQQ)", + "https://hanascan.com", + "ja", + className = "HanaScanRawQQ" + ), + SingleLang("HeroScan", "https://heroscan.com", "en"), + SingleLang("KissLove", "https://kissaway.net", "ja"), + SingleLang( + "LHTranslation", + "https://lhtranslation.net", + "en", + overrideVersionCode = 1 + ), + SingleLang("Manga-TR", "https://manga-tr.com", "tr", className = "MangaTR"), + SingleLang("ManhuaScan", "https://manhuascan.com", "en"), + SingleLang("Manhwa18", "https://manhwa18.com", "en"), + MultiLang( + "Manhwa18.net", + "https://manhwa18.net", + listOf("en", "ko"), + className = "Manhwa18NetFactory" + ), + SingleLang( + "ManhwaSmut", + "https://manhwasmut.com", + "en", + overrideVersionCode = 1 + ), + SingleLang("RawLH", "https://lovehug.net", "ja"), + SingleLang("Say Truyen", "https://saytruyen.com", "vi"), ) companion object { 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 2fd1f819f..f9ad30153 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 @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.multisrc.foolslide -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class FoolSlideGenerator : ThemeSourceGenerator { @@ -13,41 +13,41 @@ class FoolSlideGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 1 override val sources = listOf( - SingleLang("The Cat Scans", "https://reader2.thecatscans.com/", "en"), - SingleLang("Silent Sky", "https://reader.silentsky-scans.net", "en"), - SingleLang("Death Toll Scans", "https://reader.deathtollscans.net", "en"), - SingleLang("One Time Scans", "https://reader.otscans.com", "en"), - SingleLang("MangaScouts", "http://onlinereader.mangascouts.org", "de"), - SingleLang("Lilyreader", "https://manga.smuglo.li", "en"), - 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")), - SingleLang("Menudo-Fansub", "http://www.menudo-fansub.com", "es", className = "MenudoFansub"), - SingleLang("Sense-Scans", "http://sensescans.com", "en", className = "SenseScans"), - SingleLang("Kirei Cake", "https://reader.kireicake.com", "en"), - SingleLang("Mangatellers", "http://www.mangatellers.gr", "en"), - SingleLang("Iskultrip Scans", "https://maryfaye.net", "en"), - SingleLang("Anata no Motokare", "https://motokare.xyz", "en", className = "AnataNoMotokare"), - SingleLang("Yuri-ism", "https://www.yuri-ism.net", "en", className = "YuriIsm"), - SingleLang("Ajia no Scantrad", "https://www.ajianoscantrad.fr", "fr", className = "AjiaNoScantrad"), - SingleLang("Storm in Heaven", "https://www.storm-in-heaven.net", "it", className = "StormInHeaven"), - SingleLang("LupiTeam", "https://lupiteam.net", "it"), - SingleLang("Zandy no Fansub", "https://zandynofansub.aishiteru.org", "en"), - SingleLang("Helvetica Scans", "https://helveticascans.com", "en"), - SingleLang("Kirishima Fansub", "https://www.kirishimafansub.net", "es"), - SingleLang("Baixar Hentai", "https://leitura.baixarhentai.net", "pt-BR", isNsfw = true), - SingleLang("HNI-Scantrad", "https://hni-scantrad.com", "fr", className = "HNIScantrad"), - SingleLang("HNI-Scantrad", "https://hni-scantrad.com", "en", className = "HNIScantradEN"), - SingleLang("The Phoenix Scans", "https://www.phoenixscans.com", "it", className = "PhoenixScans"), - SingleLang("GTO The Great Site", "https://www.gtothegreatsite.net", "it", className = "GTO"), - SingleLang("Fall World Reader", "https://faworeader.altervista.org", "it", className = "FallenWorldOrder"), - SingleLang("NIFTeam", "http://read-nifteam.info", "it"), - SingleLang("TuttoAnimeManga", "https://tuttoanimemanga.net", "it"), - SingleLang("Tortuga Ceviri", "http://tortuga-ceviri.com", "tr"), - SingleLang("Rama", "https://www.ramareader.it", "it"), - SingleLang("Mabushimajo", "http://mabushimajo.com", "tr"), - SingleLang("Hentai Cafe", "https://hentai.cafe", "en", isNsfw = true), + SingleLang("The Cat Scans", "https://reader2.thecatscans.com/", "en"), + SingleLang("Silent Sky", "https://reader.silentsky-scans.net", "en"), + SingleLang("Death Toll Scans", "https://reader.deathtollscans.net", "en"), + SingleLang("One Time Scans", "https://reader.otscans.com", "en"), + SingleLang("MangaScouts", "http://onlinereader.mangascouts.org", "de"), + SingleLang("Lilyreader", "https://manga.smuglo.li", "en"), + 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")), + SingleLang("Menudo-Fansub", "http://www.menudo-fansub.com", "es", className = "MenudoFansub"), + SingleLang("Sense-Scans", "http://sensescans.com", "en", className = "SenseScans"), + SingleLang("Kirei Cake", "https://reader.kireicake.com", "en"), + SingleLang("Mangatellers", "http://www.mangatellers.gr", "en"), + SingleLang("Iskultrip Scans", "https://maryfaye.net", "en"), + SingleLang("Anata no Motokare", "https://motokare.xyz", "en", className = "AnataNoMotokare"), + SingleLang("Yuri-ism", "https://www.yuri-ism.net", "en", className = "YuriIsm"), + SingleLang("Ajia no Scantrad", "https://www.ajianoscantrad.fr", "fr", className = "AjiaNoScantrad"), + SingleLang("Storm in Heaven", "https://www.storm-in-heaven.net", "it", className = "StormInHeaven"), + SingleLang("LupiTeam", "https://lupiteam.net", "it"), + SingleLang("Zandy no Fansub", "https://zandynofansub.aishiteru.org", "en"), + SingleLang("Helvetica Scans", "https://helveticascans.com", "en"), + SingleLang("Kirishima Fansub", "https://www.kirishimafansub.net", "es"), + SingleLang("Baixar Hentai", "https://leitura.baixarhentai.net", "pt-BR", isNsfw = true), + SingleLang("HNI-Scantrad", "https://hni-scantrad.com", "fr", className = "HNIScantrad"), + SingleLang("HNI-Scantrad", "https://hni-scantrad.com", "en", className = "HNIScantradEN"), + SingleLang("The Phoenix Scans", "https://www.phoenixscans.com", "it", className = "PhoenixScans"), + SingleLang("GTO The Great Site", "https://www.gtothegreatsite.net", "it", className = "GTO"), + SingleLang("Fall World Reader", "https://faworeader.altervista.org", "it", className = "FallenWorldOrder"), + SingleLang("NIFTeam", "http://read-nifteam.info", "it"), + SingleLang("TuttoAnimeManga", "https://tuttoanimemanga.net", "it"), + SingleLang("Tortuga Ceviri", "http://tortuga-ceviri.com", "tr"), + SingleLang("Rama", "https://www.ramareader.it", "it"), + SingleLang("Mabushimajo", "http://mabushimajo.com", "tr"), + SingleLang("Hentai Cafe", "https://hentai.cafe", "en", isNsfw = true), ) companion object { 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 5f4aaa868..e8766fabf 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,8 +1,8 @@ package eu.kanade.tachiyomi.multisrc.genkan -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class GenkanGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanOriginalGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanOriginalGenerator.kt index cd5f4bfba..a2e58657e 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanOriginalGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/genkan/GenkanOriginalGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.genkan -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class GenkanOriginalGenerator : ThemeSourceGenerator { 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 b0cda9241..679ed3c37 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 @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.multisrc.madara -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class MadaraGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt index bcc6b7f96..6dacfbd90 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBoxGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.mangabox -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class MangaBoxGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt index 4e7b36884..be1785fb1 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangadventure/MangAdventureGenerator.kt @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.mangadventure -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator /** [MangAdventure] source generator. */ class MangAdventureGenerator : ThemeSourceGenerator { 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 7febc5846..fb881a040 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 @@ -1,10 +1,7 @@ package eu.kanade.tachiyomi.multisrc.paprika -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class PaprikaAltGenerator : ThemeSourceGenerator { 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 f7a538adf..3eb3482d4 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 @@ -1,10 +1,7 @@ package eu.kanade.tachiyomi.multisrc.paprika -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator -import eu.kanade.tachiyomi.source.Source -import eu.kanade.tachiyomi.source.SourceFactory - +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class PaprikaGenerator : ThemeSourceGenerator { 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 b76ca8e17..c2462cc3e 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 @@ -1,8 +1,8 @@ package eu.kanade.tachiyomi.multisrc.wpcomics -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.MultiLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.MultiLang +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class WPComicsGenerator : ThemeSourceGenerator { 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 86e042452..4a474b2ab 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 @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.wpmangareader -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class WPMangaReaderGenerator : ThemeSourceGenerator { @@ -19,7 +19,6 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { SingleLang("Sekaikomik", "https://www.sekaikomik.com", "id", true), SingleLang("TurkToon", "https://turktoon.com", "tr"), SingleLang("Gecenin Lordu", "https://geceninlordu.com/", "tr", overrideVersionCode = 1), - ) companion object { 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 86f922776..62c637864 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 @@ -1,7 +1,7 @@ package eu.kanade.tachiyomi.multisrc.wpmangastream -import eu.kanade.tachiyomi.multisrc.ThemeSourceData.SingleLang -import eu.kanade.tachiyomi.multisrc.ThemeSourceGenerator +import generator.ThemeSourceData.SingleLang +import generator.ThemeSourceGenerator class WPMangaStreamGenerator : ThemeSourceGenerator { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/GeneratorMain.kt b/multisrc/src/main/java/generator/GeneratorMain.kt similarity index 96% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/GeneratorMain.kt rename to multisrc/src/main/java/generator/GeneratorMain.kt index 9a82badab..fb29c8cfa 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/GeneratorMain.kt +++ b/multisrc/src/main/java/generator/GeneratorMain.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc +package generator import java.io.File diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt similarity index 99% rename from multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt rename to multisrc/src/main/java/generator/ThemeSourceGenerator.kt index 6cb151e12..ba8b32c13 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt +++ b/multisrc/src/main/java/generator/ThemeSourceGenerator.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc +package generator import java.io.File import java.nio.file.Files