Merge pull request #428 from Clash-Projects/fix/download-atmos-and-nonflac-seeking

fix(download): correct stream types in Fmp4IndexBuilder and duration resolution in TrackDownloadManager

Author: ajisth69

app/src/main/java/com/lastwave/app/data/download/Fmp4IndexBuilder.kt

@@ -5,6 +5,8 @@ import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
+import java.io.InputStream
+import java.io.OutputStream
 import java.io.RandomAccessFile
 
 /**
@@ -676,7 +678,7 @@ object Fmp4IndexBuilder {
         return out.toByteArray()
     }
 
-    private fun copyExactly(input: FileInputStream, output: FileOutputStream, count: Long) {
+    private fun copyExactly(input: InputStream, output: OutputStream, count: Long) {
         var remaining = count
         val buffer = ByteArray(COPY_BUFFER_SIZE)
         while (remaining > 0L) {
@@ -688,7 +690,7 @@ object Fmp4IndexBuilder {
         }
     }
 
-    private fun copyStream(input: FileInputStream, output: FileOutputStream) {
+    private fun copyStream(input: InputStream, output: OutputStream) {
         val buffer = ByteArray(COPY_BUFFER_SIZE)
         while (true) {
             val read = input.read(buffer)

app/src/main/java/com/lastwave/app/data/download/TrackDownloadManager.kt

@@ -1329,9 +1329,7 @@ class TrackDownloadManager @Inject constructor(
                         expectedContentLength = ytStream.contentLength
                             ?: runCatching { Uri.parse(ytStream.url).getQueryParameter("clen")?.toLongOrNull() }.getOrNull()
                         if (durationMs <= 0L) {
-                            val candidateMs = chosenTrack?.durationMs
-                                ?: preloadedBestMatch?.durationMs
-                                ?: pickedStream?.duration?.times(1000L)
+                            val candidateMs = pickedStream?.durationMs
                                 ?: (chosenTrack?.durationSeconds?.takeIf { it > 0 }?.times(1000L))
                                 ?: (preloadedBestMatch?.durationSeconds?.takeIf { it > 0 }?.times(1000L))
                             if (candidateMs != null && candidateMs > 0L) {