From db588bc722d59ab3081ea310e3c97d9448fb0aec Mon Sep 17 00:00:00 2001 From: Sophist Date: Fri, 18 Apr 2014 15:17:01 +0100 Subject: [PATCH] Revert "Handle NAT tracks with feat. artists." This reverts commit 0707add3353455473f5ff26a117c7843d42cd4d5. --- picard/mbxml.py | 2 -- picard/ui/options/renaming.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/picard/mbxml.py b/picard/mbxml.py index 8ba01e7ea..f14008d28 100644 --- a/picard/mbxml.py +++ b/picard/mbxml.py @@ -178,8 +178,6 @@ def artist_credit_to_metadata(node, m, release=False): m["artistsort"] = artistsort m["artists"] = artists m["~artists_sort"] = artistsort - m["~primaryartist"] = artists[0] - m["~primaryartistsort"] = artistssort[0] def label_info_from_node(node): diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py index 57a5c2068..1672ec802 100644 --- a/picard/ui/options/renaming.py +++ b/picard/ui/options/renaming.py @@ -46,7 +46,7 @@ class RenamingOptionsPage(OptionsPage): config.TextOption( "setting", "file_naming_format", - "$if2(%albumartist%,%_primaryartist%)/$if($ne(%albumartist%,),%album%/)$if($gt(%totaldiscs%,1),%discnumber%-,)$num(%tracknumber%,2) $if(%_multiartist%,%artist% - ,)%title%", + "$if2(%albumartist%,%artist%)/$if($ne(%albumartist%,),%album%/)$if($gt(%totaldiscs%,1),%discnumber%-,)$num(%tracknumber%,2) $if(%_multiartist%,%artist% - ,)%title%", ), config.BoolOption("setting", "move_files", False), config.TextOption("setting", "move_files_to", ""),