From 448108a974f6fc83d0b8d69a2d8e0abdcc3bce65 Mon Sep 17 00:00:00 2001
From: Myzel394 <50424412+Myzel394@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:03:27 +0100
Subject: [PATCH] feat: Improve settings for video recording

---
 .../java/app/myzel394/alibi/db/AppSettings.kt   | 17 +++++++++++++++--
 .../alibi/services/AudioRecorderService.kt      |  5 +++--
 .../alibi/services/VideoRecorderService.kt      | 17 ++++++++++++-----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/app/myzel394/alibi/db/AppSettings.kt b/app/src/main/java/app/myzel394/alibi/db/AppSettings.kt
index 2a612b9..63f577a 100644
--- a/app/src/main/java/app/myzel394/alibi/db/AppSettings.kt
+++ b/app/src/main/java/app/myzel394/alibi/db/AppSettings.kt
@@ -6,7 +6,8 @@ import android.os.Build
 import androidx.camera.video.Quality
 import androidx.camera.video.QualitySelector
 import app.myzel394.alibi.R
-import app.myzel394.alibi.helpers.BatchesFolder
+import app.myzel394.alibi.helpers.AudioBatchesFolder
+import app.myzel394.alibi.helpers.VideoBatchesFolder
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.time.LocalDateTime
@@ -75,9 +76,21 @@ data class RecordingInformation(
     val maxDuration: Long,
     val intervalDuration: Long,
     val fileExtension: String,
+    val type: Type,
 ) {
     fun hasRecordingsAvailable(context: Context): Boolean =
-        BatchesFolder.importFromFolder(folderPath, context).hasRecordingsAvailable()
+        when (type) {
+            Type.AUDIO -> AudioBatchesFolder.importFromFolder(folderPath, context)
+                .hasRecordingsAvailable()
+
+            Type.VIDEO -> VideoBatchesFolder.importFromFolder(folderPath, context)
+                .hasRecordingsAvailable()
+        }
+
+    enum class Type {
+        AUDIO,
+        VIDEO,
+    }
 }
 
 @Serializable
diff --git a/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
index b4fd73e..4590ce3 100644
--- a/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
@@ -142,6 +142,7 @@ class AudioRecorderService :
         maxDuration = settings.maxDuration,
         fileExtension = settings.fileExtension,
         intervalDuration = settings.intervalDuration,
+        type = RecordingInformation.Type.AUDIO,
     )
 
     override fun startNewCycle() {
@@ -214,7 +215,7 @@ class AudioRecorderService :
             super.onAudioDevicesAdded(addedDevices)
 
             if (selectedMicrophone == null) {
-                return;
+                return
             }
 
             // We can't compare the ID, as it seems to be changing on each reconnect
@@ -238,7 +239,7 @@ class AudioRecorderService :
             super.onAudioDevicesRemoved(removedDevices)
 
             if (selectedMicrophone == null) {
-                return;
+                return
             }
 
             if (removedDevices?.find { it.id == selectedMicrophone!!.deviceInfo.id } != null) {
diff --git a/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt b/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
index d8d23ec..4e622bc 100644
--- a/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
+++ b/app/src/main/java/app/myzel394/alibi/services/VideoRecorderService.kt
@@ -58,7 +58,7 @@ class VideoRecorderService :
         runInMain {
             camera = cameraProvider!!.bindToLifecycle(
                 this,
-                settings.cameraSelector,
+                CameraSelector.DEFAULT_BACK_CAMERA,
                 videoCapture
             )
 
@@ -136,6 +136,7 @@ class VideoRecorderService :
         maxDuration = settings.maxDuration,
         fileExtension = settings.fileExtension,
         intervalDuration = settings.intervalDuration,
+        type = RecordingInformation.Type.VIDEO,
     )
 
     data class Settings(
@@ -143,7 +144,6 @@ class VideoRecorderService :
         override val intervalDuration: Long,
         val folder: String? = null,
         val targetVideoBitRate: Int? = null,
-        val cameraSelector: CameraSelector = CameraSelector.DEFAULT_BACK_CAMERA,
         val quality: QualitySelector = QualitySelector.from(Quality.HIGHEST),
     ) : IntervalRecorderService.Settings(
         maxDuration = maxDuration,
@@ -162,9 +162,16 @@ class VideoRecorderService :
         }
 
         companion object {
-            fun from() = Settings(
-                maxDuration = 60_000,
-                intervalDuration = 10_000,
+            fun from(appSettings: AppSettings) = Settings(
+                // TODO: Migrate audioSettings
+                maxDuration = appSettings.audioRecorderSettings.maxDuration,
+                intervalDuration = appSettings.audioRecorderSettings.intervalDuration,
+                folder = appSettings.audioRecorderSettings.saveFolder,
+                targetVideoBitRate = appSettings.videoRecorderSettings.targetedVideoBitRate,
+                quality = appSettings.videoRecorderSettings.getQualitySelector()
+                    ?: QualitySelector.from(
+                        Quality.HIGHEST
+                    ),
             )
         }
     }