formatter: more improvements and support for things like lambdas

scripts/gsrc/format-gsrc-file.py

@@ -10,46 +10,56 @@
 #     f.write(json.dumps(json_data, indent=2))
 
 import json
+import math
 import subprocess
-import sys
+from colorama import just_fix_windows_console, Fore, Back, Style
 
-apply_status = None
-if len(sys.argv) > 1:
-    apply_status = sys.argv[1]
+just_fix_windows_console()
 
-with open("./scripts/gsrc/format-jak1.json", "r") as f:
-    formatting_progress = json.load(f)
+def format_the_file(apply_status):
+    with open("./scripts/gsrc/format-jak1.json", "r") as f:
+        formatting_progress = json.load(f)
 
-# find the next file
-curr_file = None
-curr_file_index = 0
-go_to_next = False
-open_file_in_vscode = False
-if apply_status == "next":
-    go_to_next = True
-    open_file_in_vscode = True
+    # find the next file
+    curr_file = None
+    go_to_next = False
+    open_file_in_vscode = False
+    if apply_status == "next":
+        go_to_next = True
+        open_file_in_vscode = True
 
-for index, file in enumerate(formatting_progress):
-    if file['status'] == 'not-formatted':
-        if go_to_next:
-            print(f"Marking {file['path']} as formatted")
-            formatting_progress[index]['status'] = 'formatted'
-            go_to_next = False
+    for index, file in enumerate(formatting_progress):
+        if file['status'] == 'not-formatted':
+            if go_to_next:
+                print(f"Marking {file['path']} as formatted")
+                print(f"{Fore.GREEN} {(index / len(formatting_progress)) * 100:.3f}% {Fore.RESET} Completed")
+                formatting_progress[index]['status'] = 'formatted'
+                go_to_next = False
+            else:
+                curr_file = file['path']
+                if open_file_in_vscode:
+                    subprocess.run(["C:\\Users\\xtvas\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code.cmd", file['path']]) 
+                break
+
+    # format it
+    print(f"Formatting {curr_file}")
+    subprocess.run(["./out/build/Debug/bin/formatter", "--write", "--file", curr_file]) 
+
+    # save status
+    if apply_status is not None and (apply_status == "skip" or apply_status == "next"):
+        # TODO - add skip support back if i ever want to use it
+        with open("./scripts/gsrc/format-jak1.json", "w") as f:
+            f.write(json.dumps(formatting_progress, indent=2))
+
+    subprocess.run(["git", "diff", "--shortstat", "origin/master"])
+
+def main():
+    while True:
+        user_input = input(Fore.CYAN + "Type 'n' to proceed to the next file or just hit enter to re-format the current file: " + Fore.RESET)
+        if user_input == 'n':
+            format_the_file("next")
         else:
-            curr_file = file['path']
-            curr_file_index = index
-            if open_file_in_vscode:
-                subprocess.run(["C:\\Users\\xtvas\\AppData\\Local\\Programs\\Microsoft VS Code\\bin\\code.cmd", file['path']]) 
-            break
+            format_the_file(None)
 
-# format it
-print(f"Formatting {curr_file}")
-subprocess.run(["./out/build/Debug/bin/formatter", "--write", "--file", curr_file]) 
-
-# save status
-if apply_status is not None and (apply_status == "skip" or apply_status == "next"):
-    # TODO - add skip support back if i ever want to use it
-    with open("./scripts/gsrc/format-jak1.json", "w") as f:
-        f.write(json.dumps(formatting_progress, indent=2))
-
-subprocess.run(["git", "diff", "--shortstat", "origin/master"]) 
+if __name__ == "__main__":
+    main()