From 5054f5d5f3b672c997a649acd1203f61c6742dd6 Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Wed, 31 Jan 2024 18:13:00 +0300
Subject: [PATCH] Fix svg icons display issue in plugin list and plugin detail
 (#348)

---
 .../plugins/templates/plugins/plugin_detail.html    | 13 ++++++++++---
 qgis-app/plugins/templates/plugins/plugin_list.html | 13 ++++++++++---
 qgis-app/plugins/templatetags/plugin_utils.py       |  4 ++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/qgis-app/plugins/templates/plugins/plugin_detail.html b/qgis-app/plugins/templates/plugins/plugin_detail.html
index 101b8194..82ac70c9 100644
--- a/qgis-app/plugins/templates/plugins/plugin_detail.html
+++ b/qgis-app/plugins/templates/plugins/plugin_detail.html
@@ -1,5 +1,6 @@
 {% extends 'plugins/plugin_base.html' %}{% load i18n static thumbnail %}
 {% load local_timezone %}
+{% load plugin_utils %}
 {% block extrajs %}
 {{ block.super }}
 <script type="text/javascript" src="{% static "js/jquery.cookie.js" %}"></script>
@@ -144,9 +145,15 @@ <h2>
         {% endif %}
             <h2>{{ object.name }}
             {% if object.icon and object.icon.file %}
-                {% thumbnail object.icon "128x128" upscale=False format="PNG" as im %}
-                    <img class="pull-right plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
-                {% endthumbnail %}
+                {% 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" />
+                    {% else %}
+                        {% thumbnail object.icon "128x128" upscale=False format="PNG" as im %}
+                            <img class="pull-right plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
+                        {% endthumbnail %}
+                    {% endif %}
+                {% endwith %}
             {% endif %}
             </h2>
             <div>
diff --git a/qgis-app/plugins/templates/plugins/plugin_list.html b/qgis-app/plugins/templates/plugins/plugin_list.html
index c959d4f8..788053d6 100644
--- a/qgis-app/plugins/templates/plugins/plugin_list.html
+++ b/qgis-app/plugins/templates/plugins/plugin_list.html
@@ -1,5 +1,6 @@
 {% extends 'plugins/plugin_base.html' %}{% load i18n bootstrap_pagination humanize static sort_anchor range_filter thumbnail %}
 {% load local_timezone %}
+{% load plugin_utils %}
 {% block extrajs %}
   <script type="text/javascript" src="{% static "js/jquery.cookie.js" %}"></script>
   <script language="javascript">
@@ -80,9 +81,15 @@ <h2>{% if title %}{{title}}{% else %}{% trans "All plugins" %}{% endif %}</h2>
             <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 %}
-                {% thumbnail object.icon "24x24" format="PNG" as im %}
-                    <img class="plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
-                {% endthumbnail %}
+                    {% 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" />
+                        {% else %}
+                            {% thumbnail object.icon "24x24" format="PNG" as im %}
+                                <img class="plugin-icon" alt="{% trans "Plugin icon" %}" src="{{ im.url }}" width="{{ im.x }}" height="{{ im.y }}" />
+                            {% endthumbnail %}
+                        {% endif %}
+                    {% endwith %}
                 {% else %}
                     <img height="32" width="32" class="plugin-icon" src="{% static "images/qgis-icon-32x32.png" %}" alt="{% trans "Plugin icon" %}" />
                 {% endif %}
diff --git a/qgis-app/plugins/templatetags/plugin_utils.py b/qgis-app/plugins/templatetags/plugin_utils.py
index 9eb8fbec..887eee83 100755
--- a/qgis-app/plugins/templatetags/plugin_utils.py
+++ b/qgis-app/plugins/templatetags/plugin_utils.py
@@ -24,3 +24,7 @@ def plugin_title(context):
     if "page_title" in context:
         title = context["page_title"]
     return title
+
+@register.filter
+def file_extension(value):
+    return value.split('.')[-1].lower()
\ No newline at end of file