diff options
| author | Max Kellermann <max@musicpd.org> | 2018-07-06 19:26:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-07-06 19:26:11 +0200 |
| commit | 466625f7ad9066eeb25383b0ad6f63954b1af9f8 (patch) | |
| tree | 1a1f1b3352ba31d0207c2a11b06a810a6120c153 /src/input | |
| parent | b8259e604ab6f77f8c0c0d27f0ee095a36d8007b (diff) | |
input/curl: use new class HttpStatusError
This way, IsFileNotFound() can detect status 404.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Error.cxx | 8 | ||||
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/input/Error.cxx b/src/input/Error.cxx index ae7b9d7de..3db1f26f1 100644 --- a/src/input/Error.cxx +++ b/src/input/Error.cxx @@ -21,6 +21,10 @@ #include "Error.hxx" #include "system/Error.hxx" +#ifdef ENABLE_CURL +#include "lib/curl/Error.hxx" +#endif + #ifdef ENABLE_NFS #include "lib/nfs/Error.hxx" #include <nfsc/libnfs-raw-nfs.h> @@ -33,6 +37,10 @@ IsFileNotFound(std::exception_ptr ep) std::rethrow_exception(ep); } catch (const std::system_error &e) { return IsFileNotFound(e); +#ifdef ENABLE_CURL + } catch (const HttpStatusError &e) { + return e.GetStatus() == 404; +#endif #ifdef ENABLE_NFS } catch (const NfsClientError &e) { return e.GetCode() == NFS3ERR_NOENT; diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 6e1cf42f2..d9887727f 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -19,6 +19,7 @@ #include "config.h" #include "CurlInputPlugin.hxx" +#include "lib/curl/Error.hxx" #include "lib/curl/Easy.hxx" #include "lib/curl/Global.hxx" #include "lib/curl/Request.hxx" @@ -188,7 +189,9 @@ CurlInputStream::OnHeaders(unsigned status, assert(!postponed_exception); if (status < 200 || status >= 300) - throw FormatRuntimeError("got HTTP status %ld", status); + throw HttpStatusError(status, + StringFormat<40>("got HTTP status %u", + status).c_str()); const std::lock_guard<Mutex> protect(mutex); |