Fix subtitle selection

[CranberrySoup]

Prevents user options getting erased and properly saves and selects the chosen language.

[diogob003]

Did you checked data class SubtitleFile? I feel like the same thing is done 2 times, in SubtitleFile we already try to convert lang -> ietf tag

cloudstream/library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt

Lines 1113 to 1129 in c1a2ae8

	data class SubtitleFile private constructor(
	var lang: String,
	var url: String,
	var headers: Map<String, String>?
	) {
	@Deprecated("Use newSubtitleFile method", level = DeprecationLevel.WARNING)
	constructor(lang: String, url: String) : this(lang = lang, url = url, headers = null)
	/** Language code to properly filter auto select / download subtitles */
	val langTag: String?
	get() = fromCodeToLangTagIETF(lang) ?: fromLanguageToTagIETF(lang, true)
	/** Backwards compatible copy */
	fun copy(
	lang: String = this.lang, url: String = this.url
	): SubtitleFile = SubtitleFile(lang = lang, url = url, headers = this.headers)
	}

[diogob003]

If I remember correctly, SubtitleFile is always turned into SubtitleData
SubtitleFile: what we get from plugins and providers
SubtitleData: the app's internal representation (that has more properties)

[diogob003]

This is basically what is implemented in the library , the key difference is that we turn languages in indexMapLanguageName and indexMapNativeName then get it from the map instead of .equals(cleanedLanguage). By doing it this way, the performance improved.

cloudstream/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt

Lines 81 to 104 in c1a2ae8

	private fun getLanguageDataFromName(languageName: String?, halfMatch: Boolean? = false): LanguageMetadata? {
	if (languageName.isNullOrBlank() || languageName.length < 2) return null
	// Workaround to avoid junk like "English (original audio)" or "Spanish 123"
	// or "اَلْعَرَبِيَّةُ (Original Audio) 1" or "English (hindi sub)"…
	val garbage = Regex(
	"\\([^)]*(?:dub|sub|original|audio|code)[^)]*\\)|" + // junk words in parenthesis
	"[\\u064B-\\u065B]|" + // arabic diacritics
	"\\d|" + // numbers
	"[^\\p{L}\\p{Mn}\\p{Mc}\\p{Me} ()]" // non-letter (from any language)
	)
	val lowLangName = languageName.lowercase().replace(garbage, "").trim()
	val index =
	indexMapLanguageName[lowLangName] ?:
	indexMapNativeName[lowLangName] ?: -1
	val langMetadata = languages.getOrNull(index)
	if (halfMatch == true && langMetadata == null) {
	for (lang in languages)
	if (lang.languageName.contains(lowLangName, ignoreCase = true) ||
	lang.nativeName.contains(lowLangName, ignoreCase = true))
	return lang
	}
	return langMetadata
	}

[diogob003]

I find it more useful to implement the FuzzySearch within the library, so it can be used by extensions as well, and not just by the app itself.

My suggestion is to replace the halfMatch code with the FuzzySearch code. That's what I started doing but never finished or submitted a request 😬.

cloudstream/library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/SubtitleHelper.kt

Lines 81 to 103 in c1a2ae8

	private fun getLanguageDataFromName(languageName: String?, halfMatch: Boolean? = false): LanguageMetadata? {
	if (languageName.isNullOrBlank() || languageName.length < 2) return null
	// Workaround to avoid junk like "English (original audio)" or "Spanish 123"
	// or "اَلْعَرَبِيَّةُ (Original Audio) 1" or "English (hindi sub)"…
	val garbage = Regex(
	"\\([^)]*(?:dub|sub|original|audio|code)[^)]*\\)|" + // junk words in parenthesis
	"[\\u064B-\\u065B]|" + // arabic diacritics
	"\\d|" + // numbers
	"[^\\p{L}\\p{Mn}\\p{Mc}\\p{Me} ()]" // non-letter (from any language)
	)
	val lowLangName = languageName.lowercase().replace(garbage, "").trim()
	val index =
	indexMapLanguageName[lowLangName] ?:
	indexMapNativeName[lowLangName] ?: -1
	val langMetadata = languages.getOrNull(index)
	if (halfMatch == true && langMetadata == null) {
	for (lang in languages)
	if (lang.languageName.contains(lowLangName, ignoreCase = true) ||
	lang.nativeName.contains(lowLangName, ignoreCase = true))
	return lang
	}
	return langMetadata