From 62351d69de3d90996cb7ae0f5020ec2934ef0c75 Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:06:34 +0800 Subject: [PATCH] Fix multisrc generator configurations and format files (#12734) * [skip ci] fix multisrc generator configurations * [skip ci] format multisrc files * remove formatting in CI build (lint only) --- .run/BakaMangaGenerator.run.xml | 14 +++------ .run/BakkinGenerator.run.xml | 14 +++------ .run/BilibiliGenerator.run.xml | 14 +++------ .run/ChanGenerator.run.xml | 11 +++++++ .run/ComiCakeGenerator.run.xml | 14 +++------ .run/ComicGammaGenerator.run.xml | 14 +++------ .run/EroMuseGenerator.run.xml | 14 +++------ .run/FMReaderGenerator.run.xml | 14 +++------ .run/FoolSlideGenerator.run.xml | 14 +++------ .run/GattsuGenerator.run.xml | 14 +++------ .run/GenkanGenerator.run.xml | 14 +++------ .run/GenkanOriginalGenerator.run.xml | 14 +++------ .run/GigaViewerGenerator.run.xml | 14 +++------ .run/GroupLeGenerator.run.xml | 11 +++++++ .run/GuyaGenerator.run.xml | 14 +++------ .run/HentaiHandGenerator.run.xml | 11 +++++++ .run/KemonoGenerator.run.xml | 14 +++------ .run/LibGenerator.run.xml | 11 +++++++ .run/LusciousGenerator.run.xml | 17 ---------- .run/MCCMSGenerator.run.xml | 14 +++------ .run/MDBGenerator.run.xml | 14 +++------ .run/MMRCMSGenerator.run.xml | 14 +++------ .run/MadThemeGenerator.run.xml | 26 ++++++---------- .run/MadaraGenerator.run.xml | 14 +++------ .run/MangAdventureGenerator.run.xml | 14 +++------ .run/MangaBoxGenerator.run.xml | 14 +++------ .run/MangaCatalogGenerator.run.xml | 14 +++------ .run/MangaHubGenerator.run.xml | 14 +++------ .run/MangaMainacGenerator.run.xml | 14 +++------ .run/MangaRawGenerator.run.xml | 11 +++++++ .run/MangaSarGenerator.run.xml | 14 +++------ .run/MangaWorldGenerator.run.xml | 11 +++++++ .run/MonochromeGenerator.run.xml | 11 +++++++ .run/MyMangaCMSGenerator.run.xml | 11 +++++++ .run/NepNepGenerator.run.xml | 14 +++------ .run/NyaHentaiGenerator.run.xml | 17 ---------- .run/PaprikaAltGenerator.run.xml | 14 +++------ .run/PaprikaGenerator.run.xml | 14 +++------ .run/PizzaReaderGenerator.run.xml | 14 +++------ .run/ReaderFrontGenerator.run.xml | 14 +++------ .run/SinMHGenerator.run.xml | 14 +++------ .run/WPComicsGenerator.run.xml | 14 +++------ .run/WPMangaStreamGenerator.run.xml | 14 +++------ .run/WebtoonsGenerator.run.xml | 14 +++------ .run/WebtoonsTranslateGenerator.run.xml | 14 +++------ .run/WeebreaderGenerator.run.xml | 14 +++------ .run/WpMangaReaderGenerator.run.xml | 14 +++------ .run/ZMangaGenerator.run.xml | 14 +++------ .run/ZbuluGenerator.run.xml | 14 +++------ CONTRIBUTING.md | 5 +++ multisrc/build.gradle.kts | 12 ++++++- .../grouple/allhentai/src/AllHentai.kt | 4 +-- .../grouple/mintmanga/src/MintManga.kt | 4 +-- .../grouple/readmanga/src/ReadManga.kt | 5 ++- multisrc/overrides/grouple/rumix/src/RuMIX.kt | 7 ++--- .../grouple/selfmanga/src/SelfManga.kt | 2 +- .../libgroup/hentailib/src/HentaiLib.kt | 1 - .../libgroup/mangalib/src/MangaLib.kt | 2 +- .../overrides/libgroup/yaoilib/src/YaoiLib.kt | 1 - .../mangaraw/manga1001/src/Manga1001.kt | 4 +-- .../mangaraw/manga9co/src/Manga9co.kt | 1 - .../overrides/mangaraw/syosetu/src/SyoSetu.kt | 1 - .../multichan/henchan/src/HenChan.kt | 10 +++--- .../multichan/mangachan/src/MangaChan.kt | 2 +- .../multichan/yaoichan/src/YaoiChan.kt | 2 +- .../truyentranhlh/src/TruyenTranhLH.kt | 1 - .../wpmangareader/sushiscan/src/SushiScan.kt | 1 - .../wpmangastream/mangaproz/src/MangaPro.kt | 3 +- .../tachiyomi/multisrc/grouple/GroupLe.kt | 4 +-- .../multisrc/grouple/GroupLeGenerator.kt | 4 +-- .../multisrc/libgroup/LibGenerator.kt | 6 ++-- .../tachiyomi/multisrc/libgroup/LibGroup.kt | 31 +++++++++---------- .../multisrc/multichan/ChanGenerator.kt | 6 ++-- .../tachiyomi/multisrc/multichan/MultiChan.kt | 2 -- .../multisrc/mymangacms/MyMangaCMS.kt | 11 ++++--- .../mymangacms/MyMangaCMSUrlActivity.kt | 12 ++++--- .../IntelijConfigurationGeneratorMain.kt | 18 +++-------- 77 files changed, 328 insertions(+), 514 deletions(-) create mode 100644 .run/ChanGenerator.run.xml create mode 100644 .run/GroupLeGenerator.run.xml create mode 100644 .run/HentaiHandGenerator.run.xml create mode 100644 .run/LibGenerator.run.xml delete mode 100644 .run/LusciousGenerator.run.xml create mode 100644 .run/MangaRawGenerator.run.xml create mode 100644 .run/MangaWorldGenerator.run.xml create mode 100644 .run/MonochromeGenerator.run.xml create mode 100644 .run/MyMangaCMSGenerator.run.xml delete mode 100644 .run/NyaHentaiGenerator.run.xml diff --git a/.run/BakaMangaGenerator.run.xml b/.run/BakaMangaGenerator.run.xml index b0cc06ee67..3166fb8f9e 100644 --- a/.run/BakaMangaGenerator.run.xml +++ b/.run/BakaMangaGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/BakkinGenerator.run.xml b/.run/BakkinGenerator.run.xml index c8e88d1b29..077e52980f 100644 --- a/.run/BakkinGenerator.run.xml +++ b/.run/BakkinGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/BilibiliGenerator.run.xml b/.run/BilibiliGenerator.run.xml index acb5cd96d6..35d79c7d4f 100644 --- a/.run/BilibiliGenerator.run.xml +++ b/.run/BilibiliGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/ChanGenerator.run.xml b/.run/ChanGenerator.run.xml new file mode 100644 index 0000000000..f4f915b376 --- /dev/null +++ b/.run/ChanGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/ComiCakeGenerator.run.xml b/.run/ComiCakeGenerator.run.xml index 6199f212bf..b033d14108 100644 --- a/.run/ComiCakeGenerator.run.xml +++ b/.run/ComiCakeGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/ComicGammaGenerator.run.xml b/.run/ComicGammaGenerator.run.xml index 71b1693300..8b8c6d2beb 100644 --- a/.run/ComicGammaGenerator.run.xml +++ b/.run/ComicGammaGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/EroMuseGenerator.run.xml b/.run/EroMuseGenerator.run.xml index df89ae9d06..fe4ababf52 100644 --- a/.run/EroMuseGenerator.run.xml +++ b/.run/EroMuseGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/FMReaderGenerator.run.xml b/.run/FMReaderGenerator.run.xml index 85ab8d6f42..efc32a2605 100644 --- a/.run/FMReaderGenerator.run.xml +++ b/.run/FMReaderGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/FoolSlideGenerator.run.xml b/.run/FoolSlideGenerator.run.xml index 9c1f7deb2a..044043f707 100644 --- a/.run/FoolSlideGenerator.run.xml +++ b/.run/FoolSlideGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/GattsuGenerator.run.xml b/.run/GattsuGenerator.run.xml index eedd47afc6..771b6a20e3 100644 --- a/.run/GattsuGenerator.run.xml +++ b/.run/GattsuGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/GenkanGenerator.run.xml b/.run/GenkanGenerator.run.xml index 4d8d4b8025..7c19296946 100644 --- a/.run/GenkanGenerator.run.xml +++ b/.run/GenkanGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/GenkanOriginalGenerator.run.xml b/.run/GenkanOriginalGenerator.run.xml index c059137793..6006407f64 100644 --- a/.run/GenkanOriginalGenerator.run.xml +++ b/.run/GenkanOriginalGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/GigaViewerGenerator.run.xml b/.run/GigaViewerGenerator.run.xml index 18e110714c..f513463170 100644 --- a/.run/GigaViewerGenerator.run.xml +++ b/.run/GigaViewerGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/GroupLeGenerator.run.xml b/.run/GroupLeGenerator.run.xml new file mode 100644 index 0000000000..4f5aeff14d --- /dev/null +++ b/.run/GroupLeGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/GuyaGenerator.run.xml b/.run/GuyaGenerator.run.xml index 0e0fc6fabb..b24a84cec3 100644 --- a/.run/GuyaGenerator.run.xml +++ b/.run/GuyaGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/HentaiHandGenerator.run.xml b/.run/HentaiHandGenerator.run.xml new file mode 100644 index 0000000000..af0be7fcc0 --- /dev/null +++ b/.run/HentaiHandGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/KemonoGenerator.run.xml b/.run/KemonoGenerator.run.xml index 2ac0c58daa..c68bc4a86e 100644 --- a/.run/KemonoGenerator.run.xml +++ b/.run/KemonoGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/LibGenerator.run.xml b/.run/LibGenerator.run.xml new file mode 100644 index 0000000000..b65311b423 --- /dev/null +++ b/.run/LibGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/LusciousGenerator.run.xml b/.run/LusciousGenerator.run.xml deleted file mode 100644 index ffe9f241e7..0000000000 --- a/.run/LusciousGenerator.run.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.run/MCCMSGenerator.run.xml b/.run/MCCMSGenerator.run.xml index 9251fcd652..054dc8fc1c 100644 --- a/.run/MCCMSGenerator.run.xml +++ b/.run/MCCMSGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MDBGenerator.run.xml b/.run/MDBGenerator.run.xml index cf014fd0d5..b3fffaabe8 100644 --- a/.run/MDBGenerator.run.xml +++ b/.run/MDBGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MMRCMSGenerator.run.xml b/.run/MMRCMSGenerator.run.xml index 09973bf6e6..81eaf76905 100644 --- a/.run/MMRCMSGenerator.run.xml +++ b/.run/MMRCMSGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MadThemeGenerator.run.xml b/.run/MadThemeGenerator.run.xml index fd0dfd218e..2124d454f9 100644 --- a/.run/MadThemeGenerator.run.xml +++ b/.run/MadThemeGenerator.run.xml @@ -1,17 +1,11 @@ - - - - \ No newline at end of file + + + + diff --git a/.run/MadaraGenerator.run.xml b/.run/MadaraGenerator.run.xml index 784f765234..5934a39cea 100644 --- a/.run/MadaraGenerator.run.xml +++ b/.run/MadaraGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangAdventureGenerator.run.xml b/.run/MangAdventureGenerator.run.xml index c4f8e0a864..521635b46e 100644 --- a/.run/MangAdventureGenerator.run.xml +++ b/.run/MangAdventureGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaBoxGenerator.run.xml b/.run/MangaBoxGenerator.run.xml index c2a20df3fe..f6c2f55375 100644 --- a/.run/MangaBoxGenerator.run.xml +++ b/.run/MangaBoxGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaCatalogGenerator.run.xml b/.run/MangaCatalogGenerator.run.xml index 7b4c284e9e..551633cfd9 100644 --- a/.run/MangaCatalogGenerator.run.xml +++ b/.run/MangaCatalogGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaHubGenerator.run.xml b/.run/MangaHubGenerator.run.xml index 28ab109357..f9af265a83 100644 --- a/.run/MangaHubGenerator.run.xml +++ b/.run/MangaHubGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaMainacGenerator.run.xml b/.run/MangaMainacGenerator.run.xml index b9b20da675..05aedc7ee2 100644 --- a/.run/MangaMainacGenerator.run.xml +++ b/.run/MangaMainacGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaRawGenerator.run.xml b/.run/MangaRawGenerator.run.xml new file mode 100644 index 0000000000..7922653950 --- /dev/null +++ b/.run/MangaRawGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/MangaSarGenerator.run.xml b/.run/MangaSarGenerator.run.xml index 97f343d2ab..06529fe67e 100644 --- a/.run/MangaSarGenerator.run.xml +++ b/.run/MangaSarGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/MangaWorldGenerator.run.xml b/.run/MangaWorldGenerator.run.xml new file mode 100644 index 0000000000..f8a837107d --- /dev/null +++ b/.run/MangaWorldGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/MonochromeGenerator.run.xml b/.run/MonochromeGenerator.run.xml new file mode 100644 index 0000000000..11059802df --- /dev/null +++ b/.run/MonochromeGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/MyMangaCMSGenerator.run.xml b/.run/MyMangaCMSGenerator.run.xml new file mode 100644 index 0000000000..861655d3de --- /dev/null +++ b/.run/MyMangaCMSGenerator.run.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/.run/NepNepGenerator.run.xml b/.run/NepNepGenerator.run.xml index eec50bbafb..2792cfeb8f 100644 --- a/.run/NepNepGenerator.run.xml +++ b/.run/NepNepGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/NyaHentaiGenerator.run.xml b/.run/NyaHentaiGenerator.run.xml deleted file mode 100644 index 2fa18896fb..0000000000 --- a/.run/NyaHentaiGenerator.run.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.run/PaprikaAltGenerator.run.xml b/.run/PaprikaAltGenerator.run.xml index ff64227984..88fb4350f9 100644 --- a/.run/PaprikaAltGenerator.run.xml +++ b/.run/PaprikaAltGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/PaprikaGenerator.run.xml b/.run/PaprikaGenerator.run.xml index ca03466f12..6475c4950b 100644 --- a/.run/PaprikaGenerator.run.xml +++ b/.run/PaprikaGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/PizzaReaderGenerator.run.xml b/.run/PizzaReaderGenerator.run.xml index 9ae507923d..392c3d85cf 100644 --- a/.run/PizzaReaderGenerator.run.xml +++ b/.run/PizzaReaderGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/ReaderFrontGenerator.run.xml b/.run/ReaderFrontGenerator.run.xml index 1913aa55f2..20e8685d71 100644 --- a/.run/ReaderFrontGenerator.run.xml +++ b/.run/ReaderFrontGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/SinMHGenerator.run.xml b/.run/SinMHGenerator.run.xml index 31c7d75f1e..fb16f608af 100644 --- a/.run/SinMHGenerator.run.xml +++ b/.run/SinMHGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WPComicsGenerator.run.xml b/.run/WPComicsGenerator.run.xml index 18d231f035..a03ca15634 100644 --- a/.run/WPComicsGenerator.run.xml +++ b/.run/WPComicsGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WPMangaStreamGenerator.run.xml b/.run/WPMangaStreamGenerator.run.xml index a81ef9aacb..341c395725 100644 --- a/.run/WPMangaStreamGenerator.run.xml +++ b/.run/WPMangaStreamGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WebtoonsGenerator.run.xml b/.run/WebtoonsGenerator.run.xml index 46410fa964..9dbe554c31 100644 --- a/.run/WebtoonsGenerator.run.xml +++ b/.run/WebtoonsGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WebtoonsTranslateGenerator.run.xml b/.run/WebtoonsTranslateGenerator.run.xml index 892c49a1f1..a7ade27bb0 100644 --- a/.run/WebtoonsTranslateGenerator.run.xml +++ b/.run/WebtoonsTranslateGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WeebreaderGenerator.run.xml b/.run/WeebreaderGenerator.run.xml index 0c80a05504..3aa96b3a80 100644 --- a/.run/WeebreaderGenerator.run.xml +++ b/.run/WeebreaderGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/WpMangaReaderGenerator.run.xml b/.run/WpMangaReaderGenerator.run.xml index 5aab1ea242..b8da10d7e6 100644 --- a/.run/WpMangaReaderGenerator.run.xml +++ b/.run/WpMangaReaderGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/ZMangaGenerator.run.xml b/.run/ZMangaGenerator.run.xml index 71a9718902..e47185c934 100644 --- a/.run/ZMangaGenerator.run.xml +++ b/.run/ZMangaGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/.run/ZbuluGenerator.run.xml b/.run/ZbuluGenerator.run.xml index f46e0eb287..7374b7d713 100644 --- a/.run/ZbuluGenerator.run.xml +++ b/.run/ZbuluGenerator.run.xml @@ -1,17 +1,11 @@ - - - \ No newline at end of file + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d589976f8..d566590318 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -82,6 +82,8 @@ Some alternative steps can be followed to ignore "repo" branch and skip unrelate # allow a multisrc theme /multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ /multisrc/overrides/ + # or type the source name directly + ``` 4. Configure remotes. ```bash @@ -496,6 +498,9 @@ with open(f"{package}/src/{source}.kt", "w") as f: - For each time a source changes in a way that should the version increase, `overrideVersionCode` should be increased by one. - When a theme's default implementation changes, `baseVersionCode` should be increased, the initial value should be `1`. - For example, for a new theme with a new source, extention version code will be `0 + 0 + 1 = 1`. +- `IntelijConfigurationGeneratorMainKt` should be run on creating or removing a multisrc theme. + - On removing a theme, you can manually remove the corresponding configuration in the `.run` folder instead. + - Be careful if you're using sparse checkout. If other configurations are accidentally removed, `git add` the file you want and `git restore` the others. Another choice is to allow `/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/*` before running the generator. ## Running diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index b43002ce3e..9adf5ba48c 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -71,14 +71,24 @@ tasks { throw Exception("Java process failed with exit code: $exitCode") } } - dependsOn("ktFormat", "ktLint", "assembleDebug") + dependsOn("ktLint", "assembleDebug") } register("ktLint") { + if (project.hasProperty("theme")) { + val theme = project.property("theme") + source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme")) + return@register + } source(files("src", "overrides")) } register("ktFormat") { + if (project.hasProperty("theme")) { + val theme = project.property("theme") + source(files("src/main/java/eu/kanade/tachiyomi/multisrc/$theme", "overrides/$theme")) + return@register + } source(files("src", "overrides")) } } diff --git a/multisrc/overrides/grouple/allhentai/src/AllHentai.kt b/multisrc/overrides/grouple/allhentai/src/AllHentai.kt index 2217b9217f..e9a7e007bc 100644 --- a/multisrc/overrides/grouple/allhentai/src/AllHentai.kt +++ b/multisrc/overrides/grouple/allhentai/src/AllHentai.kt @@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request -class AllHentai : GroupLe("AllHentai", "http://23.allhen.online", "ru"){ +class AllHentai : GroupLe("AllHentai", "http://23.allhen.online", "ru") { override val id: Long = 1809051393403180443 @@ -52,7 +52,7 @@ class AllHentai : GroupLe("AllHentai", "http://23.allhen.online", "ru"){ } return if (url.toString().contains("?")) GET(url.toString().replace("=%3D", "="), headers) - else popularMangaRequest(page) + else popularMangaRequest(page) } private class OrderBy : Filter.Select( diff --git a/multisrc/overrides/grouple/mintmanga/src/MintManga.kt b/multisrc/overrides/grouple/mintmanga/src/MintManga.kt index 56f492561d..8eeb71a25b 100644 --- a/multisrc/overrides/grouple/mintmanga/src/MintManga.kt +++ b/multisrc/overrides/grouple/mintmanga/src/MintManga.kt @@ -7,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request -class MintManga : GroupLe("MintManga", "https://mintmanga.live", "ru"){ +class MintManga : GroupLe("MintManga", "https://mintmanga.live", "ru") { override val id: Long = 6 @@ -55,7 +55,7 @@ class MintManga : GroupLe("MintManga", "https://mintmanga.live", "ru"){ } return if (url.toString().contains("?")) GET(url.toString().replace("=%3D", "="), headers) - else popularMangaRequest(page) + else popularMangaRequest(page) } private class OrderBy : Filter.Select( diff --git a/multisrc/overrides/grouple/readmanga/src/ReadManga.kt b/multisrc/overrides/grouple/readmanga/src/ReadManga.kt index 97feac3287..911b102f37 100644 --- a/multisrc/overrides/grouple/readmanga/src/ReadManga.kt +++ b/multisrc/overrides/grouple/readmanga/src/ReadManga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.extension.ru.readmanga -import android.widget.Toast import eu.kanade.tachiyomi.multisrc.grouple.GroupLe import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.source.model.Filter @@ -8,7 +7,7 @@ import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request -class ReadManga : GroupLe("ReadManga", "https://readmanga.live", "ru"){ +class ReadManga : GroupLe("ReadManga", "https://readmanga.live", "ru") { override val id: Long = 5 @@ -56,7 +55,7 @@ class ReadManga : GroupLe("ReadManga", "https://readmanga.live", "ru"){ } return if (url.toString().contains("?")) GET(url.toString().replace("=%3D", "="), headers) - else popularMangaRequest(page) + else popularMangaRequest(page) } private class OrderBy : Filter.Select( diff --git a/multisrc/overrides/grouple/rumix/src/RuMIX.kt b/multisrc/overrides/grouple/rumix/src/RuMIX.kt index 26b7e355f3..9ab06a1e69 100644 --- a/multisrc/overrides/grouple/rumix/src/RuMIX.kt +++ b/multisrc/overrides/grouple/rumix/src/RuMIX.kt @@ -1,14 +1,12 @@ package eu.kanade.tachiyomi.extension.ru.rumix -import android.widget.Toast import eu.kanade.tachiyomi.multisrc.grouple.GroupLe import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.Request -class RuMIX : GroupLe("RuMIX", "https://rumix.me", "ru"){ +class RuMIX : GroupLe("RuMIX", "https://rumix.me", "ru") { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { val url = "$baseUrl/search/advanced".toHttpUrlOrNull()!!.newBuilder() @@ -17,7 +15,6 @@ class RuMIX : GroupLe("RuMIX", "https://rumix.me", "ru"){ } return if (url.toString().contains("?")) GET(url.toString().replace("=%3D", "="), headers) - else popularMangaRequest(page) + else popularMangaRequest(page) } - } diff --git a/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt b/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt index 86bc215162..762a2eb44d 100644 --- a/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt +++ b/multisrc/overrides/grouple/selfmanga/src/SelfManga.kt @@ -33,7 +33,7 @@ class SelfManga : GroupLe("SelfManga", "https://selfmanga.live", "ru") { } return if (url.toString().contains("?")) GET(url.toString().replace("=%3D", "="), headers) - else popularMangaRequest(page) + else popularMangaRequest(page) } private class Genre(name: String, val id: String) : Filter.TriState(name) diff --git a/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt b/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt index 39a186dfa8..dc32b5e0f8 100644 --- a/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt +++ b/multisrc/overrides/libgroup/hentailib/src/HentaiLib.kt @@ -48,7 +48,6 @@ class HentaiLib : LibGroup("HentaiLib", "https://hentailib.me", "ru") { return POST(url.toString(), catalogHeaders()) } - // Filters private class SearchFilter(name: String, val id: String) : Filter.TriState(name) diff --git a/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt b/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt index b2b60ee5e5..a1088e3d82 100644 --- a/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt +++ b/multisrc/overrides/libgroup/mangalib/src/MangaLib.kt @@ -15,7 +15,7 @@ import okhttp3.Request import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -class MangaLib : LibGroup("MangaLib", "https://mangalib.me", "ru") { +class MangaLib : LibGroup("MangaLib", "https://mangalib.me", "ru") { override val id: Long = 6111047689498497237 diff --git a/multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt b/multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt index 899d3b307b..8abe8b8cca 100644 --- a/multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt +++ b/multisrc/overrides/libgroup/yaoilib/src/YaoiLib.kt @@ -51,7 +51,6 @@ class YaoiLib : LibGroup("YaoiLib", "https://yaoilib.me", "ru") { return POST(url.toString(), catalogHeaders()) } - // Filters private class SearchFilter(name: String, val id: String) : Filter.TriState(name) private class CheckFilter(name: String, val id: String) : Filter.CheckBox(name) diff --git a/multisrc/overrides/mangaraw/manga1001/src/Manga1001.kt b/multisrc/overrides/mangaraw/manga1001/src/Manga1001.kt index 57402c63d8..f21c0ff046 100644 --- a/multisrc/overrides/mangaraw/manga1001/src/Manga1001.kt +++ b/multisrc/overrides/mangaraw/manga1001/src/Manga1001.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.extension.ja.manga1001 import eu.kanade.tachiyomi.multisrc.mangaraw.MangaRaw -import eu.kanade.tachiyomi.network.GET -class Manga1001 : MangaRaw("Manga1001", "https://manga1001.top") { -} +class Manga1001 : MangaRaw("Manga1001", "https://manga1001.top") diff --git a/multisrc/overrides/mangaraw/manga9co/src/Manga9co.kt b/multisrc/overrides/mangaraw/manga9co/src/Manga9co.kt index f7d46ff122..10e8d8bf1e 100644 --- a/multisrc/overrides/mangaraw/manga9co/src/Manga9co.kt +++ b/multisrc/overrides/mangaraw/manga9co/src/Manga9co.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.ja.manga9co import eu.kanade.tachiyomi.multisrc.mangaraw.MangaRaw 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.SChapter import eu.kanade.tachiyomi.source.model.SManga import okhttp3.Request diff --git a/multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt b/multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt index 205d1212b9..be45ad60ba 100644 --- a/multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt +++ b/multisrc/overrides/mangaraw/syosetu/src/SyoSetu.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.extension.ja.syosetu import eu.kanade.tachiyomi.multisrc.mangaraw.MangaRaw -import eu.kanade.tachiyomi.network.GET import okhttp3.Request class SyoSetu : MangaRaw("SyoSetu", "https://syosetu.top") { diff --git a/multisrc/overrides/multichan/henchan/src/HenChan.kt b/multisrc/overrides/multichan/henchan/src/HenChan.kt index e6f8538c90..e2424b7e2b 100644 --- a/multisrc/overrides/multichan/henchan/src/HenChan.kt +++ b/multisrc/overrides/multichan/henchan/src/HenChan.kt @@ -10,18 +10,18 @@ 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 java.net.URL -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale import okhttp3.Headers import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable +import java.net.URL +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale -class HenChan : MultiChan("HenChan", "https://y.hentaichan.live", "ru"){ +class HenChan : MultiChan("HenChan", "https://y.hentaichan.live", "ru") { override val id: Long = 5504588601186153612 diff --git a/multisrc/overrides/multichan/mangachan/src/MangaChan.kt b/multisrc/overrides/multichan/mangachan/src/MangaChan.kt index 92e0ee3ccb..1a5612c881 100644 --- a/multisrc/overrides/multichan/mangachan/src/MangaChan.kt +++ b/multisrc/overrides/multichan/mangachan/src/MangaChan.kt @@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.Request -class MangaChan : MultiChan("MangaChan", "https://manga-chan.me", "ru"){ +class MangaChan : MultiChan("MangaChan", "https://manga-chan.me", "ru") { override val id: Long = 7 diff --git a/multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt b/multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt index 7daa032a2e..9646b705cb 100644 --- a/multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt +++ b/multisrc/overrides/multichan/yaoichan/src/YaoiChan.kt @@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.source.model.Filter import eu.kanade.tachiyomi.source.model.FilterList import okhttp3.Request -class YaoiChan : MultiChan("YaoiChan", "https://yaoi-chan.me", "ru"){ +class YaoiChan : MultiChan("YaoiChan", "https://yaoi-chan.me", "ru") { override val id: Long = 2466512768990363955 diff --git a/multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt b/multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt index 182c40d28d..c8f6c42bb9 100644 --- a/multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt +++ b/multisrc/overrides/mymangacms/truyentranhlh/src/TruyenTranhLH.kt @@ -65,4 +65,3 @@ class TruyenTranhLH : MyMangaCMS("TruyenTranhLH", "https://truyentranhlh.net", " Genre("Dark Fantasy", 57), ) } - diff --git a/multisrc/overrides/wpmangareader/sushiscan/src/SushiScan.kt b/multisrc/overrides/wpmangareader/sushiscan/src/SushiScan.kt index 2eab1bbaf6..0207ad4361 100644 --- a/multisrc/overrides/wpmangareader/sushiscan/src/SushiScan.kt +++ b/multisrc/overrides/wpmangareader/sushiscan/src/SushiScan.kt @@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.source.model.SManga import java.text.SimpleDateFormat import java.util.Locale - class SushiScan : WPMangaReader("Sushi-Scan", "https://sushiscan.su", "fr", dateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.FRENCH)) { override val altName = "Nom alternatif : " override val seriesStatusSelector = ".tsinfo .imptdt:contains(Statut)" diff --git a/multisrc/overrides/wpmangastream/mangaproz/src/MangaPro.kt b/multisrc/overrides/wpmangastream/mangaproz/src/MangaPro.kt index ea5a0de473..c1fb207f06 100644 --- a/multisrc/overrides/wpmangastream/mangaproz/src/MangaPro.kt +++ b/multisrc/overrides/wpmangastream/mangaproz/src/MangaPro.kt @@ -33,7 +33,8 @@ class MangaPro : WPMangaStream("Manga Pro", "https://mangaprotm.com", "ar") { chapter.setUrlWithoutDomain("") chapter.name = if (urlElement.select("span.chapternum") - .isNotEmpty()) urlElement.select("span.chapternum").text() else urlElement.text() + .isNotEmpty() + ) urlElement.select("span.chapternum").text() else urlElement.text() chapter.name = chapter.name.replace("-*free".toRegex(RegexOption.IGNORE_CASE), "") chapter.date_upload = element.select("span.rightoff, time, span.chapterdate").firstOrNull()?.text() diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt index 557b4d8ce6..2fa7672e3c 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLe.kt @@ -7,7 +7,6 @@ import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.asObservableSuccess import eu.kanade.tachiyomi.network.interceptor.rateLimit import eu.kanade.tachiyomi.source.ConfigurableSource -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 @@ -16,7 +15,6 @@ import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Headers -import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -259,7 +257,7 @@ abstract class GroupLe( } if (!url.contains("://")) url = "https:$url" - pages.add(Page(i++, "", url.replace("//resh","//h"))) + pages.add(Page(i++, "", url.replace("//resh", "//h"))) } return pages } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt index f5938ba19b..e4f9b65168 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/grouple/GroupLeGenerator.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.multisrc.grouple import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator -class GroupLeGenerator: ThemeSourceGenerator { +class GroupLeGenerator : ThemeSourceGenerator { override val themePkg = "grouple" @@ -14,7 +14,7 @@ class GroupLeGenerator: ThemeSourceGenerator { override val sources = listOf( SingleLang("ReadManga", "https://readmanga.live", "ru", overrideVersionCode = 46), SingleLang("MintManga", "https://mintmanga.live", "ru", overrideVersionCode = 46), - SingleLang("AllHentai", "http://23.allhen.online", "ru",isNsfw = true, overrideVersionCode = 22), + SingleLang("AllHentai", "http://23.allhen.online", "ru", isNsfw = true, overrideVersionCode = 22), SingleLang("SelfManga", "https://selfmanga.live", "ru", overrideVersionCode = 22), SingleLang("RuMIX", "https://rumix.me", "ru", overrideVersionCode = 1) ) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt index 7a0c450899..565ec94f17 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGenerator.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.multisrc.libgroup import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator -class LibGenerator: ThemeSourceGenerator { +class LibGenerator : ThemeSourceGenerator { override val themePkg = "libgroup" @@ -13,8 +13,8 @@ class LibGenerator: ThemeSourceGenerator { override val sources = listOf( SingleLang("MangaLib", "https://mangalib.me", "ru", overrideVersionCode = 74), - SingleLang("HentaiLib", "https://hentailib.me", "ru",isNsfw = true, overrideVersionCode = 19), - SingleLang("YaoiLib", "https://yaoilib.me", "ru",isNsfw = true, overrideVersionCode = 1) + SingleLang("HentaiLib", "https://hentailib.me", "ru", isNsfw = true, overrideVersionCode = 19), + SingleLang("YaoiLib", "https://yaoilib.me", "ru", isNsfw = true, overrideVersionCode = 1) ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt index 344fca5d5b..52a2c4f937 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/libgroup/LibGroup.kt @@ -19,12 +19,6 @@ import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.asJsoup -import java.io.IOException -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit -import kotlin.math.absoluteValue -import kotlin.random.Random import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonArray @@ -48,7 +42,12 @@ import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import uy.kohesive.injekt.injectLazy - +import java.io.IOException +import java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit +import kotlin.math.absoluteValue +import kotlin.random.Random abstract class LibGroup( override val name: String, @@ -83,7 +82,7 @@ abstract class LibGroup( .addInterceptor { chain -> val response = chain.proceed(chain.request()) if (response.code == 419) - throw IOException("HTTP error ${response.code}. Для завершения авторизации необходимо перезапустить приложение с полной остановкой.") + throw IOException("HTTP error ${response.code}. Для завершения авторизации необходимо перезапустить приложение с полной остановкой.") return@addInterceptor response } .build() @@ -248,11 +247,11 @@ abstract class LibGroup( SManga.LICENSED } else when { - StatusTranslate.contains("завершен" ) && StatusTitle.contains("приостановлен" ) || StatusTranslate.contains("заморожен" ) || StatusTranslate.contains("заброшен" ) -> SManga.ON_HIATUS - StatusTranslate.contains("завершен" ) && StatusTitle.contains("выпуск прекращён" ) -> SManga.CANCELLED - StatusTranslate.contains("продолжается" ) -> SManga.ONGOING - StatusTranslate.contains("завершен" ) -> SManga.COMPLETED - else -> when (StatusTitle){ + StatusTranslate.contains("завершен") && StatusTitle.contains("приостановлен") || StatusTranslate.contains("заморожен") || StatusTranslate.contains("заброшен") -> SManga.ON_HIATUS + StatusTranslate.contains("завершен") && StatusTitle.contains("выпуск прекращён") -> SManga.CANCELLED + StatusTranslate.contains("продолжается") -> SManga.ONGOING + StatusTranslate.contains("завершен") -> SManga.COMPLETED + else -> when (StatusTitle) { "онгоинг" -> SManga.ONGOING "анонс" -> SManga.ONGOING "завершён" -> SManga.COMPLETED @@ -334,7 +333,7 @@ abstract class LibGroup( } private fun sortChaptersByTranslator - (sortingList: String?, chaptersList: JsonArray?, slug: String, branches: List): List? { + (sortingList: String?, chaptersList: JsonArray?, slug: String, branches: List): List? { var chapters: List? = null val volume = "(?<=/v)[0-9]+(?=/c[0-9]+)".toRegex() val tempChaptersList = mutableListOf() @@ -372,7 +371,7 @@ abstract class LibGroup( } private fun chapterFromElement - (chapterItem: JsonElement, sortingList: String?, slug: String, teamIdParam: Int? = null, branches: List? = null, teams: List? = null, chaptersList: JsonArray? = null): SChapter { + (chapterItem: JsonElement, sortingList: String?, slug: String, teamIdParam: Int? = null, branches: List? = null, teams: List? = null, chaptersList: JsonArray? = null): SChapter { val chapter = SChapter.create() val volume = chapterItem.jsonObject["chapter_volume"]!!.jsonPrimitive.int @@ -417,7 +416,7 @@ abstract class LibGroup( override fun pageListParse(response: Response): List { val document = response.asJsoup() - //redirect Регистрация 18+ + // redirect Регистрация 18+ val redirect = document.html() if (!redirect.contains("window.__info")) { if (redirect.contains("auth-layout")) { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt index 017e783763..238641f9c7 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/ChanGenerator.kt @@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.multisrc.multichan import generator.ThemeSourceData.SingleLang import generator.ThemeSourceGenerator -class ChanGenerator: ThemeSourceGenerator { +class ChanGenerator : ThemeSourceGenerator { override val themePkg = "multichan" @@ -13,8 +13,8 @@ class ChanGenerator: ThemeSourceGenerator { override val sources = listOf( SingleLang("MangaChan", "https://manga-chan.me", "ru", overrideVersionCode = 14), - SingleLang("HenChan", "https://y.hentaichan.live", "ru",isNsfw = true, overrideVersionCode = 35), - SingleLang("YaoiChan", "https://yaoi-chan.me", "ru",isNsfw = true, overrideVersionCode = 4) + SingleLang("HenChan", "https://y.hentaichan.live", "ru", isNsfw = true, overrideVersionCode = 35), + SingleLang("YaoiChan", "https://yaoi-chan.me", "ru", isNsfw = true, overrideVersionCode = 4) ) companion object { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt index 42192adada..b3f544349f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/multichan/MultiChan.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.multisrc.multichan import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.interceptor.rateLimit -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 diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt index e75639780e..81f7d4bfd8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMS.kt @@ -115,9 +115,11 @@ abstract class MyMangaCMS( override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { return when { query.startsWith(PREFIX_URL_SEARCH) -> { - fetchMangaDetails(SManga.create().apply { - url = query.removePrefix(PREFIX_URL_SEARCH).trim().replace(baseUrl, "") - }) + fetchMangaDetails( + SManga.create().apply { + url = query.removePrefix(PREFIX_URL_SEARCH).trim().replace(baseUrl, "") + } + ) .map { MangasPage(listOf(it), false) } } else -> super.fetchSearchManga(page, query, filters) @@ -260,7 +262,8 @@ abstract class MyMangaCMS( val document = response.asJsoup() val originalScanlator = document.select("div.fantrans-value a") val scanlator: String? = if (originalScanlator.isEmpty() || - originalScanlator.first().text().trim().lowercase() == "đang cập nhật") { + originalScanlator.first().text().trim().lowercase() == "đang cập nhật" + ) { null } else { originalScanlator.first().text().trim() diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt index 0f3d43f3e9..a1bf9e32db 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mymangacms/MyMangaCMSUrlActivity.kt @@ -13,11 +13,13 @@ class MyMangaCMSUrlActivity : Activity() { val pathSegments = intent?.data?.pathSegments if (pathSegments != null && pathSegments.size > 1) { try { - startActivity(Intent().apply { - action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query", "${MyMangaCMS.PREFIX_URL_SEARCH}${intent?.data?.path}") - putExtra("filter", packageName) - }) + startActivity( + Intent().apply { + action = "eu.kanade.tachiyomi.SEARCH" + putExtra("query", "${MyMangaCMS.PREFIX_URL_SEARCH}${intent?.data?.path}") + putExtra("filter", packageName) + } + ) } catch (e: ActivityNotFoundException) { Log.e("MyMangaCMSUrlActivity", e.toString()) } diff --git a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt index f8f875b211..ee64760539 100644 --- a/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt +++ b/multisrc/src/main/java/generator/IntelijConfigurationGeneratorMain.kt @@ -31,28 +31,18 @@ fun main(args: Array) { val intellijConfStr = """ - - """.trimIndent() file.writeText(intellijConfStr) - - // Find Java class and extract method lists - Class.forName("eu/kanade/tachiyomi/multisrc/$themeSource/$generatorClass".replace("/", ".").substringBefore(".kt")) - .methods - .find { it.name == "main" } + file.appendText("\n") } } }