chore: icon work

phil65 · Oct 16, 2023 · c7d0f25 · c7d0f25
1 parent 2884660
commit c7d0f25
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/mknodes/basenodes/mklink.py b/mknodes/basenodes/mklink.py
@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, Any
 
 from mknodes.basenodes import mknode
-from mknodes.utils import log, reprhelpers
+from mknodes.utils import icons, log, reprhelpers
 
 
 if TYPE_CHECKING:
@@ -66,10 +66,9 @@ def __repr__(self):
 
     @property
     def icon(self) -> str:
-        if not self._icon or self._icon.startswith(":"):
-            return self._icon
-        icon = self._icon if "/" in self._icon else f"material/{self._icon}"
-        return f':{icon.replace("/", "-")}:'
+        if not self._icon:
+            return ""
+        return icons.get_emoji_slug(self._icon)
 
     @property
     def url(self) -> str:

diff --git a/mknodes/utils/icons.py b/mknodes/utils/icons.py
@@ -124,6 +124,13 @@ def get_icon_svg(icon: str) -> str:
         get_icon_svg("material/file")  # Material-style path
         get_icon_svg(":material-file:")  # material-style emoji slug
     """
+    key = get_pyconify_key(icon)
+    import pyconify
+
+    return pyconify.svg(key).decode()
+
+
+def get_pyconify_key(icon: str):
     for k, v in PYCONIFY_TO_PREFIXES.items():
         path = f'{v.replace("-", "/")}/'
         icon = icon.replace(path, f"{k}:")
@@ -132,9 +139,11 @@ def get_icon_svg(icon: str) -> str:
     icon = icon.strip(":")
     if ":" not in icon:
         icon = f"mdi:{icon}"
-    import pyconify
+    return icon
+
 
-    return pyconify.svg(icon).decode()
+def get_emoji_slug(icon):
+    return f":{get_pyconify_key(icon).replace(':', '-')}:"
 
 
 def get_icon_xml(icon: str) -> etree.Element: