@mustafaj/capacitor-plugin-playlist 0.9.6 → 0.9.8

package/README.md

@@ -35,8 +35,8 @@ cordova, and here we wanna give back to the community our outcome, any help is a
 As with most capacitor plugins...
 
 ```
-npm i @mustafaj/capacitor-plugin-playlist
-npx cap sync
+pnpm add @mustafaj/capacitor-plugin-playlist
+pnpm exec cap sync
 ```
 
 ### For web
@@ -46,7 +46,7 @@ include hlsjs in your build
 #### E.G. for Angular 2+:
 
 ```
-npm i hls.js
+pnpm add hls.js
 ```
 
 then add to angular.json:
@@ -168,7 +168,7 @@ Example:
 import {Playlist, AudioTrack} from '@mustafaj/capacitor-plugin-playlist'
 
 const item: AudioTrack = {
-    trackId: 1,
+    trackId: 'track-1',
     assetUrl: 'http://your_audio',
     albumArt: 'http://some_image'
 }

package/android/build.gradle

@@ -1,11 +1,21 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 ext {
+    kotlin_version = project.hasProperty('kotlin_version') ? project.property('kotlin_version') : '2.3.0'
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
     androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
     androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
 }
 
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.13.0'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0'
+    }
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
@@ -34,9 +44,9 @@ android {
     }
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_21
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = '21'
     }
 }
 

package/android/src/main/java/org/dwbn/plugins/playlist/PlaylistPlugin.kt

@@ -3,6 +3,7 @@ package org.dwbn.plugins.playlist
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import com.devbrackets.android.playlistcore.manager.BasePlaylistManager
 import com.devbrackets.android.playlistcore.data.MediaProgress
 import com.getcapacitor.*
 import com.getcapacitor.annotation.CapacitorPlugin
