Merge pull request #23 from facelessuser/bugfix/glob-chars

Handle special glob characters in path
facelessuser · Nov 21, 2022 · 80b1b25 · 80b1b25
2 parents 581e6b0 + 72645c1
commit 80b1b25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.dictionary b/.dictionary
@@ -11,6 +11,7 @@ SVG
 Twemoji
 accessor
 dedent
+glob
 inlined
 inlining
 macOS

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1
+
+- **FIX**: Properly handle special glob characters in path.
+
 ## 1.1.0
 
 - **NEW**: Drop Python 3.6 and officially support 3.10.

diff --git a/materialx/__meta__.py b/materialx/__meta__.py
@@ -188,5 +188,5 @@ def parse_version(ver):
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(1, 1, 0, "final")
+__version_info__ = Version(1, 1, 1, "final")
 __version__ = __version_info__._get_canonical()
diff --git a/materialx/emoji.py b/materialx/emoji.py
@@ -40,7 +40,7 @@ def _patch_index_for_locations(icon_locations):
     # Find our icons
     for icon_path in icon_locations:
         norm_base = icon_path.replace('\\', '/') + '/'
-        for result in glob.glob(icon_path.replace('\\', '/') + '/**/*.svg', recursive=True):
+        for result in glob.glob(glob.escape(icon_path.replace('\\', '/')) + '/**/*.svg', recursive=True):
             name = ':{}:'.format(result.replace('\\', '/').replace(norm_base, '', 1).replace('/', '-').lstrip('.')[:-4])
             if name not in index['emoji'] and name not in index['aliases']:
                 # Easiest to just store the path and pull it out from the index