fix: indexing stuck sometimes

MSOB7YY · MSOB7YY · commit 567ec4378cf7 · 2025-11-13T23:20:02.000+02:00
ref: #657 #723
diff --git a/android/app/src/main/kotlin/com/msob7y/namida/FAudioTagger.kt b/android/app/src/main/kotlin/com/msob7y/namida/FAudioTagger.kt
@@ -14,7 +14,6 @@ import java.io.File
 import java.io.FileOutputStream
 import java.nio.ByteBuffer
 import java.util.Base64
-import java.util.concurrent.CompletableFuture
 import kotlin.collections.List
 import kotlin.collections.Map
 import kotlinx.coroutines.*
@@ -40,7 +39,7 @@ public class FAudioTagger : FlutterPlugin, MethodCallHandler {
   lateinit var channel: MethodChannel
   lateinit var binaryMessenger: BinaryMessenger
   val eventChannels = HashMap<Number, BetterEventChannel>()
-  val streamCompleters = HashMap<Number, CompletableFuture<Number>>()
+  val streamCompleters = HashMap<Number, CompletableDeferred<Number>>()
   lateinit var context: Context
 
   companion object {
@@ -145,13 +144,13 @@ public class FAudioTagger : FlutterPlugin, MethodCallHandler {
           val eventChannel = eventChannels.get(streamKey)!!
           val eventChannelIndices = BetterEventChannel(binaryMessenger, "faudiotagger/stream/" + streamKey + ".index")
 
-          streamCompleters.set(streamKey, CompletableFuture<Number>())
+          streamCompleters.set(streamKey, CompletableDeferred<Number>())
           result.success(streamKey)
 
           CoroutineScope(Dispatchers.IO).launch {
             _addLogsUser()
             // waiting for confirmation before posting to stream
-            streamCompleters.get(streamKey)!!.get()
+            streamCompleters.get(streamKey)!!.await()
             var index: Int = -1
             for (p in paths) {
               var map = HashMap<String, Any>()
diff --git a/lib/controller/platform/tags_extractor/tags_extractor_base.dart b/lib/controller/platform/tags_extractor/tags_extractor_base.dart
@@ -114,5 +114,6 @@ class ExtractingPathKey {
   int _initial = 0;
   ExtractingPathKey.create();
 
-  int next() => _initial++;
+  // always use unique keys, reusing same event channels can result in indexing being stuck
+  int next() => (_initial++) + DateTime.now().microsecondsSinceEpoch;
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 5.4.65-beta+251111197
+version: 5.4.66-beta+251113212
 
 environment:
   sdk: ">=3.6.0 <4.0.0"

Original file line number	Diff line number	Diff line change
`@@ -114,5 +114,6 @@ class ExtractingPathKey {`
`114`	`114`	`int _initial = 0;`
`115`	`115`	`ExtractingPathKey.create();`
`116`	`116`
`117`		`- int next() => _initial++;`
	`117`	`+ // always use unique keys, reusing same event channels can result in indexing being stuck`
	`118`	`+ int next() => (_initial++) + DateTime.now().microsecondsSinceEpoch;`
`118`	`119`	`}`