Changed templates so they can be imported into omnivore

* template images now have file extension
* .inf files are now in json format, including some omnivore metadata

atrcopy/__init__.py

@@ -4,6 +4,7 @@ from builtins import str
 import os
 import sys
 import zlib
+import json
 
 import logging
 log = logging.getLogger(__name__)
@@ -300,7 +301,9 @@ def get_template_info():
             continue
         try:
             with open(name + ".inf", "r") as fh:
-                description = fh.read().strip()
+                s = fh.read()
+                j = json.loads(s)
+                description = j["description"]
         except IOError:
             description = ""
         d = textwrap.wrap(description, 80 - 1 - 14 - 2 - 2)
@@ -318,9 +321,10 @@ def get_template_data(template):
         raise InvalidDiskImage("Template disk image %s not found" % template)
     try:
         with open(path + ".inf", "r") as fh:
-            inf = fh.read().strip()
+            s = fh.read()
+            inf = json.loads(s)
     except IOError:
-        inf = ""
+        inf = {"description": ""}
     return data, inf
 
 
@@ -328,7 +332,7 @@ def create_image(template, name):
     import textwrap
 
     data, inf = get_template_data(template)
-    print("using %s template:\n  %s" % (template, "\n  ".join(textwrap.wrap(inf, 77))))
+    print("using %s template:\n  %s" % (template, "\n  ".join(textwrap.wrap(inf["description"], 77))))
     if not options.dry_run:
         if os.path.exists(name) and not options.force:
             print("skipping %s, use -f to overwrite" % (name))

atrcopy/templates/dos2dd.atr.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Atari 8-bit DOS 2 double density (180K), empty VTOC", "label": "Atari DOS 2 DD (180K) blank image", "ext": "atr"}

atrcopy/templates/dos2dd.inf

@@ -1 +0,0 @@
-Atari 8-bit DOS 2 double density (180K), empty VTOC

atrcopy/templates/dos2ed+2.5.atr.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Atari 8-bit DOS 2 enhanced density (130K) DOS 2.5 system disk", "label": "Atari DOS 2.5 ED (130K) system disk", "ext": "atr"}

atrcopy/templates/dos2ed+2.5.inf

@@ -1 +0,0 @@
-Atari 8-bit DOS 2 enhanced density (130K) DOS 2.5 system disk

atrcopy/templates/dos2ed.atr.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Atari 8-bit DOS 2 enhanced density (130K), empty VTOC", "label": "Atari DOS 2 ED (130K) blank image", "ext": "atr"}

atrcopy/templates/dos2ed.inf

@@ -1 +0,0 @@
-Atari 8-bit DOS 2 enhanced density (130K), empty VTOC

atrcopy/templates/dos2sd+2.0s.atr.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Atari 8-bit DOS 2 single density (90K) DOS 2.0S system disk", "label": "Atari DOS 2.0S SD (90K) system disk", "ext": "atr"}

atrcopy/templates/dos2sd+2.0s.inf

@@ -1 +0,0 @@
-Atari 8-bit DOS 2 single density (90K) DOS 2.0S system disk

atrcopy/templates/dos2sd.atr.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Atari 8-bit DOS 2 single density (90K), empty VTOC", "label": "Atari DOS 2 SD (90K) blank image", "ext": "atr"}

atrcopy/templates/dos2sd.inf

@@ -1 +0,0 @@
-Atari 8-bit DOS 2 single density (90K), empty VTOC

atrcopy/templates/dos33.dsk.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Apple ][ DOS 3.3 (140K) standard RWTS, empty VTOC", "label": "Apple DOS 3.3 (140K) blank image", "ext": "dsk"}

atrcopy/templates/dos33.inf

@@ -1 +0,0 @@
-Apple ][ DOS 3.3 (140K) standard RWTS, empty VTOC

atrcopy/templates/dos33autobrun.dsk.inf

@@ -0,0 +1 @@
+{"task": "hex_edit", "description": "Apple ][ DOS 3.3 (140K) disk image for binary program development: HELLO sets fullscreen HGR and calls BRUN on user-supplied AUTOBRUN binary file", "label": "Apple DOS 3.3 (140K) AUTOBRUN image", "ext": "dsk"}

atrcopy/templates/dos33autobrun.inf

@@ -1 +0,0 @@
-Apple ][ DOS 3.3 (140K) disk image for binary program development: HELLO sets fullscreen HGR and calls BRUN on user-supplied AUTOBRUN binary file