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

queue/Save: queue_load_song() throws on error

Browse Source 
Don't catch and log exceptions here; let the caller decide.
This commit is contained in:
Max Kellermann 2019-09-05 20:55:18 +02:00
parent 7775691965
commit 57808d1a1b
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/queue/QueueSave.cxx
View File

@ -95,20 +95,12 @@ queue_load_song(TextFile &file, const SongLoader &loader,
if ((p = StringAfterPrefix(line, SONG_BEGIN))) { if ((p = StringAfterPrefix(line, SONG_BEGIN))) {
const char *uri = p; const char *uri = p;
try { song = song_load(file, uri);
song = song_load(file, uri);
} catch (...) {
LogError(std::current_exception());
return;
}
} else { } else {
char *endptr; char *endptr;
long ret = strtol(line, &endptr, 10); long ret = strtol(line, &endptr, 10);
if (ret < 0 || *endptr != ':' || endptr[1] == 0) { if (ret < 0 || *endptr != ':' || endptr[1] == 0)
LogError(playlist_domain, throw std::runtime_error("Malformed playlist line in state file");
"Malformed playlist line in state file");
return;
}
const char *uri = endptr + 1; const char *uri = endptr + 1;

2
src/queue/QueueSave.hxx
View File

@ -35,6 +35,8 @@ queue_save(BufferedOutputStream &os, const Queue &queue);
/** /**
* Loads one song from the state file and appends it to the queue. * Loads one song from the state file and appends it to the queue.
*
* Throws on error.
*/ */
void void
queue_load_song(TextFile &file, const SongLoader &loader, queue_load_song(TextFile &file, const SongLoader &loader,