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

db/simple/Save: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-10-29 09:45:34 +02:00
parent dea46e8d5a
commit 90a14e14f4
11 changed files with 95 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/PlaylistDatabase.cxx
View File

@@ -23,14 +23,11 @@
#include "fs/io/TextFile.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/RuntimeError.hxx"
#include <string.h>
#include <stdlib.h>
static constexpr Domain playlist_database_domain("playlist_database");
void
playlist_vector_save(BufferedOutputStream &os, const PlaylistVector &pv)
{
@@ -41,9 +38,8 @@ playlist_vector_save(BufferedOutputStream &os, const PlaylistVector &pv)
pi.name.c_str(), (long)pi.mtime);
}
bool
playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name,
Error &error)
void
playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name)
{
PlaylistInfo pm(name, 0);
@@ -53,24 +49,19 @@ playlist_metadata_load(TextFile &file, PlaylistVector &pv, const char *name,
while ((line = file.ReadLine()) != nullptr &&
strcmp(line, "playlist_end") != 0) {
colon = strchr(line, ':');
if (colon == nullptr || colon == line) {
error.Format(playlist_database_domain,
"unknown line in db: %s", line);
return false;
}
if (colon == nullptr || colon == line)
throw FormatRuntimeError("unknown line in db: %s",
line);
*colon++ = 0;
value = StripLeft(colon);
if (strcmp(line, "mtime") == 0)
pm.mtime = strtol(value, nullptr, 10);
else {
error.Format(playlist_database_domain,
"unknown line in db: %s", line);
return false;
}
else
throw FormatRuntimeError("unknown line in db: %s",
line);
}
pv.UpdateOrInsert(std::move(pm));
return true;
}