wrap as much as pissible in update{} in NewPlayerImpl

TeamNewPipe · Oct 23, 2024 · 88d3bf0 · 88d3bf0
1 parent 345fd37
commit 88d3bf0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/NewPlayerImpl.kt
@@ -234,20 +234,20 @@ class NewPlayerImpl(
             @OptIn(UnstableApi::class)
             override fun onTracksChanged(tracks: Tracks) {
                 super.onTracksChanged(tracks)
-                val streamTracks =
-                    TrackUtils.streamTracksFromMedia3Tracks(tracks, onlySelectedTracks = true)
-                        .ifEmpty {
-                            TrackUtils.streamTracksFromMedia3Tracks(
-                                tracks,
-                                onlySelectedTracks = false
-                            )
-                        }
-                streamTracks.joinToString("\n") { it.toString() }
-                Log.d(
-                    TAG,
-                    "currently playing tracks: \n ${streamTracks.joinToString("\n") { it.toString() }}"
-                )
                 mutableCurrentlyPlayingTracks.update {
+                    val streamTracks =
+                        TrackUtils.streamTracksFromMedia3Tracks(tracks, onlySelectedTracks = true)
+                            .ifEmpty {
+                                TrackUtils.streamTracksFromMedia3Tracks(
+                                    tracks,
+                                    onlySelectedTracks = false
+                                )
+                            }
+                    Log.d(
+                        TAG,
+                        "currently playing tracks: \n ${streamTracks.joinToString("\n") { it.toString() }}"
+                    )
+
                     streamTracks
                 }
             }
@@ -304,16 +304,19 @@ class NewPlayerImpl(
     init {
         playerScope.launch {
             currentlyPlaying.collect { playing ->
-                playing?.let {
-                    try {
-                        val chapters =
-                            repository.getChapters(
-                                uniqueIdToStreamSelectionLookup[playing.mediaId.toLong()]!!.item
-                            )
-                        mutableCurrentChapter.update { chapters }
-                    } catch (e: Exception) {
-                        mutableErrorFlow.emit(e)
-                    }
+                mutableCurrentChapter.update {
+                    playing?.let {
+                        try {
+                            val chapters =
+                                repository.getChapters(
+                                    uniqueIdToStreamSelectionLookup[playing.mediaId.toLong()]!!.item
+                                )
+                            return@let chapters
+                        } catch (e: Exception) {
+                            mutableErrorFlow.emit(e)
+                            return@let emptyList()
+                        }
+                    } ?: emptyList()
                 }
             }
         }