From 8c391a75045fe1748392529e38e6d173a80588d2 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:48:03 +0100
Subject: [PATCH] fix: Improve BatchesFolders; concatenate video files

---
 .../alibi/helpers/AudioBatchesFolder.kt       | 23 ++++++++++---------
 .../myzel394/alibi/helpers/BatchesFolder.kt   |  2 +-
 .../alibi/helpers/VideoBatchesFolder.kt       | 23 ++++++++++---------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/app/myzel394/alibi/helpers/AudioBatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/AudioBatchesFolder.kt
index 47df507..e49e689 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/AudioBatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/AudioBatchesFolder.kt
@@ -10,7 +10,7 @@ class AudioBatchesFolder(
     override val context: Context,
     override val type: BatchType,
     override val customFolder: DocumentFile? = null,
-    override val subfolderName: String = ".recordings",
+    override val subfolderName: String = ".audio_recordings",
 ) : BatchesFolder(
     context,
     type,
@@ -37,21 +37,22 @@ class AudioBatchesFolder(
         recordingStart: LocalDateTime,
         extension: String,
         disableCache: Boolean,
-    ) {
-        if (!disableCache && checkIfOutputAlreadyExists(recordingStart, extension)) {
-            return
-        }
-
-        val filePaths = getBatchesForFFmpeg()
+    ): String {
         val outputFile = getOutputFileForFFmpeg(
             date = recordingStart,
             extension = extension,
         )
 
-        MediaConverter.concatenateAudioFiles(
-            inputFiles = filePaths,
-            outputFile = outputFile,
-        ).await()
+        if (disableCache || checkIfOutputAlreadyExists(recordingStart, extension)) {
+            val filePaths = getBatchesForFFmpeg()
+
+            MediaConverter.concatenateAudioFiles(
+                inputFiles = filePaths,
+                outputFile = outputFile,
+            ).await()
+        }
+
+        return outputFile
     }
 
     companion object {
diff --git a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
index 234c83a..c801e6e 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt
@@ -115,7 +115,7 @@ abstract class BatchesFolder(
         recordingStart: LocalDateTime,
         extension: String,
         disableCache: Boolean = false,
-    )
+    ): String
 
     fun exportFolderForSettings(): String {
         return when (type) {
diff --git a/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
index f5ace45..db84f1f 100644
--- a/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
+++ b/app/src/main/java/app/myzel394/alibi/helpers/VideoBatchesFolder.kt
@@ -10,7 +10,7 @@ class VideoBatchesFolder(
     override val context: Context,
     override val type: BatchesFolder.BatchType,
     override val customFolder: DocumentFile? = null,
-    override val subfolderName: String = ".recordings",
+    override val subfolderName: String = ".video_recordings",
 ) : BatchesFolder(
     context,
     type,
@@ -34,21 +34,22 @@ class VideoBatchesFolder(
         recordingStart: LocalDateTime,
         extension: String,
         disableCache: Boolean
-    ) {
-        if (!disableCache && checkIfOutputAlreadyExists(recordingStart, extension)) {
-            return
-        }
-
-        val filePaths = getBatchesForFFmpeg()
+    ): String {
         val outputFile = getOutputFileForFFmpeg(
             date = recordingStart,
             extension = extension,
         )
 
-        MediaConverter.concatenateAudioFiles(
-            inputFiles = filePaths,
-            outputFile = outputFile,
-        ).await()
+        if (disableCache || !checkIfOutputAlreadyExists(recordingStart, extension)) {
+            val filePaths = getBatchesForFFmpeg()
+
+            MediaConverter.concatenateVideoFiles(
+                inputFiles = filePaths,
+                outputFile = outputFile,
+            ).await()
+        }
+
+        return outputFile
     }
 
     companion object {