Rewrite commandline argument handling

Giving no arguments now prints the help screen. The current emerge
mode can be accessed using the '-c' flag.

diff --git a/emerge-timer.py b/emerge-timer.py
index 899ebc5a1728cc791130554732108480bf2e5d78..b481c0d12dab7421729df747954428eec045115c 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -395,27 +395,50 @@ def main(status):
     f.close()
 
 
     f.close()
 
 

+def usage():
+    usage = """Usage: emerge-timer.py [package] [options]
+
+Calculate emerge times from emerge log.
+
+Options:
+\t-c, --current \t Show time until currently compiling package finishes
+\t-p, --pretended  Calculate compile time from piped 'emerge -p' output
+\t-h, --help \t Show this helpscreen
+
+\t--no-color \t Use colorless output"""
+
+
+    print usage
+
+    sys.exit(0)
+

 
 if __name__ == "__main__":
 
 
 if __name__ == "__main__":
 

-    if len(sys.argv) == 1:
-        main('current')
-        sys.exit(1)
+    mode = str()

 
 

-    elif sys.argv[1] == "-p":
-        main('pretended')
-        sys.exit(1)
+    for arg in sys.argv[1:]:

 
 

-    elif ((sys.argv[1] == "-h") or (sys.argv[1] == "--help")):
-        print("Usage: emerge-timer.py [options] [package]\n\nOptions:\n"
-              + green_start + "\t-p" + color_stop +
-              "\tcalculate compile time from piped 'emerge -p' output\n" +
-              green_start + "\t[none]" + color_stop +
-              "\tShow average emerge times for currently compiling packages.")
-        sys.exit(1)
+        if arg == "-p" or arg == "--pretended":
+            mode = "pretended"
+
+        if arg == "-h" or arg == "--help":
+            usage()
+
+        if arg == "-c" or arg == "--current":
+            mode = "current"
+
+        if arg == "--no-color":
+            green_start = ''
+            color_stop = ''

 
     if len(sys.argv) > 1:
         package_name = sys.argv[1]
 
     if len(sys.argv) > 1:
         package_name = sys.argv[1]

-        main(0)
+    else:
+        usage()
+
+
+    main(mode)
+    sys.exit(0)