Merge branch 'fix-image-paths' into 'master'

Fix double URL-encoded image paths

See merge request !202

arkindex/images/migrations/0007_fix_paths.py

+# Generated by Django 2.1 on 2019-01-31 14:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0006_unique_server_url'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='image',
+            name='path',
+            field=models.TextField(),
+        ),
+    ]

arkindex/images/models.py

@@ -84,7 +84,7 @@ class Image(IndexableModel):
     A document image
     """
     server = models.ForeignKey(ImageServer, on_delete=models.CASCADE, related_name='images')
-    path = models.URLField()
+    path = models.TextField()
     width = models.PositiveIntegerField(default=0)
     height = models.PositiveIntegerField(default=0)
     status = EnumField(ImageStatus, default=ImageStatus.Unchecked, max_length=50)

arkindex/images/tests.py

@@ -143,3 +143,15 @@ class TestImageServer(FixtureTestCase):
         server = ImageServer.objects.create(name='dummy', url='http://test/iiif')
         image = server.find_image('https://test/iiif/dog.jpg', width=800, height=600)
         self.assertEqual(image.status, ImageStatus.Error)  # connection error, no exception
+
+
+class TestImage(FixtureTestCase):
+
+    def test_path_not_encoded(self):
+        """
+        Assert that an image's path is not URL encoded when created
+        This can yield to images with URLs such as http://.../test%34test to be encoded as http://.../test%2534test
+        """
+        img = Image.objects.create(server=self.imgsrv, path='!#%:+*')
+        img.refresh_from_db()
+        self.assertEqual(img.path, '!#%:+*')