From fc2154ee9278ba7e9ccdc82a210806c1d1279150 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 20 Oct 2015 12:10:42 +0200 Subject: DetachedSong: move code from Update() to LoadFile() Avoid duplicate AllocatedPath::FromUTF8() invocations in two callers. --- src/SongUpdate.cxx | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'src/SongUpdate.cxx') diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index a8b19a8d1..c2d1f5fed 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -153,6 +153,26 @@ Song::UpdateFileInArchive(const Storage &storage) #endif +bool +DetachedSong::LoadFile(Path path) +{ + FileInfo fi; + if (!GetFileInfo(path, fi) || !fi.IsRegular()) + return false; + + TagBuilder tag_builder; + if (!tag_file_scan(path, full_tag_handler, &tag_builder)) + return false; + + if (tag_builder.IsEmpty()) + tag_scan_fallback(path, &full_tag_handler, + &tag_builder); + + mtime = fi.GetModificationTime(); + tag_builder.Commit(tag); + return true; +} + bool DetachedSong::Update() { @@ -160,21 +180,7 @@ DetachedSong::Update() const AllocatedPath path_fs = AllocatedPath::FromUTF8(GetRealURI()); - FileInfo fi; - if (!GetFileInfo(path_fs, fi) || !fi.IsRegular()) - return false; - - TagBuilder tag_builder; - if (!tag_file_scan(path_fs, full_tag_handler, &tag_builder)) - return false; - - if (tag_builder.IsEmpty()) - tag_scan_fallback(path_fs, &full_tag_handler, - &tag_builder); - - mtime = fi.GetModificationTime(); - tag_builder.Commit(tag); - return true; + return LoadFile(path_fs); } else if (IsRemote()) { TagBuilder tag_builder; if (!tag_stream_scan(uri.c_str(), full_tag_handler, -- cgit v1.2.3