wagtail 7.2.1__py3-none-any.whl → 7.3rc1__py3-none-any.whl

wagtail/images/tests/test_image_operations.py

@@ -762,7 +762,7 @@ class TestAvifQualityFilter(TestCase):
         with patch("PIL.Image.Image.save") as save:
             fil.run(image, f)
 
-        save.assert_called_with(f, "AVIF", quality=80)
+        save.assert_called_with(f, "AVIF", quality=61)
 
     def test_avif_quality_filter(self):
         fil = Filter(spec="width-400|avifquality-40|format-avif")
@@ -842,7 +842,7 @@ class TestJPEGQualityFilter(TestCase):
         with patch("PIL.Image.Image.save") as save:
             fil.run(image, f)
 
-        save.assert_called_with(f, "JPEG", quality=85, optimize=True, progressive=True)
+        save.assert_called_with(f, "JPEG", quality=76, optimize=True, progressive=True)
 
     def test_jpeg_quality_filter(self):
         fil = Filter(spec="width-400|jpegquality-40")

wagtail/images/tests/test_models.py

@@ -1356,7 +1356,6 @@ class TestIssue613(WagtailTestUtils, TestCase):
             # Add an image with some tags
             image = self.add_image(tags="hello")
 
-            # TODO: remove this when https://github.com/kaedroho/django-modelsearch/pull/40 is merged and released
             search_backend.refresh_indexes()
 
             # Search for it by tag
@@ -1385,7 +1384,6 @@ class TestIssue613(WagtailTestUtils, TestCase):
             # Add an image with some tags
             image = self.edit_image(tags="hello")
 
-            # TODO: remove this when https://github.com/kaedroho/django-modelsearch/pull/40 is merged and released
             search_backend.refresh_indexes()
 
             # Search for it by tag

wagtail/images/views/bulk_actions/add_tags.py

@@ -27,7 +27,7 @@ class AddTagsBulkAction(ImageBulkAction):
         return {"tags": self.cleaned_form.cleaned_data["tags"].split(",")}
 
     @classmethod
-    def execute_action(cls, images, tags=[], **kwargs):
+    def execute_action(cls, images, tags=None, **kwargs):
         num_parent_objects = 0
         if not tags:
             return

wagtail/images/views/images.py

@@ -1,16 +1,22 @@
+import json
 import os
 from tempfile import SpooledTemporaryFile
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
-from django.http import FileResponse, HttpResponse, JsonResponse
+from django.core.serializers.json import DjangoJSONEncoder
+from django.http import (
+    FileResponse,
+    HttpResponse,
+    HttpResponseBadRequest,
+    HttpResponseForbidden,
+)
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy, ngettext
-from django.views import View
 
 from wagtail.admin import messages
 from wagtail.admin.auth import PermissionPolicyChecker
@@ -315,66 +321,69 @@ class URLGeneratorView(generic.InspectView):
     model = get_image_model()
     pk_url_kwarg = "image_id"
     header_icon = "image"
+    output_only = False
     page_title = gettext_lazy("Generate URL")
     template_name = "wagtailimages/images/url_generator.html"
+    output_template_name = "wagtailimages/images/url_generator_output.html"
     index_url_name = "wagtailimages:index"
     edit_url_name = "wagtailimages:edit"
 
+    invalid_filter_error = gettext_lazy(
+        "The filter options you have selected are not valid."
+    )
+
     def get_page_subtitle(self):
         return self.object.title
 
     def get_fields(self):
         return []
 
+    def get_template_names(self):
+        if self.output_only:
+            self.template_name = self.output_template_name
+        return super().get_template_names()
+
     def get(self, request, image_id, *args, **kwargs):
         self.object = get_object_or_404(self.model, id=image_id)
 
         if not permission_policy.user_has_permission_for_instance(
             request.user, "change", self.object
         ):
+            if self.output_only:
+                return HttpResponseForbidden(
+                    "You do not have permission to generate a URL for this image."
+                )
+
             raise PermissionDenied
 
-        self.form = URLGeneratorForm(
-            initial={
-                "filter_method": "original",
-                "width": self.object.width,
-                "height": self.object.height,
-            }
-        )
+        data = {
+            "filter_method": request.GET.get("filter_method", "original"),
+            "width": request.GET.get("width", self.object.width),
+            "height": request.GET.get("height", self.object.height),
+            "closeness": request.GET.get("closeness", "0"),
+        }
 
-        return self.render_to_response(self.get_context_data())
+        self.filter_spec = self.get_filter_spec(**data)
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["form"] = self.form
-        return context
+        # Parse the filter spec to make sure it's valid
+        try:
+            Filter(spec=self.filter_spec).operations
+        except InvalidFilterSpecError as e:
+            if self.output_only:
+                return HttpResponseBadRequest(
+                    f"Invalid filter spec: `{self.filter_spec}`. {str(e)}."
+                )
+            messages.error(request, self.invalid_filter_error)
 
+        self.form = URLGeneratorForm(initial=data)
 
-class GenerateURLView(View):
-    def get(self, request, image_id, filter_spec):
-        # Get the image
-        Image = get_image_model()
-        try:
-            image = Image.objects.get(id=image_id)
-        except Image.DoesNotExist:
-            return JsonResponse({"error": "Cannot find image."}, status=404)
+        return self.render_to_response(self.get_context_data())
 
-        # Check if this user has edit permission on this image
-        if not permission_policy.user_has_permission_for_instance(
-            request.user, "change", image
-        ):
-            return JsonResponse(
-                {
-                    "error": "You do not have permission to generate a URL for this image."
-                },
-                status=403,
-            )
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
 
-        # Parse the filter spec to make sure it's valid
-        try:
-            Filter(spec=filter_spec).operations
-        except InvalidFilterSpecError:
-            return JsonResponse({"error": "Invalid filter spec."}, status=400)
+        filter_spec = self.filter_spec
+        image_id = self.object.pk
 
         # Generate url
         signature = generate_signature(image_id, filter_spec)
@@ -389,10 +398,34 @@ class GenerateURLView(View):
         # Generate preview url
         preview_url = reverse("wagtailimages:preview", args=(image_id, filter_spec))
 
-        return JsonResponse(
-            {"url": site_root_url + url, "preview_url": preview_url}, status=200
+        message_labels = json.dumps(
+            {"400": self.invalid_filter_error},
+            cls=DjangoJSONEncoder,
         )
 
+        context["form"] = self.form
+        context["message_labels"] = message_labels
+        context["preview_url"] = preview_url
+        context["result_url"] = site_root_url + url
+
+        return context
+
+    def get_filter_spec(self, filter_method, width, height, closeness):
+        match filter_method:
+            case "width":
+                return f"{filter_method}-{width}"
+            case "height":
+                return f"{filter_method}-{height}"
+            case "min" | "max":
+                return f"{filter_method}-{width}x{height}"
+            case "fill":
+                spec = f"{filter_method}-{width}x{height}"
+                if closeness != "0":
+                    spec += f"-c{closeness}"
+                return spec
+            case _:
+                return filter_method
+
 
 def preview(request, image_id, filter_spec):
     image = get_object_or_404(get_image_model(), id=image_id)