From 491a39588cf48468d6cc2fee4c5be7c3d29be202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Pe=C3=B1a=20Y=20Lillo?= <80992641+Diegopyl1209@users.noreply.github.com> Date: Wed, 3 Aug 2022 03:19:29 -0400 Subject: [PATCH] added subs language preference [zoro] (#720) * added subs language preference [zoro] * version update --- src/en/zoro/build.gradle | 2 +- .../tachiyomi/animeextension/en/zoro/Zoro.kt | 39 ++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/en/zoro/build.gradle b/src/en/zoro/build.gradle index 272ad0bd1..74eb71888 100644 --- a/src/en/zoro/build.gradle +++ b/src/en/zoro/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'zoro.to (experimental)' pkgNameSuffix = 'en.zoro' extClass = '.Zoro' - extVersionCode = 8 + extVersionCode = 9 libVersion = '13' } diff --git a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt index 0a4fb1ffd..5edc8dcb5 100644 --- a/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt +++ b/src/en/zoro/src/eu/kanade/tachiyomi/animeextension/en/zoro/Zoro.kt @@ -124,16 +124,17 @@ class Zoro : ConfigurableAnimeSource, ParsedAnimeHttpSource() { if (!source.contains("{\"sources\":[{\"file\":\"")) return null val json = json.decodeFromString(source) val masterUrl = json["sources"]!!.jsonArray[0].jsonObject["file"]!!.jsonPrimitive.content - val subs = mutableListOf() + val subs2 = mutableListOf() json["tracks"]?.jsonArray ?.filter { it.jsonObject["kind"]!!.jsonPrimitive.content == "captions" } ?.map { track -> val trackUrl = track.jsonObject["file"]!!.jsonPrimitive.content val lang = track.jsonObject["label"]!!.jsonPrimitive.content try { - subs.add(Track(trackUrl, lang)) + subs2.add(Track(trackUrl, lang)) } catch (e: Error) {} } ?: emptyList() + val subs = subLangOrder(subs2) val masterPlaylist = client.newCall(GET(masterUrl)).execute().body!!.string() val videoList = mutableListOf