Cleaned up cmdline utility

Author: clittle

layers/cmdline.py

@@ -4,19 +4,19 @@
 from core import Layer
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Export an Att&ck layer as a svg image')
+    parser = argparse.ArgumentParser(description='Export an Att&ck layer as a svg image or excel file')
     parser.add_argument('-m', '--mode', choices=['svg', 'excel'], required=True, help='The form to export the layers in')
     parser.add_argument('input', nargs='+', help='Path(s) to the file to export')
     parser.add_argument('-s','--source', choices=['taxii', 'local'], default='taxii', help='What source to utilize when building the matrix')
     parser.add_argument('--local', help='Path to the local resource if --source=local', default=None)
     parser.add_argument('-o','--output', nargs='+', help='Path(s) to the exported svg file', required=True)
     args = parser.parse_args()
-    print(args)
     if len(args.output) != len(args.input):
         print('Mismatched number of output filepaths to input file paths. Exiting...')
 
-    for entry in args.input:
-        print('{}/{} - Beginning processing {}'.format(args.input.index(entry) + 1, len(args.input), entry))
+    for i in range(0, len(args.input)):
+        entry = args.input[i]
+        print('{}/{} - Beginning processing {}'.format(i + 1, len(args.input), entry))
         lay = Layer()
         try:
             lay.from_file(entry)
@@ -25,11 +25,11 @@
             continue
         if args.mode=='excel':
             exy = ToExcel(domain=lay.layer.domain, source=args.source, local=args.local)
-            exy.to_xlsx(lay, filepath=args.output[args.input.index(entry)])
+            exy.to_xlsx(lay, filepath=args.output[i])
         else:
             svy = ToSvg(domain=lay.layer.domain, source=args.source, local=args.local)
-            svy.to_svg(lay, filepath=args.output[args.input.index(entry)])
-        print('{}/{} - Finished processing {}'.format(args.input.index(entry) + 1, len(args.input), entry))
+            svy.to_svg(lay, filepath=args.output[i])
+        print('{}/{} - Finished processing {}'.format(i + 1, len(args.input), entry))
 
 
 else:

layers/exporters/to_svg.py

@@ -19,12 +19,12 @@ def __init__(self, domain='enterprise', source='taxii', local=None):
         """
         self.raw_handle = SvgTemplates(domain=domain, source=source, local=local)
 
-    def to_svg(self, layer, output='example.svg'):
+    def to_svg(self, layer, filepath='example.svg'):
         """
             Generate a svg file based on the input layer
 
             :param layer: Input attack layer object to transform
-            :param output: Desired output svg location
+            :param filepath: Desired output svg location
             :return: (meta) svg file at the targeted output location
         """
         if layer is not None:
@@ -76,4 +76,4 @@ def to_svg(self, layer, output='example.svg'):
         d = self.raw_handle.export(showName=sName, showID=sID, sort=sort, scores=scores,
                                    subtechs=included_subs, colors=colors,
                                    exclude=excluded, lhandle=layer.layer)
-        d.saveSvg(output)
+        d.saveSvg(filepath)