Fix subtitle selection #2449
+186
−18
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| package com.lagradost.cloudstream3 | ||
|
|
||
| import com.lagradost.cloudstream3.ui.player.SubtitleData | ||
| import com.lagradost.cloudstream3.ui.player.SubtitleOrigin | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertNull | ||
| import org.junit.Test | ||
|
|
||
| /** Ensure partial subtitle language finding is reliable. */ | ||
| class SubtitleLanguageTagTest { | ||
| fun getQuickSubtitle(originalName: String, languageCode: String?): SubtitleData { | ||
| return SubtitleData( | ||
| originalName = originalName, | ||
| nameSuffix = "1", | ||
| url = "https://example.com/test.vtt", | ||
| origin = SubtitleOrigin.URL, | ||
| mimeType = "text/vtt", | ||
| headers = emptyMap(), | ||
| languageCode = languageCode | ||
| ) | ||
| } | ||
|
|
||
| @Test | ||
| fun `returns languageCode directly if already valid IETF tag`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "Anything", | ||
| languageCode = "en" | ||
| ) | ||
|
|
||
| assertEquals("en", subtitle.getIETF_tag()) | ||
| } | ||
|
|
||
| @Test | ||
| fun `matches exact language name`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "English", | ||
| languageCode = null | ||
| ) | ||
|
|
||
| assertEquals("en", subtitle.getIETF_tag()) | ||
| } | ||
|
|
||
| @Test | ||
| fun `matches native language name`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "Español", | ||
| languageCode = null | ||
| ) | ||
|
|
||
| assertEquals("es", subtitle.getIETF_tag()) | ||
| } | ||
|
|
||
| @Test | ||
| fun `matches fuzzy partial language name`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "English [SUB]", | ||
| languageCode = null | ||
| ) | ||
|
|
||
| assertEquals("en", subtitle.getIETF_tag()) | ||
| } | ||
|
|
||
| @Test | ||
| fun `returns null when no language matches`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "Klingon", | ||
| languageCode = null | ||
| ) | ||
|
|
||
| assertNull(subtitle.getIETF_tag()) | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| fun `returns the correct language variant`() { | ||
| val subtitle1 = getQuickSubtitle( | ||
| originalName = "Chinese", | ||
| languageCode = null | ||
| ) | ||
| val subtitle2 = getQuickSubtitle( | ||
| originalName = "Chinese (subtitle)", | ||
| languageCode = null | ||
| ) | ||
| val subtitleSimplified1 = getQuickSubtitle( | ||
| originalName = "Chinese (simplified)", | ||
| languageCode = null | ||
| ) | ||
| val subtitleSimplified2 = getQuickSubtitle( | ||
| originalName = "Chinese - simplified", | ||
| languageCode = null | ||
| ) | ||
| val subtitleSimplified3 = getQuickSubtitle( | ||
| originalName = "Chinese simplified", | ||
| languageCode = "zh-" | ||
| ) | ||
| val subtitleSimplified4 = getQuickSubtitle( | ||
| originalName = "Chinese (simplified)2", | ||
| languageCode = "zh-hans" | ||
| ) | ||
|
|
||
| assertEquals("zh", subtitle1.getIETF_tag()) | ||
| assertEquals("zh", subtitle2.getIETF_tag()) | ||
| assertEquals("zh-hans", subtitleSimplified1.getIETF_tag()) | ||
| assertEquals("zh-hans", subtitleSimplified2.getIETF_tag()) | ||
| assertEquals("zh-hans", subtitleSimplified3.getIETF_tag()) | ||
| assertEquals("zh-hans", subtitleSimplified4.getIETF_tag()) | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| fun `returns exact language matches`() { | ||
| val subtitle = getQuickSubtitle( | ||
| originalName = "en", | ||
| languageCode = null | ||
| ) | ||
|
|
||
| assertEquals("en", subtitle.getIETF_tag()) | ||
| } | ||
| } | ||
|
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I remember correctly,
SubtitleFileis always turned intoSubtitleDataSubtitleFile: what we get from plugins and providers
SubtitleData: the app's internal representation (that has more properties)