fix palette issues (#660)

2 files changed, 36 insertions, 17 deletions

diff --git a/lib/threads/catalog.py b/lib/threads/catalog.py
index ece2f8ac..aba2696d 100644
--- a/lib/threads/catalog.py
+++ b/lib/threads/catalog.py
@@ -1,9 +1,10 @@
 import os
-from os.path import dirname, realpath
 import sys
-from glob import glob
 from collections import Sequence
+from glob import glob
+from os.path import dirname, realpath
 
+from ..utils import guess_inkscape_config_path
 from .palette import ThreadPalette
 
 
@@ -12,19 +13,32 @@ class _ThreadCatalog(Sequence):
 
     def __init__(self):
         self.palettes = []
-        self.load_palettes(self.get_palettes_path())
+        self.load_palettes(self.get_palettes_paths())
+
+    def get_palettes_paths(self):
+        """Creates a list containing the path of two directories:
+        1. Palette directory of Inkscape
+        2. Palette directory of inkstitch
+        """
+        path = [os.path.join(guess_inkscape_config_path(), 'palettes')]
 
-    def get_palettes_path(self):
         if getattr(sys, 'frozen', None) is not None:
-            path = os.path.join(sys._MEIPASS, "..")
+            inkstitch_path = os.path.join(sys._MEIPASS, "..")
         else:
-            path = dirname(dirname(dirname(realpath(__file__))))
+            inkstitch_path = dirname(dirname(dirname(realpath(__file__))))
 
-        return os.path.join(path, 'palettes')
+        path.append(os.path.join(inkstitch_path, 'palettes'))
 
-    def load_palettes(self, path):
-        for palette_file in glob(os.path.join(path, '*.gpl')):
-            self.palettes.append(ThreadPalette(palette_file))
+        return path
+
+    def load_palettes(self, paths):
+        palettes = []
+        for path in paths:
+            for palette_file in glob(os.path.join(path, 'InkStitch*.gpl')):
+                palette_basename = os.path.basename(palette_file)
+                if palette_basename not in palettes:
+                    self.palettes.append(ThreadPalette(palette_file))
+                    palettes.append(palette_basename)
 
     def palette_names(self):
         return list(sorted(palette.name for palette in self))
@@ -59,6 +73,8 @@ class _ThreadCatalog(Sequence):
         chosen if more tha 80% of the thread colors in the stitch plan are
         exact matches for threads in the palette.
         """
+        if not self.palettes:
+            return None
 
         threads = [color_block.color for color_block in stitch_plan]
         palettes_and_matches = [(palette, self._num_exact_color_matches(palette, threads))
diff --git a/lib/threads/palette.py b/lib/threads/palette.py
index 654c43e5..d685e5bb 100644
--- a/lib/threads/palette.py
+++ b/lib/threads/palette.py
@@ -48,13 +48,16 @@ class ThreadPalette(Set):
             palette.readline()
 
             for line in palette:
-                fields = line.split("\t", 3)
-                thread_color = [int(field) for field in fields[:3]]
-                thread_name, thread_number = fields[3].strip().rsplit(" ", 1)
-                thread_name = thread_name.strip()
-
-                thread = ThreadColor(thread_color, thread_name, thread_number, manufacturer=self.name)
-                self.threads[thread] = convert_color(sRGBColor(*thread_color, is_upscaled=True), LabColor)
+                try:
+                    fields = line.split(None, 3)
+                    thread_color = [int(field) for field in fields[:3]]
+                    thread_name, thread_number = fields[3].strip().rsplit(" ", 1)
+                    thread_name = thread_name.strip()
+
+                    thread = ThreadColor(thread_color, thread_name, thread_number, manufacturer=self.name)
+                    self.threads[thread] = convert_color(sRGBColor(*thread_color, is_upscaled=True), LabColor)
+                except ValueError:
+                    continue
 
     def __contains__(self, thread):
         return thread in self.threads