server/func: handle download errors

2 files changed, 7 insertions, 2 deletions

diff --git a/API.md b/API.md
index df83415..27d4de7 100644
--- a/API.md
+++ b/API.md
@@ -169,6 +169,7 @@ List of possible error names:
 - `InvalidPasswordError`
 - `InvalidRankError`
 - `InvalidAvatarError`
+- `ProcessingError` (failed to generate thumbnail or download remote file)
 - `ValidationError` (catch all for odd validation errors)
 
 
diff --git a/server/szurubooru/func/net.py b/server/szurubooru/func/net.py
index 65c01c0..62ac4c3 100644
--- a/server/szurubooru/func/net.py
+++ b/server/szurubooru/func/net.py
@@ -1,9 +1,13 @@
 import urllib.request
+from szurubooru import errors
 
 
 def download(url):
     assert url
     request = urllib.request.Request(url)
     request.add_header('Referer', url)
-    with urllib.request.urlopen(request) as handle:
-        return handle.read()
+    try:
+        with urllib.request.urlopen(request) as handle:
+            return handle.read()
+    except Exception as e:
+        raise errors.ProcessingError('Error downloading %s (%s)' % (url, e))