From 6ba53930864d687f6c7355755f6b64cb430b1bf8 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Wed, 6 Nov 2024 16:20:40 +0100
Subject: [PATCH] [TASK] add cover art and load metadata

---
 README.md                     |  5 +++--
 internal/logic/sync-atmos.go  | 31 +++++++++++++++++--------------
 internal/logic/sync-stereo.go | 22 +++++++++++-----------
 internal/logic/sync.go        | 31 +++++++++++++++++++++++++------
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index a7ce3d0..aa34a4a 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,9 @@ It is important that both folders have the same amount of Files and that the fil
 - [ ] Make it usable with Mac
 - [ ] Generate a package for Ubuntu
 - [ ] Better handling of file mapping
-- [x] add cover art
-- [ ] load metadata from audiobook
+- [x] add cover art for mp3
+- [x] add cover art for m4b
+- [x] load metadata from audiobook
 
 ## Support Me
 [![Buy Me A Coffee](https://cdn.buymeacoffee.com/buttons/default-orange.png)](https://www.buymeacoffee.com/razormind)
diff --git a/internal/logic/sync-atmos.go b/internal/logic/sync-atmos.go
index cd1677c..d30140b 100644
--- a/internal/logic/sync-atmos.go
+++ b/internal/logic/sync-atmos.go
@@ -38,33 +38,36 @@ func combineAtmosFiles(folder1 string, folder2 string, outputFolder string, prog
       }
 
       // Get extension of file
-      ext := filepath.Ext(file)
+      // ext := filepath.Ext(file)
 
       // Get output file name
       newFileName := outputFolder + "/" + filepath.Base(files2[index])
-      newFileName = newFileName[:len(newFileName)-4] + "_synced" + ext
+      newFileName = newFileName[:len(newFileName)-4] + "_synced.m4v"
 
       // coverArtString, err := getCoverArtString(file)
       // if err != nil {
       //   return err
       // }
+      
 
       // Construct FFmpeg command
       ctx, _ := context.WithCancel(context.Background())
-      // map channel 1 and 2 of file 2 to channel 1 and 2 of file 1 but keep all other channels of file 1
-      // it will be a 6 channel atmos output file
-      cmd := exec.CommandContext(ctx, ffmpegPath,
+      arguments := []string{
           "-i", file,
           "-i", files2[index],
-          "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=5.1|c0=c0+c6|c1=c1+c7|c2=c2|c3=c3|c4=c4|c5=c5[out]",
-          "-map", "[out]",
-          "-c:a", "eac3",
-          // "-map", "2:0", "-metadata:s:v", "title=\"Album cover\"", "-metadata:s:v", "comment=\"Cover (front)\"",
-          // "-map", "-map", coverArtString + ":v", "-c:v", "copy", "-disposition:v:1", "attached_pic",
-          "-metadata:s:a:0", "encoder=\"Dolby Digital Plus + Dolby Atmos\"",
-          "-progress",
-          "pipe:1",
-          newFileName)
+          // best audio format so far on ios
+          "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2[out]",
+          "-c:a", "aac", "-b:a", "654k",
+          // mp4 output
+          // "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=5.1|c0=c0+c6|c1=c1+c7|c2=c2|c3=c3|c4=c4|c5=c5[out]",
+          // "-c:a", "eac3", "-ac", "6",
+      }
+      arguments = append(arguments, getBaseArguments()...)
+      arguments = append(arguments, getCoverArtArguments(file, files2[index])...)
+      arguments = append(arguments, newFileName)
+      // map channel 1 and 2 of file 2 to channel 1 and 2 of file 1 but keep all other channels of file 1
+      // it will be a 6 channel atmos output file
+      cmd := exec.CommandContext(ctx, ffmpegPath, arguments...)
       cmd.SysProcAttr = getSysProcAttr()
       stdout, err := cmd.StdoutPipe()
       if err != nil {
diff --git a/internal/logic/sync-stereo.go b/internal/logic/sync-stereo.go
index e2cf187..aa1a664 100644
--- a/internal/logic/sync-stereo.go
+++ b/internal/logic/sync-stereo.go
@@ -37,24 +37,24 @@ func combineStereoFiles(folder1 string, folder2 string, outputFolder string, pro
           return err
       }
 
-      coverArtString, err := getCoverArtString(file)
-      if err != nil {
-        return err
-      }
+      // coverArtString, err := getCoverArtString(file)
+      // if err != nil {
+      //   return err
+      // }
       
       // Construct FFmpeg command
       newFileName := outputFolder + "/" + filepath.Base(files2[index])
       newFileName = newFileName[:len(newFileName)-4] + "_synced.mp3"
       ctx, _ := context.WithCancel(context.Background())
-      cmd := exec.CommandContext(ctx, ffmpegPath,
+      arguments := []string{
           "-i", file,
           "-i", files2[index],
-          "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=stereo|c0<c0+c2|c1<c1+c3[a]",
-          "-map", coverArtString + ":v", "-c:v", "copy", "-disposition:v", "attached_pic",
-          "-progress",
-          "pipe:1",
-		      "-map", "[a]",
-          outputFolder + "/" + filepath.Base(files2[index]))
+          "-filter_complex", "[1:a]apad[a2];[0:a][a2]amerge=inputs=2,pan=stereo|c0<c0+c2|c1<c1+c3[out]",
+      }
+      arguments = append(arguments, getBaseArguments()...)
+      arguments = append(arguments, getCoverArtArguments(file, files2[index])...)
+      arguments = append(arguments, newFileName)
+      cmd := exec.CommandContext(ctx, ffmpegPath, arguments...)
       cmd.SysProcAttr = getSysProcAttr()
       stdout, err := cmd.StdoutPipe()
       if err != nil {
diff --git a/internal/logic/sync.go b/internal/logic/sync.go
index 5bac61f..9d9880f 100644
--- a/internal/logic/sync.go
+++ b/internal/logic/sync.go
@@ -96,24 +96,43 @@ func parseProgress(index int, total int, progress *widget.ProgressBar, reader io
     }
 }
 
-func getCoverArtString(filePath string) (string, error) {
+func getBaseArguments() []string {
+  return []string{
+    "-map", "[out]",
+    "-progress",
+    "pipe:1",
+    "-map_metadata", "1",
+  }
+}
+
+func getCoverArtArguments(file1 string, file2 string) []string {
+  arguments := []string{}
+  if testCoverArt(file1) {
+    arguments = append(arguments, "-map", "0:v", "-c:v", "copy", "-disposition:v", "attached_pic")
+  }
+  if testCoverArt(file2) {
+    arguments = append(arguments, "-map", "1:v", "-c:v", "copy", "-disposition:v", "attached_pic")
+  }
+  return arguments
+}
+
+func testCoverArt(filePath string) bool {
     // Open the audio file
-    coverArtString := "1"
     f, err := os.Open(filePath)
     if err != nil {
-        return coverArtString, err
+        return false
     }
     defer f.Close()
 
     // Use taglib to parse the audio file
     metadata, err := tag.ReadFrom(f)
     if err != nil {
-        return coverArtString, err
+      return false
     }
 
     // Check if there is any artwork
     if metadata.Picture() != nil {
-        coverArtString = "0"
+      return true
     }
-    return coverArtString, nil
+    return false
 }