fix(icons): incorrect file icons

changelog.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## [Unreleased]
+## [Unreleased]
+### features
+- add button to clear the cached icons on settings.
+
+### enhancements
+- allow custom icons by extension on icon packs.
+
+### fix
+- error on file icons.
+
 ## [2.1.7]
 ### fix
 - power module not clickable on toolbar.

src/apps/seelen_rofi/modules/launcher/infra/Item.tsx

@@ -1,29 +1,24 @@
 import { SeelenCommand } from '@seelen-ui/lib';
-import { path } from '@tauri-apps/api';
-import { convertFileSrc, invoke } from '@tauri-apps/api/core';
+import { invoke } from '@tauri-apps/api/core';
 import { getCurrentWindow } from '@tauri-apps/api/window';
 import { Menu } from 'antd';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { BackgroundByLayersV2 } from '../../../../seelenweg/components/BackgroundByLayers/infra';
 
-import { useIcon } from 'src/apps/shared/hooks';
+import { FileIcon } from 'src/apps/shared/components/Icon';
 
 import { StartMenuApp } from '../../shared/store/domain';
 
 import { AnimatedDropdown } from '../../../../shared/components/AnimatedWrappers';
 import { OverflowTooltip } from '../../../../shared/components/OverflowTooltip';
 
