diff --git a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt index 691f47b68..100e22c74 100644 --- a/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt +++ b/multisrc/overrides/madara/midnightmessscans/src/MidnightMessScans.kt @@ -84,10 +84,10 @@ class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.or // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it.notUpdating()) { - manga.description += when { - manga.description.isNullOrEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not() && it.notUpdating()) { + manga.description = when { + manga.description.isNullOrBlank() -> altName + it + else -> manga.description + "\n\n$altName" + it } } } @@ -95,7 +95,7 @@ class MidnightMessScans : Madara("Midnight Mess Scans", "https://midnightmess.or return manga } - + override fun getGenreList() = listOf( Genre("Bilibili", "bilibili"), Genre("Complete", "complete"), diff --git a/multisrc/overrides/wpmangareader/gsnation/src/ReaperScansFR.kt b/multisrc/overrides/wpmangareader/gsnation/src/ReaperScansFR.kt index c2444e2bc..f5cec9830 100644 --- a/multisrc/overrides/wpmangareader/gsnation/src/ReaperScansFR.kt +++ b/multisrc/overrides/wpmangareader/gsnation/src/ReaperScansFR.kt @@ -50,10 +50,10 @@ class ReaperScansFR : WPMangaReader("ReaperScans.fr (GS)", "https://reaperscans. // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } diff --git a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt index 8d9d308db..405b76322 100644 --- a/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt +++ b/multisrc/overrides/wpmangastream/komikcast/src/KomikCast.kt @@ -126,10 +126,10 @@ class KomikCast : WPMangaStream("Komik Cast", "https://komikcast.com", "id") { // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it != "N/A" && it != "-") { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + 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/westmanga/src/WestManga.kt b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt index 0175e6f27..b5b98cdfd 100644 --- a/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt +++ b/multisrc/overrides/wpmangastream/westmanga/src/WestManga.kt @@ -38,10 +38,10 @@ class WestManga : WPMangaStream("West Manga", "https://westmanga.info", "id") { // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it !="N/A" && it != "-") { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + 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/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/fmreader/FMReader.kt index 0a993d9da..000d8d8e6 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 @@ -169,10 +169,10 @@ abstract class FMReader( // add alternative name to manga description infoElement.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it.contains("Updating", true).not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not() && it.contains("Updating", true).not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } 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 a749bab1e..444f73d76 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 @@ -10,7 +10,7 @@ class FMReaderGenerator : ThemeSourceGenerator { override val themeClass = "FMReader" - override val baseVersionCode: Int = 5 + override val baseVersionCode: Int = 6 /** For future sources: when testing and popularMangaRequest() returns a Jsoup error instead of results * most likely the fix is to override popularMangaNextPageSelector() */ 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 81e0a54c5..4427d2218 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 @@ -370,10 +370,10 @@ abstract class Madara( // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it.notUpdating()) { - manga.description += when { - manga.description.isNullOrEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not() && it.notUpdating()) { + manga.description = when { + manga.description.isNullOrBlank() -> altName + it + else -> manga.description + "\n\n$altName" + it } } } 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 328b8cf97..a9929d89b 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 @@ -10,7 +10,7 @@ class MadaraGenerator : ThemeSourceGenerator { override val themeClass = "Madara" - override val baseVersionCode: Int = 8 + override val baseVersionCode: Int = 9 override val sources = listOf( MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 6), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt index e319db3f2..68bed73d6 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/mangabox/MangaBox.kt @@ -157,10 +157,10 @@ abstract class MangaBox( // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } 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 c726733aa..d4d886f4f 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 @@ -9,7 +9,7 @@ class MangaBoxGenerator : ThemeSourceGenerator { override val themeClass = "MangaBox" - override val baseVersionCode: Int = 3 + override val baseVersionCode: Int = 4 override val sources = listOf( SingleLang("Mangakakalot", "https://mangakakalot.com", "en", overrideVersionCode = 3), 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 30c79f430..966184617 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 @@ -232,10 +232,10 @@ abstract class NepNep( // add alternative name to manga description val altName = "Alternative Name: " info.select("li.list-group-item:has(span:contains(Alter))").firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it != "N/A") { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not() && it != "N/A") { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } @@ -392,4 +392,4 @@ abstract class NepNep( Genre("Yaoi"), Genre("Yuri") ) -} \ No newline at end of file +} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt index f074dba5b..6d9517311 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/nepnep/NepNepGenerator.kt @@ -9,7 +9,7 @@ class NepNepGenerator : ThemeSourceGenerator { override val themeClass = "NepNep" - override val baseVersionCode: Int = 5 + override val baseVersionCode: Int = 6 override val sources = listOf( SingleLang("MangaSee", "https://mangasee123.com", "en", overrideVersionCode = 20), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt index c2ae39e62..19659431b 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt @@ -182,10 +182,10 @@ abstract class WPMangaReader( // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } 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 798f04c08..046e8fc51 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 @@ -9,7 +9,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaReader" - override val baseVersionCode: Int = 8 + override val baseVersionCode: Int = 9 override val sources = listOf( SingleLang("Anitation Arts", "https://anitationarts.org", "en", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt index bd0cb3c3f..54abe6cc6 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt @@ -177,10 +177,10 @@ abstract class WPMangaStream( // add alternative name to manga description document.select(altNameSelector).firstOrNull()?.ownText()?.let { - if (it.isEmpty().not() && it != "N/A" && it != "-") { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + 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/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index be4ebce69..86ae957f9 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 @@ -9,7 +9,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaStream" - override val baseVersionCode: Int = 9 + override val baseVersionCode: Int = 10 override val sources = listOf( SingleLang("Asura Scans", "https://www.asurascans.com", "en", overrideVersionCode = 5), diff --git a/src/en/mangahub/build.gradle b/src/en/mangahub/build.gradle index a1eb4ff58..307c53b80 100644 --- a/src/en/mangahub/build.gradle +++ b/src/en/mangahub/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Mangahub' pkgNameSuffix = 'en.mangahub' extClass = '.Mangahub' - extVersionCode = 8 + extVersionCode = 9 libVersion = '1.2' } diff --git a/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt b/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt index b8b7d97b4..e4969dba8 100644 --- a/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt +++ b/src/en/mangahub/src/eu/kanade/tachiyomi/extension/en/mangahub/Mangahub.kt @@ -89,11 +89,12 @@ class Mangahub : ParsedHttpSource() { } // add alternative name to manga description + val altName = "Alternative Name: " document.select("h1 small").firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - manga.description += when { - manga.description!!.isEmpty() -> "Alternative Name: $it" - else -> "\n\nAlternative Name: $it" + if (it.isBlank().not()) { + manga.description = when { + manga.description.isNullOrBlank() -> altName + it + else -> manga.description + "\n\n$altName" + it } } } diff --git a/src/en/mangapark/build.gradle b/src/en/mangapark/build.gradle index 78e15f7ff..04ea89c61 100644 --- a/src/en/mangapark/build.gradle +++ b/src/en/mangapark/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'MangaPark' pkgNameSuffix = 'en.mangapark' extClass = '.MangaPark' - extVersionCode = 21 + extVersionCode = 22 libVersion = '1.2' } diff --git a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt index b2f13c1a3..510675bfe 100644 --- a/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt +++ b/src/en/mangapark/src/eu/kanade/tachiyomi/extension/en/mangapark/MangaPark.kt @@ -121,10 +121,10 @@ class MangaPark : ConfigurableSource, ParsedHttpSource() { // add alternative name to manga description val altName = "Alternative Name: " document.select(".attr > tbody > tr:contains(Alter) td").firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } } diff --git a/src/id/maidmanga/build.gradle b/src/id/maidmanga/build.gradle index 1621f3320..c3584df8d 100644 --- a/src/id/maidmanga/build.gradle +++ b/src/id/maidmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Maid - Manga' pkgNameSuffix = 'id.maidmanga' extClass = '.MaidManga' - extVersionCode = 8 + extVersionCode = 9 libVersion = '1.2' } diff --git a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt index d41e2e39d..64fcad443 100644 --- a/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt +++ b/src/id/maidmanga/src/eu/kanade/tachiyomi/extension/id/maidmanga/MaidManga.kt @@ -119,10 +119,10 @@ class MaidManga : ParsedHttpSource() { // add alternative name to manga description val altName = "Alternative Name: " document.select(".series-title span").firstOrNull()?.ownText()?.let { - if (it.isEmpty().not()) { - description += when { - description!!.isEmpty() -> altName + it - else -> "\n\n$altName" + it + if (it.isBlank().not()) { + description = when { + description.isNullOrBlank() -> altName + it + else -> description + "\n\n$altName" + it } } }