Correct final JefReader issues.

Author: tatarize

pyembroidery/JefReader.py

@@ -61,8 +61,9 @@ def read(f, out, settings=None):
     for i in range(0, count_colors):
         index = abs(read_int_32le(f))
         if index == 0:
-            out.add_thread(None)
-        out.add_thread(jef_threads[index % len(jef_threads)])
+            out.threadlist.append(None)
+        else:
+            out.add_thread(jef_threads[index % len(jef_threads)])
 
     print(out.threadlist)
     f.seek(stitch_offset, 0)

test/test_convert_jef.py

@@ -170,27 +170,32 @@ def test_convert_jef_to_xxx(self):
         self.addCleanup(os.remove, file1)
         self.addCleanup(os.remove, file2)
 
-    def test_jef_stop_write(self):
-        file2 = "stop2.jef"
-        write_jef(get_simple_stop(), file2)
-        s_pattern = read_jef(file2)
+    def test_jef_stop_write_simple(self):
+        file = "stop.jef"
+        write_jef(get_simple_stop(), file)
+        s_pattern = read_jef(file)
         self.assertEqual(s_pattern.count_stitch_commands(STOP), 1)
         self.assertEqual(s_pattern.count_color_changes(), 0)
+        self.addCleanup(os.remove, file)
 
-        file1 = "stop.jef"
+    def test_jef_stop_write_large(self):
+        file = "stop2.jef"
         pattern = get_shift_stop_pattern()
-        write_jef(pattern, file1)
-        f_pattern = read_jef(file1)
+        n_pattern = pattern.get_normalized_pattern()
+        self.assertEqual(n_pattern.count_stitch_commands(COLOR_CHANGE), 15)
+        self.assertEqual(n_pattern.count_stitch_commands(STITCH), 16 * 5)
+        self.assertEqual(n_pattern.count_stitch_commands(STOP), 5)
+
+        write_jef(pattern, file)
+        f_pattern = read_jef(file)
         self.assertIsNotNone(f_pattern)
 
-        with open(file1, "rb") as f:
+        with open(file, "rb") as f:
             f.seek(0x18)
             colors = f.read(1)
             self.assertEqual(ord(colors), f_pattern.count_color_changes() + f_pattern.count_stitch_commands(STOP) + 1)
 
-        self.assertEqual(f_pattern.count_stitch_commands(COLOR_CHANGE), 12)
+        self.assertEqual(f_pattern.count_stitch_commands(COLOR_CHANGE), 15)
         self.assertEqual(f_pattern.count_stitch_commands(STITCH), 16 * 5)
-        self.assertEqual(f_pattern.count_stitch_commands(STOP), 6)
-        self.position_equals(f_pattern.stitches, 0, -1)
-        self.addCleanup(os.remove, file1)
-        self.addCleanup(os.remove, file2)
+        self.assertEqual(f_pattern.count_stitch_commands(STOP), 5)
+        self.addCleanup(os.remove, file)

test/test_read_hus.py

@@ -10,7 +10,7 @@ class TestReadHus(unittest.TestCase):
 
     def test_fake_compression(self):
         for i in range(10):
-            s = random.randint(10, 1000)
+            s = random.randint(10, 1000)  # May fail if larger.
             test_bytes = bytearray(random.getrandbits(8) for _ in range(s))
             compressed_bytes = EmbCompress.compress(test_bytes)
             uncompressed = bytearray(EmbCompress.expand(compressed_bytes, len(test_bytes)))