Added a simple CLI

3 files changed, 33 insertions, 14 deletions

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..b836e87
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+Fix issues with UTF-8 encoded filenames
diff --git a/cli.py b/cli.py
new file mode 100644
index 0000000..1c2bf38
--- /dev/null
+++ b/cli.py
@@ -0,0 +1,15 @@
+import argparse
+import scanfiles
+
+parser = argparse.ArgumentParser(description="Scan dir for files")
+
+parser.add_argument("dir")
+parser.add_argument("-t", "--types", metavar="filetype", nargs="+",
+                    help="what filetypes it should scan")
+
+args = parser.parse_args()
+
+#print(args.dir)
+#print(args.types)
+
+print(scanfiles.startscan(args.dir,args.types))
diff --git a/scanfiles.py b/scanfiles.py
index 5944862..26ebb7e 100644
--- a/scanfiles.py
+++ b/scanfiles.py
@@ -3,22 +3,21 @@ import glob
 from ply import lex
 from ply import yacc
 
-global_hfiles = set()
-local_hfiles = set()
-
-def scandir(dir, filetype):
+def scandir(dir, filetypes):
     files = []
     dirs = [f for f in os.listdir(dir)
         if os.path.isdir(os.path.join(dir, f))]
     for dir_path in dirs:
-        files += scandir(dir + "/" + dir_path, filetype)
-    return files + glob.glob(dir + "/*" + filetype)
+        files += scandir(dir + "/" + dir_path, filetypes)
+    for filetype in filetypes:
+        files += glob.glob(dir + "/*" + filetype)
+    return files
 
 #print(scandir("/home/zed/Desktop/test/smw/", ".cpp"))
 
 #lex stuff begins here
 
-def scanincludes(string):
+def scanincludes(string,global_hfiles,local_hfiles):
     tokens = (
             "INCLUDE",
             "GLOBH",
@@ -90,14 +89,18 @@ def scanincludes(string):
     yacc.yacc()
 
     yacc.parse(string)
+    return(global_hfiles,local_hfiles)
+
+
+def startscan(dir,filetypes):
+    global_hfiles = set()
+    local_hfiles = set()
 
-input_string = ""
+    for file in scandir(dir, filetypes):
+        #print(file)
 
-for file in scandir("/home/zed/Desktop/test/smw/", ".h"):
-    print(file)
+        with open(file, encoding="utf-8", errors="replace") as inputfile:
+            (global_hfiles,local_hfiles) = scanincludes(inputfile.read(),global_hfiles,local_hfiles)
 
-    with open(file, encoding="utf-8", errors="replace") as inputfile:
-        scanincludes(inputfile.read())
+    return(global_hfiles,local_hfiles)
 
-print(global_hfiles)
-print(local_hfiles)