Merge branch 'release/0.7.1' into main

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.7.1
+-----
+
+* Improved error handling for connection errors when importing IIIF manifests
+
 0.7
 ---
 

djiffy/__init__.py

@@ -1,6 +1,6 @@
 default_app_config = 'djiffy.apps.DjiffyConfig'
 
-__version_info__ = (0, 7, 0, None)
+__version_info__ = (0, 7, 1, None)
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.

djiffy/importer.py

@@ -49,7 +49,7 @@ def import_paths(self, paths):
             try:
                 manifest = IIIFPresentation.from_file_or_url(path)
             except IIIFException as err:
-                self.stderr.write(str(err))
+                self.error_msg(str(err))
                 continue
 
             if manifest.type == 'sc:Collection':

djiffy/models.py

@@ -13,6 +13,7 @@
 import rdflib
 from rdflib.namespace import DC
 import requests
+from requests.exceptions import ConnectionError
 
 
 def get_iiif_url(url):
@@ -311,21 +312,24 @@ def from_url(cls, uri):
         :raises: :class:`IIIFException` if URL is not retrieved successfully,
             if the response is not JSON content, or if the JSON cannot be parsed.
         '''
-        response = get_iiif_url(uri)
-        if response.status_code == requests.codes.ok:
-            try:
-                return cls(response.json())
-            except json.decoder.JSONDecodeError as err:
-                # if json fails, two possibilities:
-                # - we didn't actually get json (e.g. redirect for auth)
-                if 'application/json' not in response.headers['content-type']:
-                    raise IIIFException('No JSON found at %s' % uri)
-                # - there is something wrong with the json
-                raise IIIFException('Error parsing JSON for %s: %s' %
-                    (uri, err))
-
-        raise IIIFException('Error retrieving manifest at %s: %s %s' %
-            (uri, response.status_code, response.reason))
+        try:
+            response = get_iiif_url(uri)
+            if response.status_code == requests.codes.ok:
+                try:
+                    return cls(response.json())
+                except json.decoder.JSONDecodeError as err:
+                    # if json fails, two possibilities:
+                    # - we didn't actually get json (e.g. redirect for auth)
+                    if 'application/json' not in response.headers['content-type']:
+                        raise IIIFException('No JSON found at %s' % uri)
+                    # - there is something wrong with the json
+                    raise IIIFException('Error parsing JSON for %s: %s' %
+                        (uri, err))
+            raise IIIFException('Error retrieving manifest at %s: %s %s' %
+                (uri, response.status_code, response.reason))
+        except ConnectionError:
+            # could not reach URL to get a status code in the first place
+            raise IIIFException('Error connecting to manifest at %s' % uri)
 
     @classmethod
     def is_url(cls, url):

djiffy/tests.py

@@ -360,6 +360,12 @@ def test_from_url(self):
                 IIIFPresentation.from_url(manifest_url)
             assert 'Error parsing JSON' in str(excinfo.value)
 
+    def test_from_url_bad_domain(self):
+        manifest_url = 'http://ma.ni/fe.st'
+        with pytest.raises(IIIFException):
+            IIIFPresentation.from_url(manifest_url)
+
+
     def test_from_url_or_file(self):
         with patch.object(IIIFPresentation, 'from_url') as mock_from_url:
             # local fixture file