1.1 --- a/cronrec.py Tue Oct 05 15:19:14 2010 +0200
1.2 +++ b/cronrec.py Tue Oct 05 15:38:38 2010 +0200
1.3 @@ -102,10 +102,10 @@
1.4 db.end(db_file(), project, activity, time, log)
1.5
1.6 def pause(args):
1.7 - db.pause(db_file(), None, None, datetime.now())
1.8 + db.pause(db_file(), datetime.now())
1.9
1.10 def resume(args):
1.11 - db.resume(db_file(), None, None, datetime.now(), args.m)
1.12 + db.resume(db_file(), None, datetime.now(), args.m)
1.13
1.14 def add_task(args):
1.15 project, activity = parse_label(args.label)
1.16 @@ -115,6 +115,13 @@
1.17 db.begin(db_file(), project, activity, begin)
1.18 db.end(db_file(), project, activity, end, log)
1.19
1.20 +def add_break(args):
1.21 + log = args.m
1.22 + begin = datetime.strptime(args.begin, DATETIME_FORMAT)
1.23 + end = datetime.strptime(args.end, DATETIME_FORMAT)
1.24 + db.pause(db_file(), begin)
1.25 + db.resume(db_file(), db.find_active_task(db_file(), begin), end, log)
1.26 +
1.27 def status(args):
1.28 task = db.status(db_file())
1.29 if task:
1.30 @@ -151,12 +158,19 @@
1.31
1.32 sub_add = subs.add_parser("add")
1.33 sub_add_subs = sub_add.add_subparsers()
1.34 +
1.35 sub_add_task = sub_add_subs.add_parser("task")
1.36 sub_add_task.add_argument("label", type=str)
1.37 sub_add_task.add_argument("begin", type=str)
1.38 sub_add_task.add_argument("end", type=str)
1.39 sub_add_task.add_argument("-m", type=str)
1.40 sub_add_task.set_defaults(func=add_task)
1.41 +
1.42 + sub_add_break = sub_add_subs.add_parser("break")
1.43 + sub_add_break.add_argument("begin", type=str)
1.44 + sub_add_break.add_argument("end", type=str)
1.45 + sub_add_break.add_argument("-m", type=str)
1.46 + sub_add_break.set_defaults(func=add_break)
1.47
1.48 sub_status = subs.add_parser("status")
1.49 sub_status.set_defaults(func=status)