diff --git a/src/all/kamyroll/build.gradle b/src/all/kamyroll/build.gradle index 940ae70ac..d33a73156 100644 --- a/src/all/kamyroll/build.gradle +++ b/src/all/kamyroll/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Consumyroll' pkgNameSuffix = 'all.kamyroll' extClass = '.Consumyroll' - extVersionCode = 10 + extVersionCode = 11 libVersion = '13' } diff --git a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Consumyroll.kt b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Consumyroll.kt index 3cd11d45f..8bf27a0d1 100644 --- a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Consumyroll.kt +++ b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/Consumyroll.kt @@ -143,16 +143,22 @@ class Consumyroll : ConfigurableAnimeSource, AnimeHttpSource() { val episodes = json.decodeFromString(episodeResp.body!!.string()) episodes.data.sortedBy { it.episode_number }.map { ep -> SEpisode.create().apply { - url = EpisodeData( - ep.versions.map { Pair(it.id, it.audio_locale) } + url = ep.versions?.let { + EpisodeData( + it.map { t -> Pair(t.id, t.audio_locale) } + ).toJsonString() + } ?: EpisodeData( + listOf(Pair(ep.id, ep.audio_locale)) ).toJsonString() name = if (ep.episode_number > 0 || ep.episode.isNumeric()) { "Season ${seasonData.season_number} Ep ${df.format(ep.episode_number)}: " + ep.title } else { ep.title } episode_number = ep.episode_number - date_upload = parseDate(ep.airDate) - scanlator = ep.versions.sortedBy { it.audio_locale } - .joinToString { it.audio_locale.substringBefore("-") } + date_upload = ep.airDate?.let { parseDate(it) } ?: 0L + scanlator = ep.versions?.let { version -> + version.sortedBy { it.audio_locale } + .joinToString { it.audio_locale.substringBefore("-") } + } ?: ep.audio_locale } } }.getOrNull() diff --git a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/DataModel.kt b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/DataModel.kt index f56bfbf19..4bccd2b8f 100644 --- a/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/DataModel.kt +++ b/src/all/kamyroll/src/eu/kanade/tachiyomi/animeextension/all/kamyroll/DataModel.kt @@ -112,13 +112,15 @@ data class EpisodeResult( ) { @Serializable data class Episode( + val id: String, + val audio_locale: String, val title: String, @SerialName("sequence_number") val episode_number: Float, val episode: String, @SerialName("episode_air_date") - val airDate: String, - val versions: ArrayList + val airDate: String? = null, + val versions: ArrayList? = null ) { @Serializable data class Version(