Merge pull request #79 from EmbroidePy/tatarize-json-metadata

Json metadata serializable elements.

Author: tatarize

pyembroidery/JsonWriter.py

@@ -23,6 +23,16 @@ def write(pattern, f, settings=None):
     import json
     names = get_common_name_dictionary()
 
+    metadata = {}
+    for item in pattern.extras.items():
+        key, value = item
+        if isinstance(value, str):
+            metadata[key] = value
+        elif isinstance(value, int):
+            metadata[key] = value
+        elif isinstance(value, float):
+            metadata[key] = value
+
     json_normal = {
         "threadlist": [
             {
@@ -37,6 +47,6 @@ def write(pattern, f, settings=None):
             for thread in pattern.threadlist
         ],
         "stitches": [[s[0], s[1], str(decoded_name(names, s[2]))] for s in pattern.stitches],
-        "extras": pattern.extras
+        "extras": metadata
     }
     json.dump(json_normal, f, indent=4)

test/test_color_fileformats.py

@@ -5,7 +5,7 @@
 from pattern_for_tests import *
 
 
-class TestConverts(unittest.TestCase):
+class TestColorFormats(unittest.TestCase):
 
     def test_write_read_col(self):
         file1 = "color.col"

test/test_json.py

@@ -7,6 +7,26 @@
 
 class TestJson(unittest.TestCase):
 
+    def test_metadata_write_read_json(self):
+        file1 = "metadata.json"
+        pattern = EmbPattern()
+        for i in range(4, 20):
+            pattern.add_thread(EmbThread("random"))
+        pattern.extras['name'] = "My Embroidery."
+        pattern.extras['bytes'] = b'\00these are bytes'
+        pattern.extras['bytes2'] = bytearray(b'this is bytearray')
+        pattern.extras['value'] = 208
+        write(pattern, file1)
+        w_pattern = read(file1)
+        self.assertEqual(w_pattern.extras['name'], "My Embroidery.")
+        self.assertEqual(w_pattern.extras['value'], 208)
+        self.assertEqual(len(pattern.threadlist), len(w_pattern.threadlist))
+        for q in range(0, len(pattern.threadlist)):
+            self.assertEqual(pattern.threadlist[q], w_pattern.threadlist[q])
+
+        self.addCleanup(os.remove, file1)
+
+
     def test_colors_write_read_json(self):
         file1 = "color.json"
         for m in range(0, 50):