Add setMediaListAndPlay to PlayerRepository

media-data/src/main/java/com/google/android/horologist/media/data/repository/PlayerRepositoryImpl.kt

@@ -19,6 +19,7 @@ package com.google.android.horologist.media.data.repository
 import android.util.Log
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
+import androidx.media3.common.Timeline
 import com.google.android.horologist.media.data.ExperimentalHorologistMediaDataApi
 import com.google.android.horologist.media.data.mapper.MediaItemMapper
 import com.google.android.horologist.media.data.mapper.MediaMapper
@@ -90,13 +91,17 @@ public class PlayerRepositoryImpl(
 
     private var _playbackSpeed = MutableStateFlow(1f)
 
+    // https://github.com/google/horologist/issues/496
+    private var mediaIndexToSeekTo: Int? = null
+
     /**
      * The current playback speed relative to 1.0.
      */
     public val playbackSpeed: StateFlow<Float>
         get() = _playbackSpeed
 
     private val listener = object : Player.Listener {
+
         override fun onEvents(player: Player, events: Player.Events) {
             if (events.contains(Player.EVENT_AVAILABLE_COMMANDS_CHANGED)) {
                 updateAvailableCommands(player)
@@ -125,6 +130,19 @@ public class PlayerRepositoryImpl(
                 updateState(player)
             }
         }
+
+        // https://github.com/google/horologist/issues/496
+        override fun onTimelineChanged(timeline: Timeline, reason: Int) {
+            mediaIndexToSeekTo?.let { index ->
+                _player.value?.let { player ->
+                    player.seekTo(index, 0)
+                    player.prepare()
+                    player.play()
+                }
+
+                mediaIndexToSeekTo = null
+            }
+        }
     }
 
     private fun updatePlaybackSpeed(player: Player) {
@@ -315,6 +333,16 @@ public class PlayerRepositoryImpl(
         }
     }
 
+    override fun setMediaListAndPlay(mediaList: List<Media>, index: Int) {
+        checkNotClosed()
+
+        player.value?.let {
+            it.setMediaItems(mediaList.map(mediaItemMapper::map))
+
+            mediaIndexToSeekTo = index
+        }
+    }
+
     override fun addMedia(media: Media) {
         checkNotClosed()
 

media-data/src/test/java/com/google/android/horologist/media/data/repository/PlayerRepositoryImplCloseTest.kt

@@ -122,6 +122,9 @@ class PlayerRepositoryImplCloseTest(
             param("setMediaList") { sut: PlayerRepositoryImpl, _: Context ->
                 sut.setMediaList(listOf(getDummyMedia()))
             },
+            param("setMediaListAndPlay") { sut: PlayerRepositoryImpl, _: Context ->
+                sut.setMediaListAndPlay(listOf(getDummyMedia(), getDummyMedia()), 1)
+            },
             param("addMedia") { sut: PlayerRepositoryImpl, _: Context ->
                 sut.addMedia(getDummyMedia())
             },

media-data/src/test/java/com/google/android/horologist/media/data/repository/PlayerRepositoryImplNotConnectedTest.kt

@@ -123,6 +123,9 @@ class PlayerRepositoryImplNotConnectedTest(
             param("setMedia") { sut: PlayerRepositoryImpl ->
                 sut.setMedia(getDummyMedia())
             },
+            param("setMediaListAndPlay") { sut: PlayerRepositoryImpl ->
+                sut.setMediaListAndPlay(listOf(getDummyMedia(), getDummyMedia()), 1)
+            },
             param("setMediaList") { sut: PlayerRepositoryImpl ->
                 sut.setMediaList(listOf(getDummyMedia()))
             },

media-data/src/test/java/com/google/android/horologist/media/data/repository/PlayerRepositoryImplTest.kt

@@ -39,6 +39,7 @@ import com.google.common.truth.Truth.assertThat
 import org.junit.Assert.assertThrows
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -564,6 +565,36 @@ class PlayerRepositoryImplTest {
         )
     }
 
+    @Ignore("Fix test once this issue is fixed: https://github.com/androidx/media/issues/85")
+    @Test
+    fun `given NO previous MediaList is set when setMediaListAndPlay then state is correct`() {
+        // given
+        val player = TestExoPlayerBuilder(context).build()
+        sut.connect(player) {}
+
+        val media1 = getStubMedia("id1")
+        val media2 = getStubMedia("id2")
+        val mediaList = listOf(media1, media2)
+
+        // when
+        sut.setMediaListAndPlay(mediaList, 1)
+        runUntilPendingCommandsAreFullyHandled(player)
+
+        // then
+        assertThat(sut.getMediaCount()).isEqualTo(2)
+        assertThat(sut.getMediaAt(0)).isEqualTo(media1)
+        assertThat(sut.getMediaAt(1)).isEqualTo(media2)
+        assertThat(sut.currentState.value).isEqualTo(PlayerState.Playing)
+        assertThat(sut.currentMedia.value).isEqualTo(media2)
+        assertThat(sut.playbackSpeed.value).isEqualTo(1f)
+        assertThat(sut.shuffleModeEnabled.value).isFalse()
+        assertThat(sut.player.value).isSameInstanceAs(player)
+        assertThat(sut.mediaPosition.value).isEqualTo(MediaPosition.UnknownDuration(0.seconds))
+        assertThat(sut.availableCommands.value).containsExactlyElementsIn(
+            listOf(Command.PlayPause, Command.SkipToPreviousMedia, Command.SetShuffle)
+        )
+    }
+
     @Test
     fun `given NO previous Media is set when addMedia then state is correct`() {
         // given

media-ui/src/androidTest/java/com/google/android/horologist/test/toolbox/testdoubles/FakePlayerRepository.kt

@@ -112,6 +112,10 @@ class FakePlayerRepository : PlayerRepository {
         _currentMedia.value = mediaList[currentItemIndex]
     }
 
+    override fun setMediaListAndPlay(mediaList: List<Media>, index: Int) {
+        // do nothing
+    }
+
     override fun addMedia(media: Media) {
         // do nothing
     }

media-ui/src/test/java/com/google/android/horologist/test/toolbox/testdoubles/StubPlayerRepository.kt

@@ -29,6 +29,7 @@ import kotlin.time.Duration.Companion.seconds
 
 @OptIn(ExperimentalHorologistMediaApi::class)
 class StubPlayerRepository : PlayerRepository {
+
     override val connected: StateFlow<Boolean>
         get() = MutableStateFlow(false)
 
@@ -99,6 +100,10 @@ class StubPlayerRepository : PlayerRepository {
         // do nothing
     }
 
+    override fun setMediaListAndPlay(mediaList: List<Media>, index: Int) {
+        // do nothing
+    }
+
     override fun addMedia(media: Media) {
         // do nothing
     }

media/api/current.api

@@ -110,6 +110,7 @@ package com.google.android.horologist.media.repository {
     method public void seekToDefaultPosition(int mediaIndex);
     method public void setMedia(com.google.android.horologist.media.model.Media media);
     method public void setMediaList(java.util.List<com.google.android.horologist.media.model.Media> mediaList);
+    method public void setMediaListAndPlay(java.util.List<com.google.android.horologist.media.model.Media> mediaList, int index);
     method public void setShuffleModeEnabled(boolean shuffleModeEnabled);
     method public void skipToNextMedia();
     method public void skipToPreviousMedia();

media/src/main/java/com/google/android/horologist/media/repository/PlayerRepository.kt

@@ -132,10 +132,19 @@ public interface PlayerRepository {
      * Clears the playlist, adds the specified [Media] list and resets the position to
      * the default position.
      *
-     * @param mediaList The new [Media].
+     * @param mediaList The new [Media] list.
      */
     public fun setMediaList(mediaList: List<Media>)
 
+    /**
+     * Clears the playlist, adds the specified [Media] list and plays the [Media] at the position of
+     * the index passed as param.
+     *
+     * @param mediaList The new [Media] list.
+     * @param index The new position.
+     */
+    public fun setMediaListAndPlay(mediaList: List<Media>, index: Int)
+
     /**
      * Adds a [Media] to the end of the playlist.
      */