Download and cache support added

Author: kshivang

goonj/build.gradle

@@ -58,11 +58,6 @@ dependencies {
     // Cast framework
     implementation 'com.google.android.gms:play-services-cast-framework:17.1.0'
 
-    // Architecture components
-//    implementation 'android.arch.work:work-runtime-ktx:1.0.1'
-//    implementation "android.arch.persistence.room:runtime:1.1.1"
-//    kapt "android.arch.persistence.room:compiler:1.1.1"
-
     // Rx
     api "io.reactivex.rxjava2:rxkotlin:2.4.0"
     api 'io.reactivex.rxjava2:rxandroid:2.1.1'

goonj/src/main/java/ai/rever/goonj/Goonj.kt

@@ -241,8 +241,14 @@ object Goonj {
 
     val downloadStateFlowable: Flowable<DownloadState> get() = GoonjDownloadManager.downloadStateBehaviorSubject.toFlowable(BackpressureStrategy.LATEST).observeOn(AndroidSchedulers.mainThread())
 
+    fun isDownloaded(trackId: String) = GoonjDownloadManager.isDownloaded(trackId)
+
     val trackCompletionObservable: Observable<Track> get() = GoonjPlayerManager.trackCompleteSubject.observeOn(AndroidSchedulers.mainThread())
 
+    var iconWhileDownload: Int = R.drawable.ic_album
+
+    var maxCacheBytes: Long = 200 * 1024 * 1024
+
     // internal method
     internal fun startForeground(notificationId: Int, notification: Notification?) = run {
         startForeground(notificationId, notification)

goonj/src/main/java/ai/rever/goonj/download/AudioDownloadService.kt

@@ -1,5 +1,6 @@
 package ai.rever.goonj.download
 
+import ai.rever.goonj.Goonj
 import ai.rever.goonj.R
 import android.app.Notification
 import androidx.annotation.Nullable
@@ -19,10 +20,12 @@ internal class AudioDownloadService : DownloadService (
     R.string.channel_download_name
 ) {
 
-    override fun getForegroundNotification(downloads: MutableList<Download>?): Notification =
-        DownloadNotificationHelper(this, DOWNLOAD_CHANNEL_ID)
-            .buildProgressNotification(R.drawable.exo_icon_play,
-                null, null, downloads)
+    override fun getForegroundNotification(downloads: MutableList<Download>?): Notification {
+        GoonjDownloadManager.downloadStateBehaviorSubject.onNext(DownloadState.DOWNLOADING)
+        return DownloadNotificationHelper(this, DOWNLOAD_CHANNEL_ID)
+                .buildProgressNotification(Goonj.iconWhileDownload,
+                        null, null, downloads)
+    }
 
     override fun getDownloadManager(): DownloadManager {
         return GoonjDownloadManager.downloadManager

goonj/src/main/java/ai/rever/goonj/models/Track.kt

@@ -22,19 +22,21 @@ import com.google.android.gms.common.images.WebImage
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 import android.os.Parcel
+import io.reactivex.Flowable
+import kotlinx.android.parcel.IgnoredOnParcel
 import java.io.IOException
 
-private val ByteArray.track: Track? get() = run {
-    val parcel = Parcel.obtain()
-    parcel.unmarshall(this, 0, size)
-    parcel.setDataPosition(0) // This is extremely important!
+//private val ByteArray.track: Track? get() = run {
+//    val parcel = Parcel.obtain()
+//    parcel.unmarshall(this, 0, size)
+//    parcel.setDataPosition(0) // This is extremely important!
+//
+//    val result = Track.CREATOR.createFromParcel(parcel)
+//    parcel.recycle()
+//    result
+//}
 
-    val result = Track.CREATOR.createFromParcel(parcel)
-    parcel.recycle()
-    result
-}
-
-val Download.track get() = request.data.track
+//val Download.track get() = request.data.track
 
 internal val Track.Companion.CREATOR get() = TrackCreator.getCreator()
 
@@ -51,6 +53,7 @@ class Track (var id: String = "",
 
     companion object{}
 
+    @IgnoredOnParcel
     private val mediaInfo: MediaInfo? get() {
         if (url.isEmpty()) return null
         val musicMetadata = MediaMetadata(MediaMetadata.MEDIA_TYPE_MUSIC_TRACK)
@@ -69,12 +72,14 @@ class Track (var id: String = "",
             .build()
     }
 
+    @IgnoredOnParcel
     val mediaLoadRequestData: MediaLoadRequestData? get() {
         return MediaLoadRequestData.Builder()
             .setMediaInfo(mediaInfo?: return null)
             .build()
     }
 
+    @IgnoredOnParcel
     val mediaDescription: MediaDescriptionCompat get() {
         val extras = Bundle()
 
@@ -121,23 +126,28 @@ class Track (var id: String = "",
         }
     }
 
-    val toByteArray: ByteArray get() = run {
-        val parcel = Parcel.obtain()
-        writeToParcel(parcel, 0)
-        val bytes = parcel.marshall()
-        parcel.recycle()
-        return bytes
-    }
+//    @IgnoredOnParcel
+//    val toByteArray: ByteArray get() = run {
+//        val parcel = Parcel.obtain()
+//        writeToParcel(parcel, 0)
+//        val bytes = parcel.marshall()
+//        parcel.recycle()
+//        return bytes
+//    }
 
+    @IgnoredOnParcel
     val download: Download? get() = try {
-        GoonjDownloadManager.downloadManager.downloadIndex.getDownload(url)
+        GoonjDownloadManager.downloadManager.downloadIndex.getDownload(id)
     } catch (e: IOException) {
         null
     }
 
-    val downloadFlowable get() = downloadStateFlowable.skipWhile {
-        it == DownloadState.REQUIREMENT_STATE_CHANGED
-    }.map { download }
+    @IgnoredOnParcel
+    val isDownloadActiveFlowable: Flowable<Boolean?> get() = downloadStateFlowable.map { download != null }
+
+    fun requestDownload() = GoonjDownloadManager.addDownload(id, url.toUri())
+
+    fun removeDownload() = GoonjDownloadManager.removeDownload(id)
 }
 
 

goonj/src/main/java/ai/rever/goonj/player/imp/LocalAudioPlayer.kt

@@ -236,7 +236,8 @@ internal class LocalAudioPlayer: AudioPlayer {
     private var isNotPrepared = true
     override fun enqueue(track: Track, index : Int) {
         val mediaSource = ProgressiveMediaSource.Factory(cacheDataSourceFactory)
-            .createMediaSource(track.url.toUri())
+                .setCustomCacheKey(track.id)
+                .createMediaSource(track.url.toUri())
 
         concatenatingMediaSource.addMediaSource(index, mediaSource)