Merge upstream/master and resolve conflicts

- Resolved conflict in dialog_settings.py (kept both cb_use_primary_album_artist and cb_mark_explicit checkboxes) - Fixed code quality issues found by make check: * Removed duplicate on_download_album_from_track function (F811) * Updated isinstance calls to use X | Y syntax instead of (X, Y) (UP038) * Fixed unused loop variable album_stub (B007) * Applied automatic formatting fixes (black, prettier, trailing whitespace) - Only remaining issue is C901 complexity warning in on_download_all_albums_from_playlist (expected per maintainer feedback)
2025-10-20 16:12:46 -05:00
parent 90ff7ea52e 0afd65c89b
commit 3c835c2d19
8 changed files with 112 additions and 97 deletions
@@ -181,6 +181,7 @@ class DialogPreferences(QtWidgets.QDialog):
            "video_convert_mp4",
            "extract_flac",
            "metadata_cover_embed",
+            "mark_explicit",
            "cover_album_file",
            "skip_existing",
            "symlink_to_track",