Merge pull request #37 from codewithtamim/task/update-images

Update

Author: codewithtamim

README.md

@@ -21,10 +21,10 @@
 ## Screenshots
 
 <p align="left">
-  <img src="images/image1.png" alt="Screenshot 1" width="200"/>
-  <img src="images/image2.png" alt="Screenshot 2" width="200"/>
-  <img src="images/image3.png" alt="Screenshot 3" width="200"/>
-  <img src="images/image4.png" alt="Screenshot 3" width="200"/>
+  <img src="art/image1.png" alt="Screenshot 1" width="200"/>
+  <img src="art/image2.png" alt="Screenshot 2" width="200"/>
+  <img src="art/image3.png" alt="Screenshot 3" width="200"/>
+  <img src="art/image4.png" alt="Screenshot 3" width="200"/>
 </p>
 
 ---

app/build.gradle.kts

@@ -16,7 +16,7 @@ android {
         minSdk = 21
         targetSdk = 36
         versionCode = 34
-        versionName = "1.3.3-prerelease"
+        versionName = "1.3.3-lts"
         multiDexEnabled = true
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/nasahacker/convertit/data/repository/AudioConverterRepositoryImpl.kt

@@ -24,6 +24,7 @@ import com.nasahacker.convertit.util.CueParser
 import com.nasahacker.convertit.domain.model.CueFile
 import com.nasahacker.convertit.domain.model.CueTrack
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
@@ -228,6 +229,8 @@ class AudioConverterRepositoryImpl
                     arrayOf(
                         "-y",
                         "-i", inputPath,
+                        "-map", "0:a",  // Only map audio streams
+                        "-vn",          // Disable video streams
                         "-ar", "16000",           
                         "-ac", "1",             
                         "-c:a", AudioCodec.fromFormat(outputFormat).codec,
@@ -242,6 +245,8 @@ class AudioConverterRepositoryImpl
                         arrayOf(
                             "-y",
                             "-i", inputPath,
+                            "-map", "0:a",   
+                            "-vn",          
                             "-c:a", AudioCodec.fromFormat(outputFormat).codec,
                             "-b:a", bitrate.bitrate,
                             "-application", "voip",   
@@ -253,6 +258,8 @@ class AudioConverterRepositoryImpl
                         arrayOf(
                             "-y",
                             "-i", inputPath,
+                            "-map", "0:a",   
+                            "-vn",           
                             "-c:a", AudioCodec.fromFormat(outputFormat).codec,
                             "-b:a", bitrate.bitrate,
                             "-filter:a", "atempo=$playbackSpeed",
@@ -264,6 +271,8 @@ class AudioConverterRepositoryImpl
                     arrayOf(
                         "-y",
                         "-i", inputPath,
+                        "-map", "0:a",  
+                        "-vn",          
                         "-c:a", AudioCodec.fromFormat(outputFormat).codec,
                         "-b:a", bitrate.bitrate,
                         "-filter:a", "atempo=$playbackSpeed",
@@ -366,18 +375,26 @@ class AudioConverterRepositoryImpl
                         )
 
                         try {
-                            val session = FFmpegKit.executeWithArguments(ffmpegArgs)
+                            val sessionCompleted = CompletableDeferred<Boolean>()
 
-                            if (ReturnCode.isSuccess(session.returnCode)) {
-                                outputPaths.add(outputFilePath)
-                                processedTracks++
-                                
-                                val progress = ((processedTracks.toFloat() / totalTracks) * 100).toInt()
-                                onProgress(progress)
-                                
-                                Log.d(TAG, "Successfully converted track ${track.trackNumber}: ${track.title}")
-                            } else {
-                                Log.e(TAG, "Failed to convert track ${track.trackNumber}: ${session.failStackTrace}")
+                            FFmpegKit.executeWithArgumentsAsync(ffmpegArgs, { session ->
+                                if (ReturnCode.isSuccess(session.returnCode)) {
+                                    outputPaths.add(outputFilePath)
+                                    processedTracks++
+                                    
+                                    val progress = ((processedTracks.toFloat() / totalTracks) * 100).toInt()
+                                    onProgress(progress)
+                                    
+                                    Log.d(TAG, "Successfully converted track ${track.trackNumber}: ${track.title}")
+                                    sessionCompleted.complete(true)
+                                } else {
+                                    Log.e(TAG, "Failed to convert track ${track.trackNumber}: ${session.failStackTrace}")
+                                    sessionCompleted.complete(false)
+                                }
+                            })
+                            
+                            val success = sessionCompleted.await()
+                            if (!success) {
                                 onFailure("Failed to convert track ${track.trackNumber}: ${track.title}")
                                 tempAudioFile.delete()
                                 return
@@ -407,32 +424,11 @@ class AudioConverterRepositoryImpl
 
         private fun findCueFileForUri(audioUri: Uri): File? {
             try {
-
                 val fileName = getFileName(context.contentResolver, audioUri)
-                val fileNameWithoutExt = fileName.substringBeforeLast(".")
                 val isFlac = fileName.endsWith(".flac", ignoreCase = true)
 
-
-                val possibleLocations = listOf(
-                    context.getExternalFilesDir(null),
-                    context.filesDir,
-                    File("/storage/emulated/0/Download"),
-                    File("/storage/emulated/0/Music")
-                )
-                
-
-                for (dir in possibleLocations) {
-                    if (dir?.exists() == true) {
-                        val cueFile = File(dir, "$fileNameWithoutExt.cue")
-                        if (cueFile.exists()) {
-                            return cueFile
-                        }
-                    }
-                }
-                
-
+                // Only check for embedded CUE in FLAC files since external CUE files are selected via file picker
                 if (isFlac) {
-
                     context.contentResolver.openInputStream(audioUri)?.use { inputStream ->
                         val tempFlacFile = File(context.cacheDir, "temp_flac_${System.currentTimeMillis()}.flac")
                         FileOutputStream(tempFlacFile).use { outputStream ->
@@ -469,6 +465,8 @@ class AudioConverterRepositoryImpl
             args.addAll(arrayOf("-y", "-i", inputPath))
 
 
+            args.addAll(arrayOf("-map", "0:a", "-vn"))
+
             args.addAll(arrayOf("-ss", CueParser.formatSecondsForFFmpeg(track.startTimeSeconds)))
 
 
@@ -508,9 +506,18 @@ class AudioConverterRepositoryImpl
         }
 
         private fun sanitizeFileName(fileName: String): String {
-            return fileName.replace(Regex("[^a-zA-Z0-9._\\-\\s]"), "_")
+            val invalidChars = Regex("[<>:\"/\\\\|?*\\x00-\\x1f]")
+            val sanitized = fileName.replace(invalidChars, "_")
                 .replace(Regex("\\s+"), " ")
                 .trim()
+                .trimEnd('.')  
+                
+            val maxLength = 200
+            return if (sanitized.length > maxLength) {
+                sanitized.substring(0, maxLength).trimEnd()
+            } else {
+                sanitized
+            }.ifEmpty { "Track" } 
         }
 
         override suspend fun convertWithManualCue(