Improve commandline argument handling

diff --git a/emerge-timer.py b/emerge-timer.py
index 9c48f09bb9ebceeabc6adcb086ba305942bc438f..ca7fc234163d8b206ace59149e80f769dd9edcac 100755 (executable)
--- a/emerge-timer.py
+++ b/emerge-timer.py
@@ -346,16 +346,43 @@ def main(status, user_package=None):
             print
 
 
             print
 
 

+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()
+    input_package = None

 
 

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

 
 

-    elif len(sys.argv) > 1:
-        main("package", sys.argv[1])
+        if arg == "-c" or arg == "--current":
+            mode = "current"
+
+        if arg == "-h" or arg == "--help":
+            usage()
+
+    if len(sys.argv) > 1:
+        mode = "package"
+        input_package = sys.argv[1]
+    else:
+        usage()

 
 

+    main(mode, input_package)