@@ -254,12 +255,13 @@ public class PlaylistPlugin : Plugin(), OnStatusReportListener {
         Handler(Looper.getMainLooper()).post {
             val id: String = call.getString("id")!!
             if ("" != id) {
-                // alternatively we could search for the item and set the current index to that item.
-                val code = id.hashCode()
                 val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
-                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
-                audioPlayerImpl!!.clearTrackSelectionSuppression()
-                audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
+                val itemPosition = audioPlayerImpl!!.playlistManager.findItemPosition(id)
+                if (itemPosition != BasePlaylistManager.INVALID_POSITION) {
+                    audioPlayerImpl!!.playlistManager.currentPosition = itemPosition
+                    audioPlayerImpl!!.clearTrackSelectionSuppression()
+                    audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, false)
+                }
             }
 
             call.resolve()
@@ -293,14 +295,13 @@ public class PlaylistPlugin : Plugin(), OnStatusReportListener {
         Handler(Looper.getMainLooper()).post {
             val id: String = call.getString("id")!!
             if ("" != id) {
-                // alternatively we could search for the item and set the current index to that item.
-                val code = id.hashCode()
-                audioPlayerImpl!!.playlistManager.setCurrentItem(code.toLong())
-                audioPlayerImpl!!.prepareForTrackSelection(id)
-
                 val seekPosition = (call.getFloat("position", 0f)!! * 1000.0f).toLong()
-
-                audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
+                val itemPosition = audioPlayerImpl!!.playlistManager.findItemPosition(id)
+                if (itemPosition != BasePlaylistManager.INVALID_POSITION) {
+                    audioPlayerImpl!!.playlistManager.currentPosition = itemPosition
+                    audioPlayerImpl!!.prepareForTrackSelection(id)
+                    audioPlayerImpl!!.playlistManager.beginPlayback(seekPosition, true)
+                }
             }
             call.resolve()
 

package/android/src/main/java/org/dwbn/plugins/playlist/data/AudioTrack.kt

@@ -5,8 +5,21 @@ import com.devbrackets.android.playlistcore.api.PlaylistItem
 import com.devbrackets.android.playlistcore.manager.BasePlaylistManager
 import org.json.JSONException
 import org.json.JSONObject
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicLong
 
 class AudioTrack (private val config: JSONObject) : PlaylistItem {
+    companion object {
+        private val stable_ids = ConcurrentHashMap<String, Long>()
+        private val next_stable_id = AtomicLong(1)
+
+        fun stableIdFor(trackId: String): Long {
+            return stable_ids.computeIfAbsent(trackId) {
+                next_stable_id.getAndIncrement()
+            }
+        }
+    }
+
     var bufferPercentFloat = 0f
         set(buff) {
             // There is a bug in MediaProgress where if bufferPercent == 100 it sets bufferPercentFloat
@@ -42,7 +55,7 @@ class AudioTrack (private val config: JSONObject) : PlaylistItem {
         get() =
             if (trackId == null) {
                 0
-            } else trackId.hashCode().toLong()
+            } else stableIdFor(trackId!!)
 
     val isStream: Boolean
         get() = config.optBoolean("isStream", false)

package/android/src/main/java/org/dwbn/plugins/playlist/manager/PlaylistManager.kt

@@ -100,6 +100,12 @@ class PlaylistManager(application: Application) :
      * List management
      */
     fun setAllItems(items: List<AudioTrack>?, options: PlaylistItemOptions) {
+        val retainedPosition =
+            if (options.retainPosition) {
+                currentProgress?.position ?: 0
+            } else {
+                0
+            }
         clearItems()
         addAllItems(items)
         currentPosition = 0
@@ -108,10 +114,7 @@ class PlaylistManager(application: Application) :
         if (options.playFromPosition > 0) {
             seekStart = options.playFromPosition
         } else if (options.retainPosition) {
-            val progress = currentProgress
-            if (progress != null) {
-              seekStart = progress.position
-            }
+            seekStart = retainedPosition
         }
 
         // If the options said to start from a specific id, do so.
@@ -120,8 +123,10 @@ class PlaylistManager(application: Application) :
             idStart = options.playFromId
         }
         if (idStart != null && "" != idStart) {
-            val code = idStart.hashCode()
-            setCurrentItem(code.toLong())
+            val itemPosition = findItemPosition(idStart)
+            if (itemPosition != INVALID_POSITION) {
+                currentPosition = itemPosition
+            }
         }
 
         // We assume that if the playlist is fully loaded in one go,
@@ -160,7 +165,8 @@ class PlaylistManager(application: Application) :
         if (playlistHandler != null) {
             playlistHandler!!.pause(true)
         }
-        var currentPosition = currentPosition
+        val previousPosition = currentPosition
+        val currentItem = currentItem
         var foundItem: AudioTrack? = null
         var removingCurrent = false
 
@@ -181,7 +187,14 @@ class PlaylistManager(application: Application) :
             audioTracks.removeAt(resolvedIndex)
         }
         items = audioTracks
-        currentPosition = if (removingCurrent) currentPosition else audioTracks.indexOf(currentItem)
+        currentPosition =
+            if (audioTracks.isEmpty()) {
+                INVALID_POSITION
+            } else if (removingCurrent) {
+                previousPosition.coerceAtMost(audioTracks.lastIndex)
+            } else {
+                audioTracks.indexOf(currentItem).takeIf { it >= 0 } ?: INVALID_POSITION
+            }
         // If removing the current item, start from beginning (0), otherwise preserve playback position
         val seekStart = if (removingCurrent) 0 else seekPosition
         beginPlayback(seekStart, !wasPlaying)
@@ -197,8 +210,8 @@ class PlaylistManager(application: Application) :
         if (playlistHandler != null) {
             playlistHandler!!.pause(true)
         }
-        var currentPosition = currentPosition
-        val currentItem = currentItem // may be null
+        val previousPosition = currentPosition
+        val currentItem = currentItem
         var removingCurrent = false
 
         // Get the current playback position in milliseconds before removing items
@@ -232,7 +245,14 @@ class PlaylistManager(application: Application) :
             }
         }
         items = audioTracks
-        currentPosition = if (removingCurrent) currentPosition else audioTracks.indexOf(currentItem)
+        currentPosition =
+            if (audioTracks.isEmpty()) {
+                INVALID_POSITION
+            } else if (removingCurrent) {
+                previousPosition.coerceAtMost(audioTracks.lastIndex)
+            } else {
+                audioTracks.indexOf(currentItem).takeIf { it >= 0 } ?: INVALID_POSITION
+            }
         // If removing the current item, start from beginning (0), otherwise preserve playback position
         val seekStart = if (removingCurrent) 0 else seekPosition
         beginPlayback(seekStart, !wasPlaying)
@@ -255,7 +275,7 @@ class PlaylistManager(application: Application) :
         if (trackIndex >= 0 && trackIndex < audioTracks.size) {
             resolvedPosition = trackIndex
         } else if ("" != trackId) {
-            val itemPos = getPositionForItem(trackId.hashCode().toLong())
+            val itemPos = getPositionForItem(AudioTrack.stableIdFor(trackId))
             if (itemPos != INVALID_POSITION) {
                 resolvedPosition = itemPos
             }
@@ -263,6 +283,17 @@ class PlaylistManager(application: Application) :
         return resolvedPosition
     }
 
+    fun findItemPosition(trackId: String?): Int {
+        if (trackId.isNullOrEmpty()) {
+            return INVALID_POSITION
+        }
+        val itemPos = getPositionForItem(AudioTrack.stableIdFor(trackId))
+        if (itemPos != INVALID_POSITION) {
+            return itemPos
+        }
+        return audioTracks.indexOfFirst { it.trackId == trackId }
+    }
+
     fun getVolumeLeft(): Float {
         return volumeLeft
     }