Better music service, fixed "collect" bug

maxrave-dev · Oct 8, 2023 · 972b686 · 972b686
1 parent a7bf7d6
commit 972b686
Show file tree

Hide file tree

Showing 12 changed files with 442 additions and 421 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/common/Config.kt b/app/src/main/java/com/maxrave/simpmusic/common/Config.kt
@@ -21,6 +21,7 @@ object Config {
     const val RADIO_CLICK = "RADIO_CLICK"
     const val MINIPLAYER_CLICK = "MINIPLAYER_CLICK"
     const val SHARE = "SHARE"
+    const val RECOVER_TRACK_QUEUE = "RECOVER_TRACK_QUEUE"
 
     const val VN = "VN"
 

diff --git a/app/src/main/java/com/maxrave/simpmusic/di/MusicServiceModule.kt b/app/src/main/java/com/maxrave/simpmusic/di/MusicServiceModule.kt
@@ -3,20 +3,27 @@ package com.maxrave.simpmusic.di
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import androidx.core.net.toUri
 import androidx.media3.common.AudioAttributes
 import androidx.media3.common.C
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.DatabaseProvider
 import androidx.media3.database.StandaloneDatabaseProvider
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DataSpec
 import androidx.media3.datasource.DefaultHttpDataSource
+import androidx.media3.datasource.ResolvingDataSource
 import androidx.media3.datasource.cache.CacheDataSource
 import androidx.media3.datasource.cache.CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR
 import androidx.media3.datasource.cache.NoOpCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import androidx.media3.extractor.mkv.MatroskaExtractor
+import androidx.media3.extractor.mp4.FragmentedMp4Extractor
 import androidx.media3.session.MediaSession
+import com.maxrave.simpmusic.common.QUALITY
 import com.maxrave.simpmusic.data.dataStore.DataStoreManager
 import com.maxrave.simpmusic.data.repository.MainRepository
 import com.maxrave.simpmusic.service.SimpleMediaServiceHandler
@@ -28,6 +35,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import javax.inject.Qualifier
 import javax.inject.Singleton
 
@@ -100,14 +109,53 @@ object MusicServiceModule {
             .setFlags(FLAG_IGNORE_CACHE_ON_ERROR)
     }
 
+//    @Provides
+//    @Singleton
+//    @UnstableApi
+//    fun provideMediaSourceFactory(
+//        @ApplicationContext context: Context,
+//        cacheDataSourceFactory: CacheDataSource.Factory
+//    ): DefaultMediaSourceFactory =
+//        DefaultMediaSourceFactory(context).setDataSourceFactory(cacheDataSourceFactory)
+
+    @Provides
+    @Singleton
+    @UnstableApi
+    fun provideResolvingDataSourceFactory(
+        cacheDataSourceFactory: CacheDataSource.Factory,
+        @DownloadCache downloadCache: SimpleCache, @PlayerCache playerCache: SimpleCache, mainRepository: MainRepository, dataStoreManager: DataStoreManager
+    ): DataSource.Factory {
+        return ResolvingDataSource.Factory(cacheDataSourceFactory) { dataSpec ->
+            val mediaId = dataSpec.key ?: error("No media id")
+            val CHUNK_LENGTH = 512 * 1024L
+            if (downloadCache.isCached(mediaId, dataSpec.position,  if (dataSpec.length >= 0) dataSpec.length else 1) || playerCache.isCached(mediaId, dataSpec.position, CHUNK_LENGTH)) {
+                return@Factory dataSpec
+            }
+            var dataSpecReturn: DataSpec? = null
+            runBlocking {
+                val itag = dataStoreManager.quality.first()
+
+                mainRepository.getStream(mediaId, if (itag == QUALITY.items[0].toString()) QUALITY.itags[0] else QUALITY.itags[1]).collect {
+                    if (it != null) {
+                        dataSpecReturn = dataSpec.withUri(it.toUri())
+                    }
+                }
+            }
+            return@Factory dataSpecReturn!!
+        }
+    }
+
     @Provides
     @Singleton
     @UnstableApi
     fun provideMediaSourceFactory(
-        @ApplicationContext context: Context,
-        cacheDataSourceFactory: CacheDataSource.Factory
+        dataSourceFactory: DataSource.Factory
     ): DefaultMediaSourceFactory =
-        DefaultMediaSourceFactory(context).setDataSourceFactory(cacheDataSourceFactory)
+        DefaultMediaSourceFactory(
+            dataSourceFactory
+        ) {
+            arrayOf(MatroskaExtractor(), FragmentedMp4Extractor())
+        }
 
     @Provides
     @Singleton

diff --git a/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt b/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt
@@ -7,8 +7,11 @@ import android.graphics.Color
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
+import androidx.core.net.toUri
 import androidx.datastore.preferences.preferencesDataStore
 import androidx.media3.common.MediaItem
+import androidx.media3.common.MediaMetadata
+import androidx.media3.common.util.UnstableApi
 import androidx.sqlite.db.SimpleSQLiteQuery
 import com.maxrave.kotlinytmusicscraper.models.SongItem
 import com.maxrave.kotlinytmusicscraper.models.VideoItem
@@ -277,6 +280,31 @@ fun MediaItem?.toSongEntity(): SongEntity? {
         downloadState = 0
     ) else null
 }
+@UnstableApi
+fun Track.toMediaItem() : MediaItem {
+    return MediaItem.Builder()
+        .setMediaId(this.videoId)
+        .setUri(this.videoId)
+        .setCustomCacheKey(this.videoId)
+        .setMediaMetadata(
+            MediaMetadata.Builder()
+                .setTitle(this.title)
+                .setArtist(this.artists.toListName().connectArtists())
+                .setArtworkUri(this.thumbnails?.lastOrNull()?.url?.toUri())
+                .setAlbumTitle(this.album?.name)
+                .build()
+        )
+        .build()
+}
+
+@UnstableApi
+fun List<Track>.toMediaItems(): List<MediaItem> {
+    val listMediaItem = mutableListOf<MediaItem>()
+    for (item in this) {
+        listMediaItem.add(item.toMediaItem())
+    }
+    return listMediaItem
+}
 
 @JvmName("SongResulttoListTrack")
 fun ArrayList<SongsResult>.toListTrack(): ArrayList<Track> {

diff --git a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt
@@ -510,13 +510,14 @@ class SimpleMediaServiceHandler @Inject constructor(
         )
     }
     fun release() {
+        stopBufferedUpdate()
+        stopProgressUpdate()
         sendCloseEqualizerIntent()
         player.removeListener(this)
         job?.cancel()
         sleepTimerJob?.cancel()
         volumeNormalizationJob?.cancel()
         updateNotificationJob?.cancel()
-        GlobalScope.cancel()
     }
 
     private fun updateNotification() {

diff --git a/app/src/main/java/com/maxrave/simpmusic/service/test/source/FetchQueue.kt b/app/src/main/java/com/maxrave/simpmusic/service/test/source/FetchQueue.kt