chore: use icon fns from jinjarope

phil65 · Oct 29, 2024 · 6044968 · 6044968
1 parent b43ebb8
commit 6044968
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 250 deletions.
diff --git a/mknodes/basenodes/mkbinaryimage/__init__.py b/mknodes/basenodes/mkbinaryimage/__init__.py
@@ -4,10 +4,10 @@
 
 from typing import Any, Literal, Self, TYPE_CHECKING
 
-from jinjarope import textfilters
+from jinjarope import textfilters, iconfilters
 
 from mknodes.basenodes import mkimage
-from mknodes.utils import icons, log
+from mknodes.utils import log
 
 if TYPE_CHECKING:
     from mknodes.info import linkprovider
@@ -75,7 +75,7 @@ def for_icon(cls, icon: str, **kwargs: Any) -> Self:
             icon: Icon to get a MkBinaryImage for (example: material/file-image)
             kwargs: Keyword arguments passed to constructor
         """
-        content = icons.get_icon_svg(icon)
+        content = iconfilters.get_icon_svg(icon)
         path = f"{textfilters.slugify(icon)}.svg"
         return cls(data=content, path=path, **kwargs)
 

diff --git a/mknodes/basenodes/mkicon/__init__.py b/mknodes/basenodes/mkicon/__init__.py
@@ -2,8 +2,9 @@
 
 from typing import Any
 
+from jinjarope import iconfilters
 from mknodes.basenodes import mknode
-from mknodes.utils import icons, log
+from mknodes.utils import log
 
 
 logger = log.get_logger(__name__)
@@ -23,8 +24,8 @@ def __init__(
         color: str | None = None,
         height: str | int | None = None,
         width: str | int | None = None,
-        flip: icons.Flip | None = None,
-        rotate: icons.Rotation | None = None,
+        flip: iconfilters.Flip | None = None,
+        rotate: iconfilters.Rotation | None = None,
         box: bool | None = None,
         **kwargs: Any,
     ):
@@ -63,7 +64,7 @@ def svg(self) -> str:
         import requests.exceptions
 
         try:
-            return icons.get_icon_svg(
+            return iconfilters.get_icon_svg(
                 self.icon_name,
                 color=self.color,
                 height=self.height,

diff --git a/mknodes/resources/filters.toml b/mknodes/resources/filters.toml
@@ -62,16 +62,6 @@ template = """
 """
 
 
-[filters.get_icon_svg]
-fn = "mknodes.utils.icons.get_icon_svg"
-group = "icon"
-
-[filters.get_icon_svg.examples.class]
-template = """
-{{ "mdi:file" | get_icon_svg }}
-"""
-
-
 [filters.get_emoji_slug]
 fn = "mknodes.utils.icons.get_emoji_slug"
 group = "icon"

diff --git a/mknodes/resources/icons.json.gzip b/mknodes/resources/icons.json.gzip
diff --git a/mknodes/theme/materialtheme/__init__.py b/mknodes/theme/materialtheme/__init__.py
@@ -5,9 +5,10 @@
 
 from typing import Any, Literal, TYPE_CHECKING
 
+from jinjarope import iconfilters
 from mknodes.theme import colortheme, theme
 from mknodes.theme.materialtheme import palette
-from mknodes.utils import color as col, icons, log, reprhelpers
+from mknodes.utils import color as col, log, reprhelpers
 
 if TYPE_CHECKING:
     from mknodes.data import datatypes
@@ -283,7 +284,7 @@ def add_status_icon(
             icon: Iconify icon name
             description: Optional status description (used for tooltip)
         """
-        data = icons.get_icon_svg(icon)
+        data = iconfilters.get_icon_svg(icon)
         self.status_icons[name] = StatusIcon(name, data, description)
 
     def add_tag(

diff --git a/mknodes/theme/theme.py b/mknodes/theme/theme.py
@@ -3,11 +3,12 @@
 from typing import TYPE_CHECKING, Any
 
 import jinjarope
+from jinjarope import iconfilters
 
 from mknodes.data import admonition, datatypes
 from mknodes.info import contexts
 from mknodes.pages import templateblocks, templateregistry
-from mknodes.utils import color, icons, log, reprhelpers, resources
+from mknodes.utils import color, log, reprhelpers, resources
 
 
 if TYPE_CHECKING:
@@ -99,7 +100,7 @@ def add_admonition_type(
         font_col_str = str(color.Color(font_color or (255, 255, 255)))
         adm = admonition.AdmonitionType(
             name=name,
-            svg=icons.get_icon_svg(icon) if not icon.startswith("<") else icon,
+            svg=iconfilters.get_icon_svg(icon) if not icon.startswith("<") else icon,
             header_color=header_col_str,
             icon_color=icon_col_str,
             border_color=border_col_str,