diff options
| author | Philip Withnall <pwithnall@endlessos.org> | 2021-03-16 13:18:32 +0000 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2021-03-17 17:02:16 +0000 |
| commit | dbd62f6e054aab8ad8fd36a81023a247fdd543d8 (patch) | |
| tree | 4d40c5893b686447da4e622503705aaf5aba154b | |
| parent | 8316f50f1bb39609a2f625dfefa600e08c5cd8d7 (diff) | |
| download | appstream-glib-dbd62f6e054aab8ad8fd36a81023a247fdd543d8.tar.gz | |
libappstream-builder: Fix paths for cached icons
As per
https://www.freedesktop.org/software/appstream/docs/sect-AppStream-IconCache.html#spec-iconcache-location,
the size of an icon should be specified in its `width` and `height`
attributes, rather than as part of its name.
This was resulting in icons like this in the rpmfusion-free-33 appdata:
```
<icon type="cached" height="128" width="128">128x128/chromium-browser-privacy.png</icon>
```
which were then being resolved to the path:
```
/usr/share/app-info/icons/rpmfusion-free-33/128x128/128x128/chromium-browser-privacy.png
```
which contains a duplicate size subdirectory.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
| -rw-r--r-- | libappstream-builder/plugins/asb-plugin-font.c | 11 | ||||
| -rw-r--r-- | libappstream-builder/plugins/asb-plugin-icon.c | 19 |
2 files changed, 11 insertions, 19 deletions
diff --git a/libappstream-builder/plugins/asb-plugin-font.c b/libappstream-builder/plugins/asb-plugin-font.c index 6fda2d1..2e64151 100644 --- a/libappstream-builder/plugins/asb-plugin-font.c +++ b/libappstream-builder/plugins/asb-plugin-font.c @@ -662,17 +662,14 @@ asb_plugin_font_app (AsbPlugin *plugin, AsbApp *app, } /* add icon */ - if (asb_context_get_flag (plugin->ctx, ASB_CONTEXT_FLAG_HIDPI_ICONS)) { - icon_filename = g_strdup_printf ("64x64/%s.png", - as_app_get_id_filename (AS_APP (app))); - } else { - icon_filename = g_strdup_printf ("%s.png", - as_app_get_id_filename (AS_APP (app))); - } + icon_filename = g_strdup_printf ("%s.png", + as_app_get_id_filename (AS_APP (app))); icon = as_icon_new (); as_icon_set_kind (icon, AS_ICON_KIND_CACHED); as_icon_set_name (icon, icon_filename); as_icon_set_pixbuf (icon, pixbuf); + as_icon_set_width (icon, 64); + as_icon_set_height (icon, 64); as_app_add_icon (AS_APP (app), icon); } out: diff --git a/libappstream-builder/plugins/asb-plugin-icon.c b/libappstream-builder/plugins/asb-plugin-icon.c index f105cc8..7e5bd37 100644 --- a/libappstream-builder/plugins/asb-plugin-icon.c +++ b/libappstream-builder/plugins/asb-plugin-icon.c @@ -99,18 +99,14 @@ asb_plugin_icon_convert_cached (AsbPlugin *plugin, } /* save in target directory */ - if (asb_context_get_flag (plugin->ctx, ASB_CONTEXT_FLAG_HIDPI_ICONS)) { - name = g_strdup_printf ("%ix%i/%s.png", - 64, 64, - as_app_get_id_filename (AS_APP (app))); - } else { - name = g_strdup_printf ("%s.png", - as_app_get_id_filename (AS_APP (app))); - } + name = g_strdup_printf ("%s.png", + as_app_get_id_filename (AS_APP (app))); icon = as_icon_new (); as_icon_set_pixbuf (icon, pixbuf); as_icon_set_name (icon, name); as_icon_set_kind (icon, AS_ICON_KIND_CACHED); + as_icon_set_width (icon, 64); + as_icon_set_height (icon, 64); as_icon_set_prefix (icon, as_app_get_icon_path (AS_APP (app))); as_app_add_icon (AS_APP (app), icon); @@ -137,13 +133,12 @@ asb_plugin_icon_convert_cached (AsbPlugin *plugin, as_app_add_kudo_kind (AS_APP (app), AS_KUDO_KIND_HI_DPI_ICON); /* save icon */ - name_hidpi = g_strdup_printf ("%ix%i/%s.png", - 128, 128, - as_app_get_id_filename (AS_APP (app))); icon_hidpi = as_icon_new (); as_icon_set_pixbuf (icon_hidpi, pixbuf_hidpi); - as_icon_set_name (icon_hidpi, name_hidpi); + as_icon_set_name (icon_hidpi, name); as_icon_set_kind (icon_hidpi, AS_ICON_KIND_CACHED); + as_icon_set_width (icon_hidpi, 128); + as_icon_set_height (icon_hidpi, 128); as_icon_set_prefix (icon_hidpi, as_app_get_icon_path (AS_APP (app))); as_app_add_icon (AS_APP (app), icon_hidpi); return TRUE; |