Merge pull request #296 from bohning/bugfixes

Bugfixes
bohning · Oct 12, 2024 · 10b046f · 10b046f
2 parents d8d3de7 + 20c7d63
commit 10b046f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/usdb_syncer/gui/forms/SettingsDialog.ui b/src/usdb_syncer/gui/forms/SettingsDialog.ui
@@ -416,13 +416,19 @@
             </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>
              </widget>
             </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
@@ -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:

diff --git 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)
 

diff --git 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