TagFile: add TagBuilder overload with ScanGenericTags() fallback

This commit is contained in:
Max Kellermann
2016-02-26 13:18:32 +01:00
parent b1d60b5c85
commit a9130cb99c
3 changed files with 29 additions and 9 deletions

View File

@@ -96,12 +96,8 @@ Song::UpdateFile(Storage &storage)
full_tag_handler, &tag_builder))
return false;
} else {
if (!tag_file_scan(path_fs, full_tag_handler, &tag_builder))
if (!tag_file_scan(path_fs, tag_builder))
return false;
if (tag_builder.IsEmpty())
ScanGenericTags(path_fs, full_tag_handler,
&tag_builder);
}
mtime = info.mtime;
@@ -149,12 +145,9 @@ DetachedSong::LoadFile(Path path)
return false;
TagBuilder tag_builder;
if (!tag_file_scan(path, full_tag_handler, &tag_builder))
if (!tag_file_scan(path, tag_builder))
return false;
if (tag_builder.IsEmpty())
ScanGenericTags(path, full_tag_handler, &tag_builder);
mtime = fi.GetModificationTime();
tag_builder.Commit(tag);
return true;