Add summary option.

changelog

@@ -4,6 +4,12 @@ Changelog
 	* Changes are always commented with their author in (braces)
 	* Exception: No braces means author == Nico Schottelius
 
+Next:
+	* Added -s, --summary option (Darko Poljak)
+	* No args error (Darko Poljak)
+	* Report project name as file path basename (Darko Poljak)
+	* Report globbing (Darko Poljak)
+
 1.0: 2014-07-01
 	* Added installer (Oz Nahum)
 	* Bugfix in listprojects (Oz Nahum)

lib/ctt/report.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # 2012 Nico Schottelius (nico-ctt at schottelius.org)
+# 2016 Darko Poljak (darko.poljak at gmail.com)
 #
 # This file is part of ctt.
 #
@@ -70,14 +71,50 @@ class Report(object):
                 projects.extend(fnames)
 
         total_time = 0
+        entries = {}
         for project in projects:
-            report = cls(project, args.start, args.end, args.output_format, args.regexp, args.ignore_case)
+            report = cls(project=project, start_date=args.start,
-            report.report()
+                    end_date=args.end, output_format=args.output_format,
+                    regexp=args.regexp, ignore_case=args.ignore_case)
+            project_report = report.report(args.summary)
+            if args.summary:
+                cls.update_summary_report(entries, project_report)
+            else:
+                report.print_report(project_report, args.output_format)
             total_time = total_time + report.total_time
+        if args.summary:
+            cls.print_summary_report(entries, args.output_format)
 
         cls.summary(total_time)
 
 
+    @staticmethod
+    def update_summary_report(report, entry):
+        for time in entry:
+            if not time in report:
+                report[time] = []
+            report[time].extend(entry[time])
+
+
+    @staticmethod
+    def print_summary_report(report, output_format):
+        Report.print_report_entries(report, output_format, sorted_keys=True)
+
+    @staticmethod
+    def print_report_entries(report, output_format, sorted_keys=False):
+        if sorted_keys:
+            keys = sorted(report.keys())
+        else:
+            keys = report.keys()
+        for time in keys:
+            entries = report[time]
+            for entry in entries:
+                print(output_format.format_map(entry))
+
+    def print_report(self, report, output_format):
+        self.header()
+        self.print_report_entries(report, output_format)
+
     def _init_date(self, start_date, end_date):
         """Setup date - either default or user given values"""
 
@@ -154,9 +191,8 @@ class Report(object):
             else:
                 log.debug("Skipping: %s" % dirname)
 
-    def report(self):
+    def report(self, summary=False):
-        self.header()
+        return self.list_entries(summary)
-        self.list_entries()
 
     def header(self):
         project_name = os.path.basename(self.project)
@@ -183,15 +219,8 @@ class Report(object):
         return count
 
 
-    def list_entries(self):
+    def _get_report_entry(self, time, entry):
-        """Return total time tracked"""
-
-        sorted_times = sorted(self._report_db.keys())
-
-        for time in sorted_times:
-            entry = self._report_db[time]
         report = {}
-
         start_datetime  = datetime.datetime.strptime(time, ctt.DATETIMEFORMAT)
         delta = datetime.timedelta(seconds=int(float(entry['delta'])))
         end_datetime    = (start_datetime + delta).replace(microsecond = 0)
@@ -207,5 +236,22 @@ class Report(object):
             report['comment'] = entry['comment']
         else:
             report['comment'] = False
+        return report
 
-            print(self.output_format.format_map(report))
+
+    def list_entries(self, summary=False):
+        """Return total time tracked"""
+
+        entries = {}
+        if summary:
+            time_keys = self._report_db.keys()
+        else:
+            time_keys = sorted(self._report_db.keys())
+
+        for time in time_keys:
+            entry = self._report_db[time]
+            report = self._get_report_entry(time, entry)
+            if not time in entries:
+                entries[time] = []
+            entries[time].append(report)
+        return entries

scripts/ctt

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # 2012-2015 Nico Schottelius (nico-ctt at schottelius.org)
+# 2016 Darko Poljak (darko.poljak at gmail.com)
 #
 # This file is part of ctt.
 #
@@ -78,6 +79,7 @@ def parse_argv(argv, version):
     parser['report'].add_argument("-i", "--ignore-case", help="ignore case distinctions", action="store_true")
     parser['report'].add_argument("-f", "--format", help="output format (default: %s)" % ctt.REPORTFORMAT, 
         default=ctt.REPORTFORMAT, dest="output_format")
+    parser['report'].add_argument("-s", "--summary", help="hie project names and list time entries in chronological order", action="store_true")
 
     #parser['track'].add_argument("-t", "--tag", help="Add tags",
     #    action="store_true")