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

db/update/Container: catch C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann 2016-11-22 11:58:18 +01:00
parent 27d368d48d
commit c5133f6088
2 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/db/update/Container.cxx
View File

@ -96,38 +96,50 @@ UpdateWalk::UpdateContainerFile(Directory &directory,
return false;
}
const auto v = plugin.container_scan(pathname);
if (v.empty()) {
editor.LockDeleteDirectory(contdir);
return false;
}
TagBuilder tag_builder;
for (const auto &vtrack : v) {
Song *song = Song::NewFile(vtrack.c_str(), *contdir);
// shouldn't be necessary but it's there..
song->mtime = info.mtime;
const auto vtrack_fs = AllocatedPath::FromUTF8(vtrack.c_str());
// TODO: check vtrack_fs.IsNull()
const auto child_path_fs = AllocatedPath::Build(pathname,
vtrack_fs);
plugin.ScanFile(child_path_fs,
add_tag_handler, &tag_builder);
tag_builder.Commit(song->tag);
{
const ScopeDatabaseLock protect;
contdir->AddSong(song);
try {
const auto v = plugin.container_scan(pathname);
if (v.empty()) {
editor.LockDeleteDirectory(contdir);
return false;
}
modified = true;
TagBuilder tag_builder;
for (const auto &vtrack : v) {
Song *song = Song::NewFile(vtrack.c_str(), *contdir);
FormatDefault(update_domain, "added %s/%s",
directory.GetPath(), vtrack.c_str());
// shouldn't be necessary but it's there..
song->mtime = info.mtime;
try {
const auto vtrack_fs =
AllocatedPath::FromUTF8Throw(vtrack.c_str());
const auto child_path_fs = AllocatedPath::Build(pathname,
vtrack_fs);
plugin.ScanFile(child_path_fs,
add_tag_handler, &tag_builder);
} catch (const std::runtime_error &e) {
song->Free();
LogError(e);
continue;
}
tag_builder.Commit(song->tag);
{
const ScopeDatabaseLock protect;
contdir->AddSong(song);
}
modified = true;
FormatDefault(update_domain, "added %s/%s",
directory.GetPath(), vtrack.c_str());
}
} catch (const std::runtime_error &e) {
editor.LockDeleteDirectory(contdir);
LogError(e);
return false;
}
return true;

4
src/decoder/plugins/GmeDecoderPlugin.cxx
View File

@ -266,10 +266,10 @@ ScanMusicEmu(Music_Emu *emu, unsigned song_num,
assert(ti != nullptr);
AtScopeExit(ti) { gme_free_info(ti); };
ScanGmeInfo(*ti, song_num, gme_track_count(emu),
handler, handler_ctx);
gme_free_info(ti);
return true;
}