fix import palettes data and reset

Schroedinger-Hat · Apr 26, 2021 · 0c58ca4 · 0c58ca4
1 parent 9b224bc
commit 0c58ca4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ImageGoNord/GoNord.py b/ImageGoNord/GoNord.py
@@ -8,6 +8,14 @@
 
 from PIL import Image, ImageFilter
 
+try:
+    import importlib.resources as pkg_resources
+except ImportError:
+    # Try backported to PY<37 `importlib_resources`.
+    import importlib_resources as pkg_resources
+
+from .palettes import Nord as nord_palette
+
 from ImageGoNord.utility.quantize import quantize_to_palette
 import ImageGoNord.utility.palette_loader as pl
 from ImageGoNord.utility.ConvertUtility import ConvertUtility
@@ -127,7 +135,8 @@ class GoNord(object):
     DEFAULT_PALETTE_PATH = '../palettes/Nord/'
 
     if (os.path.exists('../palettes/Nord/') == False):
-        DEFAULT_PALETTE_PATH = 'ImageGoNord/palettes/Nord/'
+        pa = pkg_resources.open_text(nord_palette, NordPaletteFile.AURORA)
+        DEFAULT_PALETTE_PATH = os.path.dirname(nord_palette.__file__) + '/'
 
     PALETTE_LOOKUP_PATH = DEFAULT_PALETTE_PATH
     USE_GAUSSIAN_BLUR = False

diff --git a/ImageGoNord/__init__.py b/ImageGoNord/__init__.py
@@ -1,4 +1,4 @@
 # gonord version
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 
 from ImageGoNord.GoNord import *
diff --git a/index.py b/index.py
@@ -7,6 +7,7 @@
 # E.g. Avg algorithm and less colors
 go_nord.enable_avg_algorithm()
 # go_nord.reset_palette()
+# go_nord.set_palette_lookup_path('./mypalette')
 # go_nord.add_file_to_palette(NordPaletteFile.POLAR_NIGHT)
 # go_nord.add_file_to_palette(NordPaletteFile.SNOW_STORM)
 # go_nord.add_color_to_palette('#FF0000')

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="image-go-nord",
-    version="0.1.4",
+    version="0.1.5",
     description="A tool for converting RGB image to Nordtheme palette",
     long_description=README,
     long_description_content_type="text/markdown",