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

db/update: catch exceptions from Storage plugins

Browse Source
This commit is contained in:
Max Kellermann 2016-09-16 17:05:28 +02:00
parent ab967462e6
commit 100308db02
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SongUpdate.cxx
View File

@ -35,6 +35,8 @@
#include "TagArchive.hxx" #include "TagArchive.hxx"
#endif #endif
#include <stdexcept>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -65,8 +67,13 @@ Song::UpdateFile(Storage &storage)
const auto &relative_uri = GetURI(); const auto &relative_uri = GetURI();
StorageFileInfo info; StorageFileInfo info;
if (!storage.GetInfo(relative_uri.c_str(), true, info, IgnoreError())) try {
if (!storage.GetInfo(relative_uri.c_str(), true, info,
IgnoreError()))
return false;
} catch (const std::runtime_error &) {
return false; return false;
}
if (!info.IsRegular()) if (!info.IsRegular())
return false; return false;

23
src/db/update/UpdateIO.cxx
View File

@ -28,34 +28,47 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <stdexcept>
#include <errno.h> #include <errno.h>
bool bool
GetInfo(Storage &storage, const char *uri_utf8, StorageFileInfo &info) GetInfo(Storage &storage, const char *uri_utf8, StorageFileInfo &info)
{ try {
Error error; Error error;
bool success = storage.GetInfo(uri_utf8, true, info, error); bool success = storage.GetInfo(uri_utf8, true, info, error);
if (!success) if (!success)
LogError(error); LogError(error);
return success; return success;
} catch (const std::runtime_error &e) {
LogError(e);
return false;
} }
bool bool
GetInfo(StorageDirectoryReader &reader, StorageFileInfo &info) GetInfo(StorageDirectoryReader &reader, StorageFileInfo &info)
{ try {
Error error; Error error;
bool success = reader.GetInfo(true, info, error); bool success = reader.GetInfo(true, info, error);
if (!success) if (!success)
LogError(error); LogError(error);
return success; return success;
} catch (const std::runtime_error &e) {
LogError(e);
return false;
} }
bool bool
DirectoryExists(Storage &storage, const Directory &directory) DirectoryExists(Storage &storage, const Directory &directory)
{ {
StorageFileInfo info; StorageFileInfo info;
if (!storage.GetInfo(directory.GetPath(), true, info, IgnoreError()))
try {
if (!storage.GetInfo(directory.GetPath(), true, info, IgnoreError()))
return false;
} catch (const std::runtime_error &) {
return false; return false;
}
return directory.device == DEVICE_INARCHIVE || return directory.device == DEVICE_INARCHIVE ||
directory.device == DEVICE_CONTAINER directory.device == DEVICE_CONTAINER
@ -75,11 +88,13 @@ GetDirectoryChildInfo(Storage &storage, const Directory &directory,
bool bool
directory_child_is_regular(Storage &storage, const Directory &directory, directory_child_is_regular(Storage &storage, const Directory &directory,
const char *name_utf8) const char *name_utf8)
{ try {
StorageFileInfo info; StorageFileInfo info;
return GetDirectoryChildInfo(storage, directory, name_utf8, info, return GetDirectoryChildInfo(storage, directory, name_utf8, info,
IgnoreError()) && IgnoreError()) &&
info.IsRegular(); info.IsRegular();
} catch (const std::runtime_error &) {
return false;
} }
bool bool

19
src/db/update/Walk.cxx
View File

@ -42,11 +42,13 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <stdexcept>
#include <memory>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <memory>
UpdateWalk::UpdateWalk(EventLoop &_loop, DatabaseListener &_listener, UpdateWalk::UpdateWalk(EventLoop &_loop, DatabaseListener &_listener,
Storage &_storage) Storage &_storage)
@ -333,10 +335,17 @@ UpdateWalk::UpdateDirectory(Directory &directory,
directory_set_stat(directory, info); directory_set_stat(directory, info);
Error error; std::unique_ptr<StorageDirectoryReader> reader;
const std::unique_ptr<StorageDirectoryReader> reader(storage.OpenDirectory(directory.GetPath(), error));
if (reader.get() == nullptr) { try {
LogError(error); Error error;
reader.reset(storage.OpenDirectory(directory.GetPath(), error));
if (!reader) {
LogError(error);
return false;
}
} catch (const std::runtime_error &e) {
LogError(e);
return false; return false;
} }