-const MISSING_ICON_SRC = convertFileSrc(await path.resolveResource('static/icons/missing.png'));
-
 export const Item = memo(({ item, hidden }: { item: StartMenuApp; hidden: boolean }) => {
   const { path, umid } = item;
 
   const { t } = useTranslation();
 
-  const icon = useIcon({ path, umid: umid });
-
   function onClick() {
     invoke(SeelenCommand.OpenFile, { path });
     getCurrentWindow().hide();
@@ -78,7 +73,7 @@ export const Item = memo(({ item, hidden }: { item: StartMenuApp; hidden: boolea
         className="launcher-item"
         onClick={onClick}
       >
-        <img className="launcher-item-icon" src={icon || MISSING_ICON_SRC} />
+        <FileIcon className="launcher-item-icon" path={path} umid={umid} />
         <OverflowTooltip className="launcher-item-label" text={displayName} />
         <OverflowTooltip className="launcher-item-path" text={shortPath} />
       </button>

src/apps/seelenweg/modules/item/infra/MediaSession.tsx

@@ -10,12 +10,11 @@ import { LAZY_CONSTANTS } from '../../shared/utils/infra';
 
 import { calcLuminance } from '../../../../toolbar/modules/media/application';
 import { Selectors } from '../../shared/store/app';
-import { useIcon } from 'src/apps/shared/hooks';
 import { cx } from 'src/apps/shared/styles';
 
 import { MediaWegItem } from '../../shared/store/domain';
 
-import { Icon } from '../../../../shared/components/Icon';
+import { FileIcon, Icon } from '../../../../shared/components/Icon';
 import { WithContextMenu } from '../../../components/WithContextMenu';
 import { DraggableItem } from './DraggableItem';
 import { getMenuForItem } from './Menu';
@@ -33,8 +32,6 @@ export function MediaSession({ item }: { item: MediaWegItem }) {
   const sessions = useSelector(Selectors.mediaSessions);
   const session = sessions.find((s) => s.default);
 
-  let appIconSrc = useIcon({ umid: session?.umid });
-
   let thumbnailSrc = convertFileSrc(
     session?.thumbnail ? session.thumbnail : LAZY_CONSTANTS.DEFAULT_THUMBNAIL,
   );
@@ -80,7 +77,7 @@ export function MediaSession({ item }: { item: MediaWegItem }) {
             }}
           >
             <div className="media-session-thumbnail-container">
-              {appIconSrc && <img className="media-session-app-icon" src={appIconSrc} />}
+              <FileIcon className="media-session-app-icon" umid={session?.umid} noFallback />
               <img className="media-session-thumbnail" src={thumbnailSrc} />
             </div>
             <img className="media-session-blurred-thumbnail" src={thumbnailSrc} />

src/apps/seelenweg/modules/item/infra/UserApplication.tsx

@@ -1,16 +1,17 @@
 import { SeelenCommand, SeelenWegSide } from '@seelen-ui/lib';
-import { convertFileSrc, invoke } from '@tauri-apps/api/core';
+import { invoke } from '@tauri-apps/api/core';
 import moment from 'moment';
 import { memo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
 import { BackgroundByLayersV2 } from '../../../components/BackgroundByLayers/infra';
-import { LAZY_CONSTANTS, updatePreviews } from '../../shared/utils/infra';
+import { updatePreviews } from '../../shared/utils/infra';
 
 import { Selectors } from '../../shared/store/app';
 import { parseCommand } from 'src/apps/shared/Command';
-import { useIcon, useWindowFocusChange } from 'src/apps/shared/hooks';
+import { FileIcon } from 'src/apps/shared/components/Icon';
+import { useWindowFocusChange } from 'src/apps/shared/hooks';
 
 import { PinnedWegItem, TemporalWegItem } from '../../shared/store/domain';
 
@@ -37,12 +38,6 @@ export const UserApplication = memo(({ item, onAssociatedViewOpenChanged }: Prop
   const settings = useSelector(Selectors.settings);
   const focusedApp = useSelector(Selectors.focusedApp);
 
-  const iconSrc =
-    useIcon({
-      path: item.path,
-      umid: item.umid,
-    }) || convertFileSrc(LAZY_CONSTANTS.MISSING_ICON_PATH);
-
   const { t } = useTranslation();
   const calculatePlacement = (position: any) => {
     switch (position) {
@@ -91,7 +86,7 @@ export const UserApplication = memo(({ item, onAssociatedViewOpenChanged }: Prop
       className={cx({ 'associated-view-open': openPreview || openContextMenu })}
     >
       <WithContextMenu
-        items={getUserApplicationContextMenu(t, item, devTools, iconSrc) || []}
+        items={getUserApplicationContextMenu(t, item, devTools) || []}
         onOpenChange={(isOpen) => {
           setOpenContextMenu(isOpen);
           if (openPreview && isOpen) {
@@ -162,7 +157,7 @@ export const UserApplication = memo(({ item, onAssociatedViewOpenChanged }: Prop
             onContextMenu={(e) => e.stopPropagation()}
           >
             <BackgroundByLayersV2 prefix="item" />
-            <img className="weg-item-icon" src={iconSrc} />
+            <FileIcon className="weg-item-icon" path={item.path} umid={item.umid} />
             {notificationsCount > 0 && <div className="weg-item-badge">{notificationsCount}</div>}
             <div
               className={cx('weg-item-open-sign', {

src/apps/seelenweg/modules/item/infra/UserApplicationContextMenu.tsx

@@ -11,13 +11,12 @@ import { parseCommand } from 'src/apps/shared/Command';
 
 import { PinnedWegItem, TemporalWegItem } from '../../shared/store/domain';
 
-import { Icon } from '../../../../shared/components/Icon';
+import { FileIcon, Icon } from '../../../../shared/components/Icon';
 
 export function getUserApplicationContextMenu(
   t: TFunction,
   item: PinnedWegItem | TemporalWegItem,
   devTools: boolean,
-  iconSrc: string,
 ): ItemType[] {
   const isPinned = isPinnedApp(item);
 
@@ -59,7 +58,7 @@ export function getUserApplicationContextMenu(
     {
       key: 'weg_run_new',
       label: item.displayName,
-      icon: <img className="weg-context-menu-item-icon" src={iconSrc} />,
+      icon: <FileIcon className="weg-context-menu-item-icon" path={item.path} umid={item.umid} />,
       onClick: () => {
         const { program, args } = parseCommand(item.relaunchCommand);
         invoke(SeelenCommand.Run, { program, args, workingDir: item.relaunchIn });

src/apps/settings/i18n/translations/af.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Instellingslêer
   simulate_fullscreen: Simuleer volskerm gebeurtenis
 extras:
+  clear_icons: Maak stelselikone kas uit
+  clear_icons_tooltip: '''N Herbegin kan nodig wees om alle widgets ten volle in werking te stel'
   discord: Teenstrydigheid
   exit: Hou op/uitgang
   github: Github

src/apps/settings/i18n/translations/am.yml

@@ -82,6 +82,8 @@ devtools:
   settings_file: የቅንብሮች ፋይል
   simulate_fullscreen: የሙሉ ስክሪን ክስተት አስመስለው
 extras:
+  clear_icons: የስርዓት አዶዎች መሸጎጫ
+  clear_icons_tooltip: ዳግም ማስጀመር በሁሉም ፍርግሞች ላይ ሙሉ በሙሉ እንዲተገበር ሊፈልግ ይችላል
   discord: አለመግባባት
   exit: ማቆም / መውጣት
   github: Github

src/apps/settings/i18n/translations/ar.yml

@@ -82,6 +82,8 @@ devtools:
   settings_file: ملف الإعدادات
   simulate_fullscreen: محاكاة حدث ملء الشاشة
 extras:
+  clear_icons: مسح ذاكرة التخزين المؤقت لأيقونات النظام
+  clear_icons_tooltip: قد تكون إعادة التشغيل مطلوبة لتدخل جميع الأدوات حيز التنفيذ بالكامل
   discord: ديسكورد
   exit: إنهاء/خروج
   github: جيت هب

src/apps/settings/i18n/translations/az.yml

@@ -83,6 +83,8 @@ devtools:
   settings_file: Parametrlər faylı
   simulate_fullscreen: Tam ekran hadisəsini simulyasiya edin
 extras:
+  clear_icons: Sistem nişanlar önbelleği təmizləyin
+  clear_icons_tooltip: Bütün vidjetlərə tam təsir göstərmək üçün yenidən başlama tələb oluna bilər
   discord: Nifaq
   exit: Çıxmaq / çıxmaq
   github: Gitub

src/apps/settings/i18n/translations/bg.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: Файл за настройки
   simulate_fullscreen: Симулирайте събитие на цял екран
 extras:
+  clear_icons: Изчистване на кеша на системните икони
+  clear_icons_tooltip: >-
+    Може да се наложи рестартиране, за да се прояви напълно ефектът върху всички
+    джаджи.
   discord: Раздор
   exit: QUIT/EXIT
   github: Github

src/apps/settings/i18n/translations/bn.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: সেটিংস ফাইল
   simulate_fullscreen: পূর্ণস্ক্রীন ইভেন্ট অনুকরণ
 extras:
+  clear_icons: ক্লিয়ার সিস্টেম আইকন ক্যাশে
+  clear_icons_tooltip: >-
+    সমস্ত উইজেটগুলিতে পুরোপুরি কার্যকর করার জন্য একটি পুনঃসূচনা প্রয়োজন হতে
+    পারে
   discord: মতবিরোধ
   exit: প্রস্থান/প্রস্থান
   github: গিথুব

src/apps/settings/i18n/translations/bs.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Datoteka postavki
   simulate_fullscreen: Simulirajte događaj preko cijelog ekrana
 extras:
+  clear_icons: Clear System Icons predmemorija
+  clear_icons_tooltip: Može se ponovo pokrenuti za u potpunosti stupiti na snagu na svim widgetima
   discord: Nesklad
   exit: Prestanite / izlaz
   github: Github

src/apps/settings/i18n/translations/ca.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Arxiu de configuració
   simulate_fullscreen: Simula un esdeveniment a pantalla completa
 extras:
+  clear_icons: Esborrar la memòria cau de les icones del sistema
+  clear_icons_tooltip: Es pot requerir un reinici per tenir efecte sobre tots els ginys
   discord: Discòrdia
   exit: Deixar/sortir
   github: Github

src/apps/settings/i18n/translations/cs.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Nastavení souboru
   simulate_fullscreen: Simulovat událost na celou obrazovku
 extras:
+  clear_icons: Vymazání mezipaměti systémových ikon
+  clear_icons_tooltip: Aby se plně projevily všechny widgety, mohlo by být nutné restartování.
   discord: Svár
   exit: Ukončit/ukončit
   github: GitHub

src/apps/settings/i18n/translations/cy.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Ffeil Gosodiadau
   simulate_fullscreen: Efelychu digwyddiad sgrin lawn
 extras:
+  clear_icons: Storfa eiconau system glir
+  clear_icons_tooltip: Gellid bod yn ofynnol i ailgychwyn ddod i rym yn llawn ar bob teclyn
   discord: Anghytgord
   exit: Rhoi'r gorau iddi/allanfa
   github: Github

src/apps/settings/i18n/translations/da.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Indstillinger fil
   simulate_fullscreen: Simuler begivenhed i fuld skærm
 extras:
+  clear_icons: Ryd cache for systemikoner
+  clear_icons_tooltip: En genstart kan være nødvendig for at få fuld effekt på alle widgets
   discord: Uenighed
   exit: Afslut/exit
   github: GitHub

src/apps/settings/i18n/translations/de.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: Einstellungsdatei
   simulate_fullscreen: Vollbildereignis simulieren
 extras:
+  clear_icons: System-Symbol-Cache löschen
+  clear_icons_tooltip: >-
+    Ein Neustart könnte erforderlich sein, um alle Widgets vollständig zu
+    aktivieren.
   discord: Discord
   exit: Beenden
   github: GitHub

src/apps/settings/i18n/translations/el.yml

@@ -85,6 +85,8 @@ devtools:
   settings_file: Αρχείο ρυθμίσεων
   simulate_fullscreen: Προσομοίωση συμβάντος πλήρους οθόνης
 extras:
+  clear_icons: Εκκαθάριση προσωρινής μνήμης εικονιδίων συστήματος
+  clear_icons_tooltip: Μπορεί να απαιτηθεί επανεκκίνηση για να ισχύσει πλήρως σε όλα τα widgets
   discord: Διχόνοια
   exit: Εγκατάλειψη/έξοδο
   github: Github

src/apps/settings/i18n/translations/en.yml

@@ -83,6 +83,8 @@ devtools:
   settings_file: Settings File
   simulate_fullscreen: Simulate fullscreen event
 extras:
+  clear_icons: Clear System Icons Cache
+  clear_icons_tooltip: A restart could be required to fully take effect on all widgets
   discord: Discord
   exit: Quit/Exit
   github: GitHub

src/apps/settings/i18n/translations/es.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: Archivo de configuración
   simulate_fullscreen: Simular evento de pantalla completa
 extras:
+  clear_icons: Borrar caché de iconos del sistema
+  clear_icons_tooltip: >-
+    Podría ser necesario reiniciar el sistema para que surta efecto en todos los
+    widgets.
   discord: Discordia
   exit: Salir
   github: GitHub

src/apps/settings/i18n/translations/et.yml

@@ -83,6 +83,8 @@ devtools:
   settings_file: Seadete fail
   simulate_fullscreen: Täisekraanil toimuva sündmuse simuleerimine
 extras:
+  clear_icons: Tühjenda süsteemi ikoonide vahemälu
+  clear_icons_tooltip: Kõigi vidinate täielikuks jõustumiseks võib olla vajalik taaskäivitamine.
   discord: Ebakõla
   exit: Lõpeta/väljumine
   github: Github

src/apps/settings/i18n/translations/eu.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Ezarpenak fitxategia
   simulate_fullscreen: Simulatu pantaila osoko gertaera
 extras:
+  clear_icons: Garbitu sistemaren ikonoak cachea
+  clear_icons_tooltip: Berrabiarazi behar da widget guztietan erabat indarrean egon dadin
   discord: Deskudun
   exit: Irten / irten
   github: Github

src/apps/settings/i18n/translations/fa.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: پرونده تنظیمات
   simulate_fullscreen: شبیه سازی رویداد تمام صفحه
 extras:
+  clear_icons: حافظه نهان سیستم را پاک کنید
+  clear_icons_tooltip: >-
+    یک راه اندازی مجدد می تواند مورد نیاز باشد تا به طور کامل در همه ویجت ها
+    تأثیر بگذارد
   discord: اختلاف
   exit: ترک/خروج
   github: گیتوب

src/apps/settings/i18n/translations/fi.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: Asetustiedosto
   simulate_fullscreen: Simuloi koko näytön tapahtumaa
 extras:
+  clear_icons: Tyhjennä järjestelmän kuvakkeiden välimuisti
+  clear_icons_tooltip: >-
+    Uudelleenkäynnistystä saatetaan tarvita, jotta kaikki widgetit tulisivat
+    täysin voimaan.
   discord: Erimielisyys
   exit: Lopettaa/poistua
   github: Github

src/apps/settings/i18n/translations/fr.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: Fichier de paramètres
   simulate_fullscreen: Simuler un événement en plein écran
 extras:
+  clear_icons: Effacer le cache des icônes du système
+  clear_icons_tooltip: >-
+    Un redémarrage pourrait être nécessaire pour que tous les widgets soient
+    pleinement pris en compte.
   discord: Discorde
   exit: Quitter/Quitter
   github: GitHub

src/apps/settings/i18n/translations/gu.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: સેટિંગ્સ ફાઇલ
   simulate_fullscreen: પૂર્ણસ્ક્રીન ઇવેન્ટનું અનુકરણ કરો
 extras:
+  clear_icons: સ્પષ્ટ સિસ્ટમ ચિહ્નો કેશ
+  clear_icons_tooltip: બધા વિજેટો પર સંપૂર્ણ અસર કરવા માટે ફરીથી પ્રારંભ કરવાની જરૂર પડી શકે છે
   discord: વિખવાદ
   exit: છોડો/બહાર નીકળો
   github: GitHub

src/apps/settings/i18n/translations/he.yml

@@ -82,6 +82,8 @@ devtools:
   settings_file: קובץ הגדרות
   simulate_fullscreen: הדמיית אירוע במסך מלא
 extras:
+  clear_icons: מטמון סמלי מערכת נקה
+  clear_icons_tooltip: ניתן להידרש להפעלה מחדש כדי להיכנס לתוקף באופן מלא על כל הווידג'טים
   discord: מַחֲלוֹקֶת
   exit: יצא/יציאה
   github: Github

src/apps/settings/i18n/translations/hi.yml

@@ -84,6 +84,10 @@ devtools:
   settings_file: सेटिंग संचिका
   simulate_fullscreen: फ़ुलस्क्रीन ईवेंट का अनुकरण करें
 extras:
+  clear_icons: स्पष्ट प्रणाली आइकन कैश
+  clear_icons_tooltip: >-
+    सभी विजेट पर पूरी तरह से प्रभावी होने के लिए एक पुनरारंभ की आवश्यकता हो सकती
+    है
   discord: कलह
   exit: छोड़ देना/बाहर निकलना
   github: GitHub

src/apps/settings/i18n/translations/hr.yml

@@ -84,6 +84,8 @@ devtools:
   settings_file: Datoteka postavki
   simulate_fullscreen: Simulirajte događaj preko cijelog zaslona
 extras:
+  clear_icons: Očistite predmemoriju ikona sustava
+  clear_icons_tooltip: Ponovno pokretanje moglo bi se u potpunosti stupiti na sve widgete
   discord: Nesklad
   exit: Prestati/izaći
   github: Ždrijeb