Skip to content

fix: group subtitles by language #3127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
refirestream wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −15
Open

fix: group subtitles by language #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/GeneratorPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.AllLanguagesName
import com.lagradost.cloudstream3.CloudStreamApp
import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
import com.lagradost.cloudstream3.CommonActivity.showToast
Expand Down Expand Up @@ -101,6 +102,7 @@ import com.lagradost.cloudstream3.ui.settings.Globals.isLayout
import com.lagradost.cloudstream3.ui.subtitles.SUBTITLE_AUTO_SELECT_KEY
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment
import com.lagradost.cloudstream3.ui.subtitles.SubtitlesFragment.Companion.getAutoSelectLanguageTagIETF
import com.lagradost.cloudstream3.utils.AppContextUtils.getApiProviderLangSettings
import com.lagradost.cloudstream3.utils.AppContextUtils.getShortSeasonText
import com.lagradost.cloudstream3.utils.AppContextUtils.html
import com.lagradost.cloudstream3.utils.AppContextUtils.sortSubs
Expand All @@ -112,7 +114,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink
import com.lagradost.cloudstream3.utils.ExtractorLinkType
import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showDialog
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToEnglishLanguageName
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromCodeToLangTagIETF
import com.lagradost.cloudstream3.utils.SubtitleHelper.fromTagToLanguageName
import com.lagradost.cloudstream3.utils.SubtitleHelper.languages
import com.lagradost.cloudstream3.utils.UIHelper.clipboardHelper
Expand Down Expand Up @@ -1195,20 +1197,26 @@ class GeneratorPlayer : FullScreenPlayer() {
ArrayAdapter<Spanned>(ctx, R.layout.sort_bottom_single_choice)
subsArrayAdapter.add(ctx.getString(R.string.no_subtitles).html())

val unknownGroupName = ctx.getString(R.string.subtitles_group_unknown)
fun groupName(sub: SubtitleData): String {
return fromTagToLanguageName(sub.getIETF_tag())?.takeIf { it.isNotBlank() }
?: unknownGroupName
}

val subtitlesGrouped =
currentSubtitles.groupBy { it.originalName }.map { (key, value) ->
currentSubtitles.groupBy { groupName(it) }.map { (key, value) ->
key to value.sortedBy { it.nameSuffix.toIntOrNull() ?: 0 }
}.toMap()
val subtitlesGroupedList = subtitlesGrouped.entries.toList()

val subtitles = subtitlesGrouped.map { it.key.html() }

val subtitleGroupIndexStart =
subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.originalName) + 1
subtitlesGrouped.keys.indexOf(currentSelectedSubtitles?.let { groupName(it) }) + 1
var subtitleGroupIndex = subtitleGroupIndexStart

val subtitleOptionIndexStart =
subtitlesGrouped[currentSelectedSubtitles?.originalName]?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix }
subtitlesGrouped[currentSelectedSubtitles?.let { groupName(it) }]?.indexOfFirst { it.nameSuffix == currentSelectedSubtitles?.nameSuffix }
?: 0
var subtitleOptionIndex = subtitleOptionIndexStart

Expand All @@ -1232,8 +1240,8 @@ class GeneratorPlayer : FullScreenPlayer() {
val subtitleOptions =
subtitlesGroupedList
.getOrNull(subtitleGroupIndex - 1)?.value?.map { subtitle ->
val nameSuffix = subtitle.nameSuffix.html()
nameSuffix.ifBlank {
val label = subtitle.originalName.html()
label.ifBlank {
when (subtitle.origin) {
SubtitleOrigin.URL -> txt(R.string.subtitles_from_online)
SubtitleOrigin.DOWNLOADED_FILE -> txt(R.string.downloaded)
Expand Down Expand Up @@ -2264,12 +2272,10 @@ class GeneratorPlayer : FullScreenPlayer() {
viewModel.filterSubByLang =
settingsManager.getBoolean(getString(R.string.filter_sub_lang_key), false)
if (viewModel.filterSubByLang) {
val langFromPrefMedia = settingsManager.getStringSet(
this.getString(R.string.provider_lang_key), mutableSetOf("en")
)
viewModel.langFilterList = langFromPrefMedia?.mapNotNull {
fromTagToEnglishLanguageName(it)?.lowercase() ?: return@mapNotNull null
} ?: listOf()
viewModel.langFilterList = ctx.getApiProviderLangSettings().map { tag ->
if (tag == AllLanguagesName) tag
else fromCodeToLangTagIETF(tag)?.lowercase() ?: tag.lowercase()
}
}

// Set up TV clock visibility
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerGeneratorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.lagradost.cloudstream3.AllLanguagesName
import com.lagradost.cloudstream3.LoadResponse
import com.lagradost.cloudstream3.mvvm.Resource
import com.lagradost.cloudstream3.mvvm.launchSafe
Expand Down Expand Up @@ -371,13 +372,18 @@ class PlayerGeneratorViewModel : ViewModel() {
return true
}

/** Only filter out subtitles fetched online */
if (subtitle.origin != SubtitleOrigin.URL) {
if (langFilterList.contains(AllLanguagesName)) {
return true
}

if (subtitle.origin == SubtitleOrigin.DOWNLOADED_FILE) {
return true
}

val subtitleTag = subtitle.getIETF_tag()?.lowercase() ?: return true

return langFilterList.any { lang ->
subtitle.originalName.contains(lang, ignoreCase = true)
subtitleTag == lang || subtitleTag.substringBefore('-') == lang.substringBefore('-')
}
}

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
<string name="subtitles_remove_captions">Remove closed captions from subtitles</string>
<string name="subtitles_remove_bloat">Remove bloat from subtitles</string>
<string name="subtitles_filter_lang">Filter by preferred media language</string>
<string name="subtitles_group_unknown">Unknown</string>
<string name="extras">Extras</string>
<string name="trailer">Trailer</string>
<string name="network_adress_example">https://example.com/example.mp4</string>
Expand Down