From d5edfb5d87753828d1a6e3a70b4cd48215e85413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20B=C3=B6hning?=
 <1497707+bohning@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:10:50 +0200
Subject: [PATCH 1/3] Only write #TAGS if not empty.

---
 src/usdb_syncer/song_loader.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/usdb_syncer/song_loader.py b/src/usdb_syncer/song_loader.py
index 1ab1687c..617eece7 100644
--- a/src/usdb_syncer/song_loader.py
+++ b/src/usdb_syncer/song_loader.py
@@ -301,7 +301,7 @@ def _get_usdb_data(song_id: SongId, logger: Log) -> tuple[SongDetails, SongTxt]:
     txt = SongTxt.parse(txt_str, logger)
     txt.sanitize()
     txt.headers.creator = txt.headers.creator or details.uploader or None
-    txt.headers.tags = ", ".join(details.comment_tags())
+    txt.headers.tags = ", ".join(details.comment_tags()) or None
     return details, txt
 
 

From 0f1e0ec8ac4a38f01dab39836c29338482bc0049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20B=C3=B6hning?=
 <1497707+bohning@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:12:36 +0200
Subject: [PATCH 2/3] Add more info for UTF-8 BOM and CP1252.

---
 src/usdb_syncer/settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/usdb_syncer/settings.py b/src/usdb_syncer/settings.py
index d813911f..4f1f1892 100644
--- a/src/usdb_syncer/settings.py
+++ b/src/usdb_syncer/settings.py
@@ -108,9 +108,9 @@ def __str__(self) -> str:
             case Encoding.UTF_8:
                 return "UTF-8"
             case Encoding.UTF_8_BOM:
-                return "UTF-8 BOM"
+                return "UTF-8 BOM (legacy support for older Vocaluxe versions)"
             case Encoding.CP1252:
-                return "CP1252"
+                return "CP1252 (legacy support for older USDX CMD)"
             case _ as unreachable:
                 assert_never(unreachable)
 

From 20c7d63389a1915edd82bdfae9daed7e9bb17ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20B=C3=B6hning?=
 <1497707+bohning@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:15:11 +0200
Subject: [PATCH 3/3] Disable and hide option to add artwork to video file.

This can be reenabled as soon as this is fixed either on the mutagen (https://github.com/quodlibet/mutagen/issues/661) or USDX side (https://github.com/UltraStar-Deluxe/USDX/issues/902).
---
 src/usdb_syncer/gui/forms/SettingsDialog.ui | 6 ++++++
 src/usdb_syncer/gui/settings_dialog.py      | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/usdb_syncer/gui/forms/SettingsDialog.ui b/src/usdb_syncer/gui/forms/SettingsDialog.ui
index 9bc59f18..ee153b93 100644
--- a/src/usdb_syncer/gui/forms/SettingsDialog.ui
+++ b/src/usdb_syncer/gui/forms/SettingsDialog.ui
@@ -416,6 +416,9 @@
             </item>
             <item row="3" column="0">
              <widget class="QLabel" name="label_video_embed_artwork">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="text">
                <string>Embed artwork:</string>
               </property>
@@ -423,6 +426,9 @@
             </item>
             <item row="3" column="1">
              <widget class="QCheckBox" name="checkBox_video_embed_artwork">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="text">
                <string/>
               </property>
diff --git a/src/usdb_syncer/gui/settings_dialog.py b/src/usdb_syncer/gui/settings_dialog.py
index ff2a995f..74978292 100644
--- a/src/usdb_syncer/gui/settings_dialog.py
+++ b/src/usdb_syncer/gui/settings_dialog.py
@@ -39,6 +39,8 @@ def __init__(self, parent: QWidget, song: UsdbSong | None) -> None:
         self._load_settings()
         self._setup_path_template()
         self._browser = self.comboBox_browser.currentData()
+        self.label_video_embed_artwork.setVisible(False)
+        self.checkBox_video_embed_artwork.setVisible(False)
         self.groupBox_reencode_video.setVisible(False)
 
     def _populate_comboboxes(self) -> None: