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)
This commit is contained in:
@@ -219,7 +219,7 @@ def _format_artist_names(
|
||||
"""
|
||||
if name == "artist_name" and isinstance(media, Track | Video):
|
||||
# For folder paths, use album artist if setting is enabled
|
||||
if use_primary_album_artist and hasattr(media, 'album') and media.album and media.album.artists:
|
||||
if use_primary_album_artist and hasattr(media, "album") and media.album and media.album.artists:
|
||||
return media.album.artists[0].name
|
||||
# Otherwise use track artists as before
|
||||
if hasattr(media, "artists"):
|
||||
|
||||
Reference in New Issue
Block a user