From 4185ca5617e38c1e950fff226a73135e47439c15 Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Fri, 9 Mar 2018 11:00:09 -0800
Subject: [PATCH 1/3] Refs #8: added some error checking for templates without
 .inf files

---
 atrcopy/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index 1c30c43..a2f3e03 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -305,10 +305,15 @@ def get_template_info():
         try:
             with open(name + ".inf", "r") as fh:
                 s = fh.read()
-                j = json.loads(s)
+                try:
+                    j = json.loads(s)
+                except ValueError:
+                    continue
                 description = j["description"]
         except IOError:
             description = ""
+        if not description:
+            continue
         d = textwrap.wrap(description, 80 - 1 - 14 - 2 - 2)
         lines.append(fmt % (os.path.basename(name), d[0]))
         lines.extend([fmt % ("", line) for line in d[1:]])

From 55b368414e45affa86b620dc56de355a65c1c79f Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Fri, 9 Mar 2018 11:06:30 -0800
Subject: [PATCH 2/3] Refs #8: added better error message when attempting to
 load unknown template

---
 atrcopy/__init__.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index a2f3e03..e814246 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -326,7 +326,7 @@ def get_template_data(template):
         with open(path, "rb") as fh:
             data = fh.read()
     except:
-        raise InvalidDiskImage("Template disk image %s not found" % template)
+        raise InvalidDiskImage("Unknown template disk image %s" % template)
     try:
         with open(path + ".inf", "r") as fh:
             s = fh.read()
@@ -339,7 +339,12 @@ def get_template_data(template):
 def create_image(template, name):
     import textwrap
 
-    data, inf = get_template_data(template)
+    try:
+        data, inf = get_template_data(template)
+    except InvalidDiskImage, e:
+        info = get_template_info()
+        print("Error: %s\n\n%s" % (e, info))
+        return
     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:

From cf1fe5344bddcd2c6efa3d32bfb252807e7dc32d Mon Sep 17 00:00:00 2001
From: Rob McMullen <feedback@playermissile.com>
Date: Fri, 9 Mar 2018 11:28:55 -0800
Subject: [PATCH 3/3] Fixed #8: added partial template name matching

---
 atrcopy/__init__.py | 53 +++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/atrcopy/__init__.py b/atrcopy/__init__.py
index e814246..295c735 100644
--- a/atrcopy/__init__.py
+++ b/atrcopy/__init__.py
@@ -289,50 +289,61 @@ def get_template_path(rel_path="templates"):
     return template_path
 
 
-def get_template_info():
+def get_template_images(partial=""):
     import glob
-    import textwrap
-    fmt = "  %-14s  %s"
 
     path = get_template_path()
     files = glob.glob(os.path.join(path, "*"))
-
-    lines = []
-    lines.append("available templates:")
-    for name in sorted(files):
+    templates = {}
+    for path in files:
+        name = os.path.basename(path)
         if name.endswith(".inf"):
             continue
+        if partial not in name:
+            continue
         try:
-            with open(name + ".inf", "r") as fh:
+            with open(path + ".inf", "r") as fh:
                 s = fh.read()
                 try:
                     j = json.loads(s)
                 except ValueError:
                     continue
-                description = j["description"]
+                j['name'] = name
+                j['path'] = path
+                templates[name] = j
         except IOError:
-            description = ""
-        if not description:
             continue
-        d = textwrap.wrap(description, 80 - 1 - 14 - 2 - 2)
+    return templates
+
+
+def get_template_info():
+    import textwrap
+    fmt = "  %-14s  %s"
+
+    templates = get_template_images()
+
+    lines = []
+    lines.append("available templates:")
+    for name in sorted(templates.keys()):
+        d = textwrap.wrap(templates[name]["description"], 80 - 1 - 14 - 2 - 2)
         lines.append(fmt % (os.path.basename(name), d[0]))
         lines.extend([fmt % ("", line) for line in d[1:]])
     return os.linesep.join(lines) + os.linesep
 
 
 def get_template_data(template):
-    path = os.path.join(get_template_path(), template)
+    possibilities = get_template_images(template)
+    if not possibilities:
+        raise InvalidDiskImage("Unknown template disk image %s" % template)
+    if len(possibilities) > 1:
+        raise InvalidDiskImage("Name %s is ambiguous (%d matches: %s)" % (template, len(possibilities), ", ".join(sorted(possibilities.keys()))))
+    name, inf = possibilities.popitem()
+    path = inf['path']
     try:
         with open(path, "rb") as fh:
             data = fh.read()
-    except:
-        raise InvalidDiskImage("Unknown template disk image %s" % template)
-    try:
-        with open(path + ".inf", "r") as fh:
-            s = fh.read()
-            inf = json.loads(s)
     except IOError:
-        inf = {"description": ""}
+        raise InvalidDiskImage("Failed reading template file %s" % path)
     return data, inf
 
 
@@ -345,7 +356,7 @@ def create_image(template, name):
         info = get_template_info()
         print("Error: %s\n\n%s" % (e, info))
         return
-    print("using %s template:\n  %s" % (template, "\n  ".join(textwrap.wrap(inf["description"], 77))))
+    print("Using template %s:\n  %s" % (inf['name'], "\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))