From 473a13b3e47753bb45aaa7545203a565574ca1de Mon Sep 17 00:00:00 2001 From: Samfun75 <38332931+Samfun75@users.noreply.github.com> Date: Sat, 8 Apr 2023 13:20:49 +0300 Subject: [PATCH] SuperStream: Clean up writers and directors (#1475) --- src/en/superstream/build.gradle | 2 +- .../en/superstream/SuperStream.kt | 53 ++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/en/superstream/build.gradle b/src/en/superstream/build.gradle index 7e73fc94e..c4416c7d1 100644 --- a/src/en/superstream/build.gradle +++ b/src/en/superstream/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'SuperStream' pkgNameSuffix = 'en.superstream' extClass = '.SuperStream' - extVersionCode = 8 + extVersionCode = 9 libVersion = '13' } diff --git a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt index c402d3cf1..3b7a9ea44 100644 --- a/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt +++ b/src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStream.kt @@ -146,20 +146,22 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() { ani.genre = movie.cats!!.split(",").let { genArray -> genArray.joinToString { genList -> genList.replaceFirstChar { gen -> gen.uppercase() } } } - ani.description = movie.description ani.status = SAnime.COMPLETED - ani.author = movie.writer!!.substringBefore("\n").split(",").distinct().joinToString { it } - ani.artist = movie.director!!.substringBefore("\n").split(",").distinct().joinToString { it } + ani.author = movie.writer?.substringBefore(",") + ani.artist = movie.director?.substringBefore(",") - val releasedDate = "Released: " - movie.released?.let { date -> - if (date.isEmpty().not()) { - ani.description = when { - ani.description.isNullOrBlank() -> releasedDate + movie.released - else -> ani.description + "\n\n$releasedDate" + movie.released - } - } - } + ani.description = (if (movie.description.isNullOrBlank()) "" else movie.description + "\n\n") + + (if (movie.released.isNullOrBlank().not()) "Released: " + movie.released else "") + + ( + "\n\nWriters: " + ( + movie.writer?.substringBefore("\n") + ?.split(",")?.distinct()?.joinToString { it } ?: "" + ) + + "\n\nDirectors: " + ( + movie.director?.substringBefore("\n") + ?.split(",")?.distinct()?.joinToString { it } ?: "" + ) + ) } else { detail?.let { ani.title = it.title ?: "Series" @@ -167,19 +169,22 @@ class SuperStream : ConfigurableAnimeSource, AnimeHttpSource() { genArray.joinToString { genList -> genList.replaceFirstChar { gen -> gen.uppercase() } } } ani.description = it.description - ani.status = SAnime.UNKNOWN - ani.author = it.writer!!.substringBefore("\n").split(",").distinct().joinToString() - ani.artist = it.director!!.substringBefore("\n").split(",").distinct().joinToString() + ani.status = SAnime.COMPLETED + ani.author = it.writer?.substringBefore("\n")?.substringBefore(",") + ani.artist = it.director?.substringBefore("\n")?.substringBefore(",") - val releasedDate = "Released: " - it.released?.let { date -> - if (date.isEmpty().not()) { - ani.description = when { - ani.description.isNullOrBlank() -> releasedDate + it.released - else -> ani.description + "\n\n$releasedDate" + it.released - } - } - } + ani.description = (if (it.description.isNullOrBlank()) "" else it.description + "\n\n") + + (if (it.released.isNullOrBlank().not()) "Released: " + it.released else "") + + ( + "\n\nWriters: " + ( + it.writer?.substringBefore("\n") + ?.split(",")?.distinct()?.joinToString { wrt -> wrt } ?: "" + ) + + "\n\nDirectors: " + ( + it.director?.substringBefore("\n") + ?.split(",")?.distinct()?.joinToString { dir -> dir } ?: "" + ) + ) } } return Observable.just(ani)