Fix: Ensure Lyrics Are Embedded During Batch Download When Selected

Lambada10 · Nov 30, 2024 · 06b96d0 · 06b96d0
1 parent 2a15573
commit 06b96d0
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt b/app/src/main/java/pl/lambada/songsync/util/LyricsUtils.kt
@@ -251,20 +251,44 @@ private suspend fun downloadLyricsForSong(
             }
                 .onFailure(onFailedLyricsResponse)
                 .onSuccess {
-                    formatAndSaveLyricsForSong(
-                        song,
-                        context,
-                        viewModel.userSettingsController.sdCardPath,
+                    val lrcContent = formatLyrics(
                         songInfo,
                         it,
+                        context,
                         viewModel.userSettingsController.directlyModifyTimestamps
                     )
 
+                    if(viewModel.userSettingsController.embedLyricsIntoFiles) {
+                        embedLyricsInFile(
+                            context,
+                            song.filePath ?: throw NullPointerException("File path is null"),
+                            lrcContent
+                        )
+                    } else {
+                        writeLyricsToFile(song.filePath.toLrcFile(), lrcContent, context, song,viewModel.userSettingsController.sdCardPath)
+                    }
+
                     onLyricsSaved()
                 }
         }
 }
 
+private fun formatLyrics(
+    songInfo: SongInfo,
+    lyrics: String,
+    context: Context,
+    directOffset: Boolean
+): String {
+    val lrcContent = generateLrcContent(
+        songInfo,
+        lyrics,
+        context.getString(R.string.generated_using),
+        directOffset = directOffset
+    )
+
+    return lrcContent
+}
+
 private fun formatAndSaveLyricsForSong(
     song: Song,
     context: Context,