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

lib/sqlite, sticker: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-10-27 07:50:08 +02:00
parent 8d41e9658f
commit 10e32454ef
11 changed files with 255 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/command/StickerCommands.cxx
View File

@@ -25,13 +25,11 @@
#include "sticker/SongSticker.hxx"
#include "sticker/StickerPrint.hxx"
#include "sticker/StickerDatabase.hxx"
#include "CommandError.hxx"
#include "client/Client.hxx"
#include "client/Response.hxx"
#include "Partition.hxx"
#include "util/Error.hxx"
#include "util/ConstBuffer.hxx"
#include "util/StringAPI.hxx"
#include "util/ScopeExit.hxx"
struct sticker_song_find_data {
Response &r;
@@ -53,7 +51,6 @@ sticker_song_find_print_cb(const LightSong &song, const char *value,
static CommandResult
handle_sticker_song(Response &r, Partition &partition, Request args)
{
Error error;
const Database &db = partition.GetDatabaseOrThrow();
const char *const cmd = args.front();
@@ -61,14 +58,11 @@ handle_sticker_song(Response &r, Partition &partition, Request args)
/* get song song_id key */
if (args.size == 4 && StringIsEqual(cmd, "get")) {
const LightSong *song = db.GetSong(args[2]);
assert(song != nullptr);
AtScopeExit(&db, song) { db.ReturnSong(song); };
const auto value = sticker_song_get_value(*song, args[3],
error);
db.ReturnSong(song);
const auto value = sticker_song_get_value(*song, args[3]);
if (value.empty()) {
if (error.IsDefined())
return print_error(r, error);
r.Error(ACK_ERROR_NO_EXIST, "no such sticker");
return CommandResult::ERROR;
}
@@ -80,48 +74,34 @@ handle_sticker_song(Response &r, Partition &partition, Request args)
} else if (args.size == 3 && StringIsEqual(cmd, "list")) {
const LightSong *song = db.GetSong(args[2]);
assert(song != nullptr);
AtScopeExit(&db, song) { db.ReturnSong(song); };
Sticker *sticker = sticker_song_get(*song, error);
db.ReturnSong(song);
Sticker *sticker = sticker_song_get(*song);
if (sticker) {
sticker_print(r, *sticker);
sticker_free(sticker);
} else if (error.IsDefined())
return print_error(r, error);
}
return CommandResult::OK;
/* set song song_id id key */
} else if (args.size == 5 && StringIsEqual(cmd, "set")) {
const LightSong *song = db.GetSong(args[2]);
assert(song != nullptr);
AtScopeExit(&db, song) { db.ReturnSong(song); };
bool ret = sticker_song_set_value(*song, args[3], args[4],
error);
db.ReturnSong(song);
if (!ret) {
if (error.IsDefined())
return print_error(r, error);
r.Error(ACK_ERROR_SYSTEM,
"failed to set sticker value");
return CommandResult::ERROR;
}
sticker_song_set_value(*song, args[3], args[4]);
return CommandResult::OK;
/* delete song song_id [key] */
} else if ((args.size == 3 || args.size == 4) &&
StringIsEqual(cmd, "delete")) {
const LightSong *song = db.GetSong(args[2]);
assert(song != nullptr);
AtScopeExit(&db, song) { db.ReturnSong(song); };
bool ret = args.size == 3
? sticker_song_delete(*song, error)
: sticker_song_delete_value(*song, args[3], error);
db.ReturnSong(song);
? sticker_song_delete(*song)
: sticker_song_delete_value(*song, args[3]);
if (!ret) {
if (error.IsDefined())
return print_error(r, error);
r.Error(ACK_ERROR_SYSTEM, "no such sticker");
return CommandResult::ERROR;
}
@@ -161,17 +141,9 @@ handle_sticker_song(Response &r, Partition &partition, Request args)
args[3],
};
if (!sticker_song_find(db, base_uri, data.name,
op, value,
sticker_song_find_print_cb, &data,
error)) {
if (error.IsDefined())
return print_error(r, error);
r.Error(ACK_ERROR_SYSTEM,
"failed to set search sticker database");
return CommandResult::ERROR;
}
sticker_song_find(db, base_uri, data.name,
op, value,
sticker_song_find_print_cb, &data);
return CommandResult::OK;
} else {