Merge remote-tracking branch 'upstream/master' into arts3-dev

python/bin/arts_convert.py

@@ -2,20 +2,24 @@
 Simple script to convert .arts controlfiles to Python.
 """
 import argparse
-import os
 import glob
+import os
 import sys
 
-import pyarts
 from pyarts.parser import convert_to_python
 
 parser = argparse.ArgumentParser(description='Convert ARTS controlfile to Python.')
-parser.add_argument('--nofail', action='store_true',
-                    help='Ignore failed conversions.')
-parser.add_argument('files', metavar='files', type=str, nargs='+',
-                   help='Single filename of base path for recursive conversion.')
-parser.add_argument('-o', type=str, default="",
-                   help='Filename of base path for output files.')
+parser.add_argument('--nofail', action='store_true', help='Ignore failed conversions.')
+parser.add_argument('--dry-run', action='store_true', help='Simulate conversion.')
+parser.add_argument('files',
+                    metavar='files',
+                    type=str,
+                    nargs='+',
+                    help='Single filename of base path for recursive conversion.')
+parser.add_argument('-o',
+                    type=str,
+                    default="",
+                    help='Filename of base path for output files.')
 args = parser.parse_args()
 files = args.files
 output = args.o
@@ -24,10 +28,9 @@
 # Collect input files
 #
 
-if len(files) == 1:
-    if os.path.isdir(files[0]):
-        base_path = files[0]
-        files = glob.glob(os.path.join(files[0], "**/*.arts"), recursive=True)
+if len(files) == 1 and os.path.isdir(files[0]):
+    base_path = files[0]
+    files = glob.glob(os.path.join(files[0], "**/*.arts"), recursive=True)
 else:
     base_path = os.getcwd()
 
@@ -42,29 +45,36 @@
              "as relative paths.")
 
 if os.path.isdir(output):
+
     def make_output(input):
         relpath = os.path.relpath(input, base_path)
-        file_out = os.path.join(output, relpath[:-4] + "py")
+        file_out = os.path.join(output, os.path.splitext(relpath)[0] + ".py")
         path_out = os.path.dirname(file_out)
         if not os.path.exists(path_out):
             os.makedirs(path_out)
         return file_out
 else:
+
     def make_output(input):
-        return input
+        return os.path.splitext(input)[0] + ".py"
+
 
 print("Running arts_convert ...")
 converted = 0
 for f in files:
     path, filename = os.path.split(f)
     filename_out = make_output(f)
     try:
+        if args.dry_run:
+            print(f"Would write {filename_out}")
+            continue
         convert_to_python(f, filename_out)
+        print(f"Wrote {filename_out}")
         converted += 1
     except Exception as e:
-        print("Error converting {}:".format(filename), e.args[0].splitlines()[-1])
+        print(f"Error converting {filename}:", e.args[0].splitlines()[-1])
 
-if not args.nofail and converted < len(files):
+if not args.dry_run and not args.nofail and converted < len(files):
     print(f"arts_convert done. "
           f"Failed to convert {len(files)-converted} out of {len(files)} files.")
     sys.exit(1)