finish reporting

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

bin/ctt

@@ -21,16 +21,7 @@
 #
 
 import argparse
-import calendar
-import datetime
-
-#import signal
-
-import locale
 import logging
-import time
-
-import os
 import os.path
 import sys
 
@@ -42,30 +33,29 @@ log = logging.getLogger(__name__)
 
 # Record tags
 
-def cmd_track(args):
-    """Command line handler for time tracking"""
-    tracker = Tracker(args.project[0])
-    tracker.track_time()
-    tracker.write_time()
-    print(tracker.delta())
-
-def cmd_report(args):
-    """Command line handler for time reporting"""
-    print(args)
-    report = Report(args.project[0], args.start, args.end)
-    print(Report.default_dates())
-
-def parse_argv(argv):
+def parse_argv(argv, version):
     parser = {}
-    parser['main'] = argparse.ArgumentParser(description='ctt ' + VERSION)
+    parser['loglevel'] = argparse.ArgumentParser(add_help=False)
+    parser['loglevel'].add_argument('-d', '--debug',
+        help='Set log level to debug', action='store_true',
+        default=False)
+    parser['loglevel'].add_argument('-v', '--verbose',
+        help='Set log level to info, be more verbose',
+        action='store_true', default=False)
+
+    parser['main'] = argparse.ArgumentParser(description='ctt ' + version,
+        parents=[parser['loglevel']])
     parser['sub'] = parser['main'].add_subparsers(title="Commands")
 
-    parser['track'] = parser['sub'].add_parser('track')
-    parser['track'].set_defaults(func=cmd_track)
+
+    parser['track'] = parser['sub'].add_parser('track',
+        parents=[parser['loglevel']])
+    parser['track'].set_defaults(func=Tracker.commandline)
     parser['track'].add_argument("project", help="Project to track time for", nargs=1)
 
-    parser['report'] = parser['sub'].add_parser('report')
-    parser['report'].set_defaults(func=cmd_report)
+    parser['report'] = parser['sub'].add_parser('report',
+        parents=[parser['loglevel']])
+    parser['report'].set_defaults(func=Report.commandline)
     parser['report'].add_argument("project", help="Project to report time for", nargs=1)
     parser['report'].add_argument("-s", "--start", help="Start datetime (first of last month)",
         nargs=1)
@@ -76,24 +66,40 @@ def parse_argv(argv):
     #    action="store_true")
 
     args = parser['main'].parse_args()
-    print(args)
 
-    args.func(args)
+    if args.verbose:
+        logging.root.setLevel(logging.INFO)
+    if args.debug:
+        logging.root.setLevel(logging.DEBUG)
+
+    log.debug(args)
+
+    try:
+        args.func(args)
+
+    except ctt.Error as e:
+        log.error(e)
+        sys.exit(1)
+
+# Setup signal handler
+# Start tracking
+# Save stuff to our home directory
 
 if __name__ == "__main__":
     # Ensure our /lib/ is included into PYTHON_PATH
     sys.path.insert(0, os.path.abspath(
         os.path.join(os.path.dirname(os.path.realpath(__file__)), '../lib')))
 
+    #logging.basicConfig(format='%(levelname)s: %(message)s')
+    logging.basicConfig(format='%(message)s')
+
+    import ctt
     from ctt.tracker import Tracker
     from ctt.report import Report
 
-    parse_argv(sys.argv[1:])
+    parse_argv(sys.argv[1:], ctt.VERSION)
     sys.exit(0)
 
-# Setup signal handler
-# Start tracking
-# Save stuff to our home directory
 
 # Create datetime from userinput
 # Wed Aug  1 23:35:53 2012