bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-07-24 03:36:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Update MediaTrackPreferences handling for improved null safety and initialization

Browse Source
This commit is contained in:
Barnabas Balogh
2026-04-22 19:39:24 +02:00
parent 899e2f08b0
commit 65f2bd811b
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/player/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt
View File

@@ -264,9 +264,9 @@ class PlayerManager @Inject constructor(
_playbackState.update { it.copy(error = null) } _playbackState.update { it.copy(error = null) }
} }
private suspend fun applyTrackPreferences() { private fun applyTrackPreferences() {
val context = currentMediaContext ?: return val context = currentMediaContext ?: return
val preferences = context.preferences ?: return val preferences = context.preferences
val currentTrackState = _tracks.value val currentTrackState = _tracks.value

2
core/player/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt
View File

@@ -5,6 +5,6 @@ import hu.bbara.purefin.core.player.preference.MediaTrackPreferences
data class MediaContext( data class MediaContext(
val mediaId: String, val mediaId: String,
val preferences: MediaTrackPreferences?, val preferences: MediaTrackPreferences,
val mediaSegments: List<MediaSegment> val mediaSegments: List<MediaSegment>
) )

8
core/player/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreference.kt
View File

@@ -13,7 +13,13 @@ data class MediaTrackPreferences(
val mediaId: String, val mediaId: String,
val audioPreference: AudioTrackProperties? = null, val audioPreference: AudioTrackProperties? = null,
val subtitlePreference: SubtitleTrackProperties? = null val subtitlePreference: SubtitleTrackProperties? = null
) ) {
companion object {
fun empty(mediaId: String): MediaTrackPreferences {
return MediaTrackPreferences(mediaId = mediaId)
}
}
}
@Serializable @Serializable
data class AudioTrackProperties( data class AudioTrackProperties(

4
core/player/src/main/java/hu/bbara/purefin/core/player/preference/TrackPreferencesRepository.kt
View File

@@ -10,8 +10,8 @@ class TrackPreferencesRepository @Inject constructor(
) { ) {
val preferences: Flow<TrackPreferences> = trackPreferencesDataStore.data val preferences: Flow<TrackPreferences> = trackPreferencesDataStore.data
fun getMediaPreferences(mediaId: String): Flow<MediaTrackPreferences?> { fun getMediaPreferences(mediaId: String): Flow<MediaTrackPreferences> {
return preferences.map { it.mediaPreferences[mediaId] } return preferences.map { it.mediaPreferences[mediaId] ?: MediaTrackPreferences.empty(mediaId = mediaId) }
} }
suspend fun saveAudioPreference( suspend fun saveAudioPreference(

4
core/player/src/main/java/hu/bbara/purefin/core/player/viewmodel/PlayerViewModel.kt
View File

@@ -17,7 +17,7 @@ import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.InternalSerializationApi
@@ -157,7 +157,7 @@ class PlayerViewModel @Inject constructor(
val (mediaItem, resumePositionMs) = result val (mediaItem, resumePositionMs) = result
val preferenceKey = episodeSeriesLookup.preferenceKeyFor(uuid) val preferenceKey = episodeSeriesLookup.preferenceKeyFor(uuid)
val preferences = trackPreferencesRepository.getMediaPreferences(preferenceKey).firstOrNull() val preferences = trackPreferencesRepository.getMediaPreferences(preferenceKey).first()
val mediaSegments = playableMediaRepository.getMediaSegments(uuid) val mediaSegments = playableMediaRepository.getMediaSegments(uuid)
val mediaContext = MediaContext( val mediaContext = MediaContext(