Handle invalid icon in plugins list and details

qgis · Jun 6, 2024 · b792327 · b792327
1 parent 75a5de1
commit b792327
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/qgis-app/plugins/templates/plugins/plugin_detail.html b/qgis-app/plugins/templates/plugins/plugin_detail.html
@@ -144,7 +144,7 @@ <h2>
         <div class="span12">
         {% endif %}
             <h2>{{ object.name }}
-            {% if object.icon and object.icon.file %}
+            {% if object.icon and object.icon.file and object.icon|is_image_valid %}
                 {% with image_extension=object.icon.name|file_extension %}
                     {% if image_extension == 'svg' %}
                         <img class="pull-right plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ object.icon.url }}" width="24" height="24" />
@@ -154,6 +154,8 @@ <h2>{{ object.name }}
                         {% endthumbnail %}
                     {% endif %}
                 {% endwith %}
+            {% else %}
+                <img height="32" width="32" class="pull-right plugin-icon" src="{% static "images/qgis-icon-32x32.png" %}" alt="{% trans "Plugin icon" %}" />
             {% endif %}
             </h2>
             <div>

diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html
@@ -80,7 +80,7 @@ <h2>{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}</h2>
             {% for object in object_list %}
             <tr class="pmain {% if object.deprecated %} error deprecated{% endif %}" id="pmain{{object.pk}}">
                 <td><a title="{% if object.deprecated %} [DEPRECATED] {% endif %}{% trans "Click here for plugin details" %}" href="{% url "plugin_detail" object.package_name %}">
-                {% if object.icon and object.icon.file %}
+                {% if object.icon and object.icon.file and object.icon|is_image_valid %}
                     {% with image_extension=object.icon.name|file_extension %}
                         {% if image_extension == 'svg' %}
                             <img class="pull-right plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ object.icon.url }}" width="24" height="24" />

diff --git a/qgis-app/plugins/templatetags/plugin_utils.py b/qgis-app/plugins/templatetags/plugin_utils.py
@@ -1,4 +1,5 @@
 from django import template
+from PIL import Image, UnidentifiedImageError
 
 register = template.Library()
 
@@ -27,4 +28,15 @@ def plugin_title(context):
 
 @register.filter
 def file_extension(value):
-    return value.split('.')[-1].lower()
+    return value.split('.')[-1].lower()
+
+@register.filter
+def is_image_valid(image):
+    if not image:
+        return False
+    try:
+        img = Image.open(image.path)
+        img.verify()
+        return True
+    except (FileNotFoundError, UnidentifiedImageError):
+        return False