From 457ba65af25f61705e0388c76ac5d7ab156bc8e3 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sun, 19 Oct 2025 11:47:59 -0600 Subject: [PATCH 1/2] Enable deprecations in SubtitleHelper --- .../syncproviders/providers/SubSource.kt | 2 +- .../cloudstream3/utils/SubtitleHelper.kt | 33 +++++++++++-------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt index df635c13c0..b83c366e98 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt @@ -29,7 +29,7 @@ class SubSourceApi : SubtitleAPI() { //Only supports Imdb Id search for now if (query.imdbId == null) return null - val queryLang = SubtitleHelper.fromTwoLettersToLanguage(query.lang!!) + val queryLang = SubtitleHelper.fromTagToLanguageName(query.lang) val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie val searchRes = app.post( diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt index ddd51891a8..d406e824af 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt +++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt @@ -103,9 +103,11 @@ object SubtitleHelper { return langMetadata } - // @Deprecated( - // "Default language code changed to IETF BCP 47 tag", - // replaceWith = ReplaceWith("fromLanguageToTagIETF(input, looseCheck)")) + @Deprecated( + "Default language code changed to IETF BCP 47 tag", + replaceWith = ReplaceWith("fromLanguageToTagIETF(input, looseCheck)"), + level = DeprecationLevel.WARNING + ) /** * Language name (english or native) -> ISO_639_1 * @param input language name @@ -115,10 +117,11 @@ object SubtitleHelper { return getLanguageDataFromName(input, looseCheck)?.ISO_639_1 } - - // @Deprecated( - // "Default language code changed to IETF BCP 47 tag", - // replaceWith = ReplaceWith("fromLanguageToTagIETF(input)")) + @Deprecated( + "Default language code changed to IETF BCP 47 tag", + replaceWith = ReplaceWith("fromLanguageToTagIETF(input)"), + level = DeprecationLevel.WARNING + ) /** * Language name (english or native) -> ISO_639_3 */ @@ -154,9 +157,11 @@ object SubtitleHelper { return languages.getOrNull(index) } - // @Deprecated( - // "Default language code changed to IETF BCP 47 tag", - // replaceWith = ReplaceWith("fromTagToLanguageName(input)")) + @Deprecated( + "Default language code changed to IETF BCP 47 tag", + replaceWith = ReplaceWith("fromTagToLanguageName(input)"), + level = DeprecationLevel.WARNING + ) /** * Language code -> language english name */ @@ -164,9 +169,11 @@ object SubtitleHelper { return getLanguageDataFromCode(input)?.languageName } - // @Deprecated( - // "Default language code changed to IETF BCP 47 tag", - // replaceWith = ReplaceWith("fromTagToLanguageName(input)")) + @Deprecated( + "Default language code changed to IETF BCP 47 tag", + replaceWith = ReplaceWith("fromTagToLanguageName(input)"), + level = DeprecationLevel.WARNING + ) /** * Language code -> language english name */ From 8047ef69d9436f33d6704e2a0a8428541f225ee2 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:06:04 -0600 Subject: [PATCH 2/2] Apply suggestions from code review Use fromTagToEnglishLanguageName Co-authored-by: Diogo <24511782+diogob003@users.noreply.github.com> --- .../cloudstream3/syncproviders/providers/SubSource.kt | 2 +- .../kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt index b83c366e98..19122768e2 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/SubSource.kt @@ -29,7 +29,7 @@ class SubSourceApi : SubtitleAPI() { //Only supports Imdb Id search for now if (query.imdbId == null) return null - val queryLang = SubtitleHelper.fromTagToLanguageName(query.lang) + val queryLang = SubtitleHelper.fromTagToEnglishLanguageName(query.lang) val type = if ((query.seasonNumber ?: 0) > 0) TvType.TvSeries else TvType.Movie val searchRes = app.post( diff --git a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt index d406e824af..cdfb6e9d71 100644 --- a/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt +++ b/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt @@ -159,7 +159,7 @@ object SubtitleHelper { @Deprecated( "Default language code changed to IETF BCP 47 tag", - replaceWith = ReplaceWith("fromTagToLanguageName(input)"), + replaceWith = ReplaceWith("fromTagToEnglishLanguageName(input)"), level = DeprecationLevel.WARNING ) /** @@ -171,7 +171,7 @@ object SubtitleHelper { @Deprecated( "Default language code changed to IETF BCP 47 tag", - replaceWith = ReplaceWith("fromTagToLanguageName(input)"), + replaceWith = ReplaceWith("fromTagToEnglishLanguageName(input)"), level = DeprecationLevel.WARNING ) /**