From d454ee42381e6eb06b7db1e76a94c4281a5ea56c Mon Sep 17 00:00:00 2001 From: KingLucius Date: Sat, 16 Mar 2024 10:42:39 +0200 Subject: [PATCH 1/3] Prioritize Trailers over Clips --- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index be0a43d9..643bc791 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -244,7 +244,8 @@ open class SoraStream : TmdbProvider() { val recommendations = res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() } - val trailer = res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" } + val trailer = res.videos?.results?.filter { it.type == "Trailer" }?.map { "https://www.youtube.com/watch?v=${it.key}" }.orEmpty() + .ifEmpty { res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" } } return if (type == TvType.TvSeries) { val lastSeason = res.last_episode_to_air?.season_number @@ -785,6 +786,7 @@ open class SoraStream : TmdbProvider() { data class Trailers( @JsonProperty("key") val key: String? = null, + @JsonProperty("type") val type: String? = null, ) data class ResultsTrailer( From f9e025c8e0ac252573a709b692aa64d6ca6841bf Mon Sep 17 00:00:00 2001 From: KingLucius Date: Sat, 16 Mar 2024 10:55:44 +0200 Subject: [PATCH 2/3] Sort the oldest first --- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 643bc791..45b2262b 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -244,7 +244,7 @@ open class SoraStream : TmdbProvider() { val recommendations = res.recommendations?.results?.mapNotNull { media -> media.toSearchResponse() } - val trailer = res.videos?.results?.filter { it.type == "Trailer" }?.map { "https://www.youtube.com/watch?v=${it.key}" }.orEmpty() + val trailer = res.videos?.results?.filter { it.type == "Trailer" }?.map { "https://www.youtube.com/watch?v=${it.key}" }?.reversed().orEmpty() .ifEmpty { res.videos?.results?.map { "https://www.youtube.com/watch?v=${it.key}" } } return if (type == TvType.TvSeries) { From b114c7e15a175f1f7a218580697fb170d9704868 Mon Sep 17 00:00:00 2001 From: KingLucius Date: Sat, 16 Mar 2024 11:27:19 +0200 Subject: [PATCH 3/3] Bump --- SoraStream/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index a1442e30..d07a4844 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.konan.properties.Properties // use an integer for version numbers -version = 228 +version = 229 android { defaultConfig {