When organising files, make %albumartist behave as %artist if the song has no albumartist tag set.

This commit is contained in:
David Sansome 2011-08-28 00:02:41 +01:00
parent 1d098a40b8
commit 195f618bf2
1 changed files with 4 additions and 1 deletions

View File

@ -128,7 +128,6 @@ QString OrganiseFormat::TagValue(const QString &tag, const Song &song) const {
if (tag == "title") value = song.title();
else if (tag == "album") value = song.album();
else if (tag == "artist") value = song.artist();
else if (tag == "albumartist") value = song.albumartist();
else if (tag == "composer") value = song.composer();
else if (tag == "genre") value = song.genre();
else if (tag == "comment") value = song.comment();
@ -145,6 +144,10 @@ QString OrganiseFormat::TagValue(const QString &tag, const Song &song) const {
if (value.isEmpty()) value = song.artist().trimmed();
if (!value.isEmpty()) value = value[0].toUpper();
}
else if (tag == "albumartist") {
value = song.albumartist();
if (value.isEmpty()) value = song.artist();
}
if (replace_the_ && (tag == "artist" || tag == "albumartist"))
value.replace(QRegExp("^the\\s+", Qt::CaseInsensitive), "");