integrate inx generation into ink/stitch proper

5 files changed, 10 insertions, 121 deletions

diff --git a/bin/gen-input-inx b/bin/gen-input-inx
deleted file mode 100755
index ae32b43f..00000000
--- a/bin/gen-input-inx
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os
-from os.path import dirname
-import pyembroidery
-from jinja2 import Environment, FileSystemLoader, select_autoescape
-
-
-def build_environment():
-    template_dir = os.path.join(dirname(dirname(os.path.realpath(__file__))), "templates")
-
-    return Environment(
-        loader = FileSystemLoader(template_dir),
-        autoescape = True
-    )
-
-
-def pyembroidery_input_formats():
-    for format in pyembroidery.supported_formats():
-        if 'reader' in format and format['category'] == 'embroidery':
-            yield format['extension'], format['description']
-
-
-def main():
-    env = build_environment()
-    template = env.get_template('embroider_input.inx')
-
-    for format, description in pyembroidery_input_formats():
-        inx = template.render(format=format, description=description)
-
-        with open("inx/inkstitch_input_%s.inx" % format.upper(), 'w') as inx_file:
-            print >> inx_file, inx
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/bin/gen-output-format-option-list b/bin/gen-output-format-option-list
deleted file mode 100755
index 28a83976..00000000
--- a/bin/gen-output-format-option-list
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import pyembroidery
-
-formats = [format for format in pyembroidery.supported_formats() if 'writer' in format]
-formats.sort(key=lambda format: (format['category'] != 'embroidery', format['extension']))
-
-for format in formats:
-    tag = ""
-    if format['category'] != 'embroidery':
-        tag = " [DEBUG]"
-
-    print '<_option value="%s">%s(%s)%s</_option>' % (format['extension'], format['description'], format['extension'].upper(), tag)
diff --git a/bin/gen-output-inx b/bin/gen-output-inx
deleted file mode 100755
index fbe2ad55..00000000
--- a/bin/gen-output-inx
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os
-from os.path import dirname
-import pyembroidery
-from jinja2 import Environment, FileSystemLoader, select_autoescape
-
-
-def build_environment():
-    template_dir = os.path.join(dirname(dirname(os.path.realpath(__file__))), "templates")
-
-    return Environment(
-        loader = FileSystemLoader(template_dir),
-        autoescape = True
-    )
-
-
-def pyembroidery_output_formats():
-    for format in pyembroidery.supported_formats():
-        if 'writer' in format and format['category'] == 'embroidery':
-            yield format['extension'], format['description']
-
-
-def main():
-    env = build_environment()
-    template = env.get_template('embroider_output.inx')
-
-    for format, description in pyembroidery_output_formats():
-        inx = template.render(format=format, description=description)
-
-        with open("inx/inkstitch_output_%s.inx" % format.upper(), 'w') as inx_file:
-            print >> inx_file, inx
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/bin/gen-zip-inx b/bin/gen-zip-inx
deleted file mode 100755
index 40948786..00000000
--- a/bin/gen-zip-inx
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os
-from os.path import dirname
-import pyembroidery
-from jinja2 import Environment, FileSystemLoader, select_autoescape
-
-
-def build_environment():
-    template_dir = os.path.join(dirname(dirname(os.path.realpath(__file__))), "templates")
-
-    return Environment(
-        loader = FileSystemLoader(template_dir),
-        autoescape = True
-    )
-
-
-def pyembroidery_output_formats():
-    for format in pyembroidery.supported_formats():
-        if 'writer' in format and format['category'] == 'embroidery':
-            yield format['extension'], format['description']
-
-
-def main():
-    env = build_environment()
-    template = env.get_template('embroider_zip_output.inx')
-
-    inx = template.render(formats=pyembroidery_output_formats())
-
-    with open("inx/inkstitch_output_ZIP.inx", 'w') as inx_file:
-        inx_file.write(inx)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/bin/generate-inx-files b/bin/generate-inx-files
new file mode 100755
index 00000000..f7b7a801
--- /dev/null
+++ b/bin/generate-inx-files
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+import sys
+import os
+from os.path import dirname
+
+sys.path.append(os.path.join(dirname(dirname(__file__))))
+from lib.inx import generate_inx_files
+
+generate_inx_files()