summaryrefslogtreecommitdiff
path: root/tidal_dl_ng/dialog.py
diff options
context:
space:
mode:
authorWinman486 <harpsystems@gmail.com>2025-10-20 16:12:46 -0500
committerWinman486 <harpsystems@gmail.com>2025-10-20 16:12:46 -0500
commit3c835c2d196f02871a1be23430223538bf2cd226 (patch)
tree8d021fa04776f7bf67911dd4fd54a3e6f3dc912b /tidal_dl_ng/dialog.py
parent90ff7ea52ef7dd3c02afc313da4682b1fcb799eb (diff)
parent0afd65c89b9033a5a9505dc193699396666e16f2 (diff)
downloadtidal-dl-ng-3c835c2d196f02871a1be23430223538bf2cd226.tar.gz
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)
Diffstat (limited to 'tidal_dl_ng/dialog.py')
-rw-r--r--tidal_dl_ng/dialog.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tidal_dl_ng/dialog.py b/tidal_dl_ng/dialog.py
index 8b194f4..0bf9b2a 100644
--- a/tidal_dl_ng/dialog.py
+++ b/tidal_dl_ng/dialog.py
@@ -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",