oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

SongUpdate: use tag_file_scan()

Browse Source 
Eliminate duplicate code.
This commit is contained in:
Max Kellermann 2013-10-21 21:05:59 +02:00
parent cc3be3aeed
commit 875821f2ba
1 changed files with 9 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/SongUpdate.cxx
View File

@ -34,6 +34,7 @@
#include "tag/TagHandler.hxx" #include "tag/TagHandler.hxx"
#include "tag/TagId3.hxx" #include "tag/TagId3.hxx"
#include "tag/ApeTag.hxx" #include "tag/ApeTag.hxx"
#include "TagFile.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
#include <assert.h> #include <assert.h>
@ -82,84 +83,29 @@ tag_scan_fallback(const char *path,
bool bool
Song::UpdateFile() Song::UpdateFile()
{ {
const char *suffix;
const struct DecoderPlugin *plugin;
struct stat st;
struct input_stream *is = nullptr;
assert(IsFile()); assert(IsFile());
/* check if there's a suffix and a plugin */
suffix = uri_get_suffix(uri);
if (suffix == nullptr)
return false;
plugin = decoder_plugin_from_suffix(suffix, nullptr);
if (plugin == nullptr)
return false;
const auto path_fs = map_song_fs(*this); const auto path_fs = map_song_fs(*this);
if (path_fs.IsNull()) if (path_fs.IsNull())
return false; return false;
delete tag; struct stat st;
tag = nullptr; if (!StatFile(path_fs, st) || !S_ISREG(st.st_mode))
if (!StatFile(path_fs, st) || !S_ISREG(st.st_mode)) {
return false; return false;
}
mtime = st.st_mtime;
Mutex mutex;
Cond cond;
TagBuilder tag_builder; TagBuilder tag_builder;
if (!tag_file_scan(path_fs.c_str(),
do { &full_tag_handler, &tag_builder) ||
/* load file tag */ !tag_builder.IsDefined())
if (decoder_plugin_scan_file(*plugin, path_fs.c_str(),
&full_tag_handler, &tag_builder))
break;
tag_builder.Clear();
/* fall back to stream tag */
if (plugin->scan_stream != nullptr) {
/* open the input_stream (if not already
open) */
if (is == nullptr)
is = input_stream::Open(path_fs.c_str(),
mutex, cond,
IgnoreError());
/* now try the stream_tag() method */
if (is != nullptr) {
if (decoder_plugin_scan_stream(*plugin, is,
&full_tag_handler,
&tag_builder))
break;
tag_builder.Clear();
is->LockSeek(0, SEEK_SET, IgnoreError());
}
}
plugin = decoder_plugin_from_suffix(suffix, plugin);
} while (plugin != nullptr);
if (is != nullptr)
is->Close();
if (!tag_builder.IsDefined())
return false; return false;
if (tag_builder.IsEmpty()) if (tag_builder.IsEmpty())
tag_scan_fallback(path_fs.c_str(), &full_tag_handler, tag_scan_fallback(path_fs.c_str(), &full_tag_handler,
&tag_builder); &tag_builder);
mtime = st.st_mtime;
delete tag;
tag = tag_builder.Commit(); tag = tag_builder.Commit();
return true; return true;
} }