Convert Author into a dataclass

gitstats/data/author.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass, field
+from datetime import timedelta
+from typing import Set
+
+@dataclass
+class Author:
+    lines_added: int = 0
+    lines_removed: int = 0
+    commits: int = 0
+    first_commit_stamp: int = 0
+    last_commit_stamp: int = 0
+    last_active_day: str = ''
+    active_days: Set[str] = field(default_factory=set)
+    place_by_commits: int = 0
+    commits_frac: float = 0.0
+    date_first: str = ''
+    date_last: str = ''
+    timedelta: timedelta = None
+

gitstats/datacollector.py

@@ -5,6 +5,9 @@ import pickle
 import time
 import zlib
 
+from typing import Dict
+from gitstats.data.author import Author
+
 
 class DataCollector:
     """Manages data collection from a revision control repository."""
@@ -23,7 +26,7 @@ class DataCollector:
         self.activity_by_year_week = {}  # yy_wNN -> commits
         self.activity_by_year_week_peak = 0
 
-        self.authors = {}  # name -> {commits, first_commit_stamp, last_commit_stamp, last_active_day, active_days, lines_added, lines_removed}
+        self.authors: Dict[Author] = {}  # name -> Author
 
         self.total_commits = 0
         self.total_files = 0

gitstats/gitdatacollector.py

@@ -5,8 +5,9 @@ import os
 
 from multiprocessing import Pool
 
-from .datacollector import DataCollector
-from .miscfuncs import getcommitrange, getkeyssortedbyvaluekey, getlogrange, getnumoffilesfromrev, getnumoflinesinblob, \
+from gitstats.data.author import Author
+from gitstats.datacollector import DataCollector
+from gitstats.miscfuncs import getcommitrange, getlogrange, getnumoffilesfromrev, getnumoflinesinblob, \
     getpipeoutput, getstatsummarycounts
 
 
@@ -19,51 +20,179 @@ class GitDataCollector(DataCollector):
 
         self.total_authors += int(getpipeoutput(['git shortlog -s %s' % getlogrange(self.conf), 'wc -l']))
         # self.total_lines = int(getoutput('git-ls-files -z |xargs -0 cat |wc -l'))
+        self.get_tags()
+        self.get_revision_info()
+        self.get_file_info()
+        self.get_loc_info()
+        self.get_author_info()
 
-        # tags
-        lines = getpipeoutput(['git show-ref --tags']).split('\n')
+    def get_author_info(self):
+        # Per-author statistics
+        # defined for stamp, author only if author commited at this timestamp.
+        self.changes_by_date_by_author = {}  # stamp -> author -> lines_added
+        # Similar to the above, but never use --first-parent
+        # (we need to walk through every commit to know who
+        # committed what, not just through mainline)
+        lines = getpipeoutput(
+            ['git log --shortstat --date-order --pretty=format:"%%at %%aN" %s' % (
+                getlogrange(self.conf, 'HEAD'))]).split('\n')
+        lines.reverse()
+        inserted = 0
+        deleted = 0
+        stamp = 0
         for line in lines:
             if len(line) == 0:
                 continue
-            (line_hash, tag) = line.split(' ')
 
-            tag = tag.replace('refs/tags/', '')
-            output = getpipeoutput(['git log "%s" --pretty=format:"%%at %%aN" -n 1' % line_hash])
-            if len(output) > 0:
-                parts = output.split(' ')
-                try:
-                    stamp = int(parts[0])
-                except ValueError:
-                    stamp = 0
-                self.tags[tag] = {'stamp': stamp, 'hash': line_hash,
-                                  'date': datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d'), 'commits': 0,
-                                  'authors': {}}
+            # <stamp> <author>
+            if re.search('files? changed', line) is None:
+                pos = line.find(' ')
+                if pos != -1:
+                    try:
+                        oldstamp = stamp
+                        (stamp, author) = (int(line[:pos]), line[pos + 1:])
+                        if oldstamp > stamp:
+                            # clock skew, keep old timestamp to avoid having ugly graph
+                            stamp = oldstamp
+                        if author not in self.authors:
+                            self.authors[author] = Author()
+                        self.authors[author].commits += 1
+                        self.authors[author].lines_added += inserted
+                        self.authors[author].lines_removed += deleted
+                        if stamp not in self.changes_by_date_by_author:
+                            self.changes_by_date_by_author[stamp] = {}
+                        if author not in self.changes_by_date_by_author[stamp]:
+                            self.changes_by_date_by_author[stamp][author] = Author()
+                        self.changes_by_date_by_author[stamp][author].lines_added = self.authors[author].lines_added
+                        self.changes_by_date_by_author[stamp][author].commits = self.authors[author].commits
+                        files, inserted, deleted = 0, 0, 0
+                    except ValueError:
+                        logging.warning(f'unexpected line "{line}')
+                else:
+                    logging.warning(f'unexpected line "{line}')
+            else:
+                numbers = getstatsummarycounts(line)
 
-        # collect info on tags, starting from latest
-        tags_sorted_by_date_asc = [tup[1] for tup in sorted([(el[1]['date'], el[0]) for el in self.tags.items()])]
-        # tags_sorted_by_date_desc = map(lambda el: el[1],
-        #                                reversed(sorted(map(lambda el: (el[1]['date'], el[0]), self.tags.items()))))
-        prev = None
-#        for tag in reversed(tags_sorted_by_date_desc):
-        for tag in tags_sorted_by_date_asc:
-            cmd = 'git shortlog -s "%s"' % tag
-            if prev is not None:
-                cmd += ' "^%s"' % prev
-            output = getpipeoutput([cmd])
-            if len(output) == 0:
+                if len(numbers) == 3:
+                    (files, inserted, deleted) = map(lambda el: int(el), numbers)
+                else:
+                    logging.warning(f'Failed to handle line "{line}"')
+                    (files, inserted, deleted) = (0, 0, 0)
+
+    def get_loc_info(self):
+        # line statistics
+        # outputs:
+        #  N files changed, N insertions (+), N deletions(-)
+        # <stamp> <author>
+        self.changes_by_date = {}  # stamp -> { files, ins, del }
+        # computation of lines of code by date is better done
+        # on a linear history.
+        extra = ''
+        if self.conf['linear_linestats']:
+            extra = '--first-parent -m'
+        lines = getpipeoutput(
+            ['git log --shortstat %s --pretty=format:"%%at %%aN" %s' % (extra, getlogrange(self.conf, 'HEAD'))]).split(
+            '\n')
+        lines.reverse()
+        files = 0
+        inserted = 0
+        deleted = 0
+        total_lines = 0
+        for line in lines:
+            if len(line) == 0:
                 continue
-            prev = tag
-            for line in output.split('\n'):
-                parts = re.split('\s+', line, 2)
-                commits = int(parts[1])
-                author = parts[2]
-                self.tags[tag]['commits'] += commits
-                self.tags[tag]['authors'][author] = commits
 
+            # <stamp> <author>
+            if re.search('files? changed', line) is None:
+                pos = line.find(' ')
+                if pos != -1:
+                    try:
+                        (stamp, author) = (int(line[:pos]), line[pos + 1:])
+                        self.changes_by_date[stamp] = {'files': files, 'ins': inserted, 'del': deleted,
+                                                       'lines': total_lines}
+
+                        date = datetime.datetime.fromtimestamp(stamp)
+                        yymm = date.strftime('%Y-%m')
+                        self.lines_added_by_month[yymm] = self.lines_added_by_month.get(yymm, 0) + inserted
+                        self.lines_removed_by_month[yymm] = self.lines_removed_by_month.get(yymm, 0) + deleted
+
+                        yy = date.year
+                        self.lines_added_by_year[yy] = self.lines_added_by_year.get(yy, 0) + inserted
+                        self.lines_removed_by_year[yy] = self.lines_removed_by_year.get(yy, 0) + deleted
+
+                        files, inserted, deleted = 0, 0, 0
+                    except ValueError:
+                        logging.warning(f'unexpected line "{line}')
+                else:
+                    logging.warning(f'unexpected line "{line}')
+            else:
+                numbers = getstatsummarycounts(line)
+
+                if len(numbers) == 3:
+                    (files, inserted, deleted) = map(lambda el: int(el), numbers)
+                    total_lines += inserted
+                    total_lines -= deleted
+                    self.total_lines_added += inserted
+                    self.total_lines_removed += deleted
+
+                else:
+                    logging.warning(f'Failed to handle line "{line}"')
+                    (files, inserted, deleted) = (0, 0, 0)
+            # self.changes_by_date[stamp] = { 'files': files, 'ins': inserted, 'del': deleted }
+        self.total_lines += total_lines
+
+    def get_file_info(self):
+        # extensions and size of files
+        lines = getpipeoutput(['git ls-tree -r -l -z %s' % getcommitrange(self.conf, 'HEAD', end_only=True)]).split(
+            '\000')
+        blobs_to_read = []
+        for line in lines:
+            if len(line) == 0:
+                continue
+            parts = re.split('\s+', line, 4)
+            if parts[0] == '160000' and parts[3] == '-':
+                # skip submodules
+                continue
+            blob_id = parts[2]
+            size = int(parts[3])
+            fullpath = parts[4]
+
+            self.total_size += size
+            self.total_files += 1
+
+            _, ext = os.path.splitext(fullpath)
+            if len(ext) > self.conf['max_ext_length']:
+                ext = ''
+            if ext not in self.extensions:
+                self.extensions[ext] = {'files': 0, 'lines': 0}
+            self.extensions[ext]['files'] += 1
+            # if cache empty then add ext and blob id to list of new blob's
+            # otherwise try to read needed info from cache
+            if 'lines_in_blob' not in self.cache.keys():
+                blobs_to_read.append((ext, blob_id))
+                continue
+            if blob_id in self.cache['lines_in_blob'].keys():
+                self.extensions[ext]['lines'] += self.cache['lines_in_blob'][blob_id]
+            else:
+                blobs_to_read.append((ext, blob_id))
+        # Get info abount line count for new blob's that wasn't found in cache
+        pool = Pool(processes=self.conf['processes'])
+        ext_blob_linecount = pool.map(getnumoflinesinblob, blobs_to_read)
+        pool.terminate()
+        pool.join()
+        # Update cache and write down info about number of number of lines
+        for (ext, blob_id, linecount) in ext_blob_linecount:
+            if 'lines_in_blob' not in self.cache:
+                self.cache['lines_in_blob'] = {}
+            self.cache['lines_in_blob'][blob_id] = linecount
+            self.extensions[ext]['lines'] += self.cache['lines_in_blob'][blob_id]
+
+    def get_revision_info(self):
         # Collect revision statistics
         # Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
         lines = getpipeoutput(
-            ['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange(self.conf, 'HEAD'), 'grep -v ^commit']).split(
+            ['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange(self.conf, 'HEAD'),
+             'grep -v ^commit']).split(
             '\n')
         for line in lines:
             parts = line.split(' ', 4)
@@ -124,16 +253,16 @@ class GitDataCollector(DataCollector):
 
             # author stats
             if author not in self.authors:
-                self.authors[author] = {}
+                self.authors[author] = Author()
             # commits, note again that commits may be in any date order because of cherry-picking and patches
-            if 'last_commit_stamp' not in self.authors[author]:
-                self.authors[author]['last_commit_stamp'] = stamp
-            if stamp > self.authors[author]['last_commit_stamp']:
-                self.authors[author]['last_commit_stamp'] = stamp
-            if 'first_commit_stamp' not in self.authors[author]:
-                self.authors[author]['first_commit_stamp'] = stamp
-            if stamp < self.authors[author]['first_commit_stamp']:
-                self.authors[author]['first_commit_stamp'] = stamp
+            if not self.authors[author].last_commit_stamp:
+                self.authors[author].last_commit_stamp = stamp
+            if stamp > self.authors[author].last_commit_stamp:
+                self.authors[author].last_commit_stamp = stamp
+            if not self.authors[author].first_commit_stamp:
+                self.authors[author].first_commit_stamp = stamp
+            if stamp < self.authors[author].first_commit_stamp:
+                self.authors[author].first_commit_stamp = stamp
 
             # author of the month/year
             yymm = date.strftime('%Y-%m')
@@ -154,12 +283,11 @@ class GitDataCollector(DataCollector):
 
             # authors: active days
             yymmdd = date.strftime('%Y-%m-%d')
-            if 'last_active_day' not in self.authors[author]:
-                self.authors[author]['last_active_day'] = yymmdd
-                self.authors[author]['active_days'] = {yymmdd}
-            elif yymmdd != self.authors[author]['last_active_day']:
-                self.authors[author]['last_active_day'] = yymmdd
-                self.authors[author]['active_days'].add(yymmdd)
+            if not self.authors[author].last_active_day:
+                self.authors[author].last_active_day = yymmdd
+            elif yymmdd != self.authors[author].last_active_day:
+                self.authors[author].last_active_day = yymmdd
+            self.authors[author].active_days.add(yymmdd)
 
             # project: active days
             if yymmdd != self.last_active_day:
@@ -168,10 +296,10 @@ class GitDataCollector(DataCollector):
 
             # timezone
             self.commits_by_timezone[timezone] = self.commits_by_timezone.get(timezone, 0) + 1
-
         # outputs "<stamp> <files>" for each revision
         revlines = getpipeoutput(
-            ['git rev-list --pretty=format:"%%at %%T" %s' % getlogrange(self.conf, 'HEAD'), 'grep -v ^commit']).strip().split('\n')
+            ['git rev-list --pretty=format:"%%at %%T" %s' % getlogrange(self.conf, 'HEAD'),
+             'grep -v ^commit']).strip().split('\n')
         lines = []
         revs_to_read = []
         # Look up rev in cache and take info from cache if found
@@ -187,20 +315,17 @@ class GitDataCollector(DataCollector):
                 lines.append('%d %d' % (int(time), self.cache['files_in_tree'][rev]))
             else:
                 revs_to_read.append((time, rev))
-
         # Read revisions from repo
         pool = Pool(processes=self.conf['processes'])
         time_rev_count = pool.map(getnumoffilesfromrev, revs_to_read)
         pool.terminate()
         pool.join()
-
         # Update cache with new revisions and append then to general list
         for (time, rev, count) in time_rev_count:
             if 'files_in_tree' not in self.cache:
                 self.cache['files_in_tree'] = {}
             self.cache['files_in_tree'][rev] = count
             lines.append('%d %d' % (int(time), count))
-
         self.total_commits += len(lines)
         for line in lines:
             parts = line.split(' ')
@@ -212,187 +337,64 @@ class GitDataCollector(DataCollector):
             except ValueError:
                 logging.warning(f'Failed to parse line "{line}"')
 
-        # extensions and size of files
-        lines = getpipeoutput(['git ls-tree -r -l -z %s' % getcommitrange(self.conf, 'HEAD', end_only=True)]).split('\000')
-        blobs_to_read = []
-        for line in lines:
-            if len(line) == 0:
-                continue
-            parts = re.split('\s+', line, 4)
-            if parts[0] == '160000' and parts[3] == '-':
-                # skip submodules
-                continue
-            blob_id = parts[2]
-            size = int(parts[3])
-            fullpath = parts[4]
-
-            self.total_size += size
-            self.total_files += 1
-
-            _, ext = os.path.splitext(fullpath)
-            if len(ext) > self.conf['max_ext_length']:
-                ext = ''
-            if ext not in self.extensions:
-                self.extensions[ext] = {'files': 0, 'lines': 0}
-            self.extensions[ext]['files'] += 1
-            # if cache empty then add ext and blob id to list of new blob's
-            # otherwise try to read needed info from cache
-            if 'lines_in_blob' not in self.cache.keys():
-                blobs_to_read.append((ext, blob_id))
-                continue
-            if blob_id in self.cache['lines_in_blob'].keys():
-                self.extensions[ext]['lines'] += self.cache['lines_in_blob'][blob_id]
-            else:
-                blobs_to_read.append((ext, blob_id))
-
-        # Get info abount line count for new blob's that wasn't found in cache
-        pool = Pool(processes=self.conf['processes'])
-        ext_blob_linecount = pool.map(getnumoflinesinblob, blobs_to_read)
-        pool.terminate()
-        pool.join()
-
-        # Update cache and write down info about number of number of lines
-        for (ext, blob_id, linecount) in ext_blob_linecount:
-            if 'lines_in_blob' not in self.cache:
-                self.cache['lines_in_blob'] = {}
-            self.cache['lines_in_blob'][blob_id] = linecount
-            self.extensions[ext]['lines'] += self.cache['lines_in_blob'][blob_id]
-
-        # line statistics
-        # outputs:
-        #  N files changed, N insertions (+), N deletions(-)
-        # <stamp> <author>
-        self.changes_by_date = {}  # stamp -> { files, ins, del }
-        # computation of lines of code by date is better done
-        # on a linear history.
-        extra = ''
-        if self.conf['linear_linestats']:
-            extra = '--first-parent -m'
-        lines = getpipeoutput(
-            ['git log --shortstat %s --pretty=format:"%%at %%aN" %s' % (extra, getlogrange(self.conf, 'HEAD'))]).split('\n')
-        lines.reverse()
-        files = 0
-        inserted = 0
-        deleted = 0
-        total_lines = 0
+    def get_tags(self):
+        # tags
+        lines = getpipeoutput(['git show-ref --tags']).split('\n')
         for line in lines:
             if len(line) == 0:
                 continue
+            (line_hash, tag) = line.split(' ')
 
-            # <stamp> <author>
-            if re.search('files? changed', line) is None:
-                pos = line.find(' ')
-                if pos != -1:
-                    try:
-                        (stamp, author) = (int(line[:pos]), line[pos + 1:])
-                        self.changes_by_date[stamp] = {'files': files, 'ins': inserted, 'del': deleted,
-                                                       'lines': total_lines}
-
-                        date = datetime.datetime.fromtimestamp(stamp)
-                        yymm = date.strftime('%Y-%m')
-                        self.lines_added_by_month[yymm] = self.lines_added_by_month.get(yymm, 0) + inserted
-                        self.lines_removed_by_month[yymm] = self.lines_removed_by_month.get(yymm, 0) + deleted
-
-                        yy = date.year
-                        self.lines_added_by_year[yy] = self.lines_added_by_year.get(yy, 0) + inserted
-                        self.lines_removed_by_year[yy] = self.lines_removed_by_year.get(yy, 0) + deleted
-
-                        files, inserted, deleted = 0, 0, 0
-                    except ValueError:
-                        logging.warning(f'unexpected line "{line}')
-                else:
-                    logging.warning(f'unexpected line "{line}')
-            else:
-                numbers = getstatsummarycounts(line)
-
-                if len(numbers) == 3:
-                    (files, inserted, deleted) = map(lambda el: int(el), numbers)
-                    total_lines += inserted
-                    total_lines -= deleted
-                    self.total_lines_added += inserted
-                    self.total_lines_removed += deleted
-
-                else:
-                    logging.warning(f'Failed to handle line "{line}"')
-                    (files, inserted, deleted) = (0, 0, 0)
-            # self.changes_by_date[stamp] = { 'files': files, 'ins': inserted, 'del': deleted }
-        self.total_lines += total_lines
-
-        # Per-author statistics
-
-        # defined for stamp, author only if author commited at this timestamp.
-        self.changes_by_date_by_author = {}  # stamp -> author -> lines_added
-
-        # Similar to the above, but never use --first-parent
-        # (we need to walk through every commit to know who
-        # committed what, not just through mainline)
-        lines = getpipeoutput(
-            ['git log --shortstat --date-order --pretty=format:"%%at %%aN" %s' % (getlogrange(self.conf, 'HEAD'))]).split('\n')
-        lines.reverse()
-        inserted = 0
-        deleted = 0
-        stamp = 0
-        for line in lines:
-            if len(line) == 0:
+            tag = tag.replace('refs/tags/', '')
+            output = getpipeoutput(['git log "%s" --pretty=format:"%%at %%aN" -n 1' % line_hash])
+            if len(output) > 0:
+                parts = output.split(' ')
+                try:
+                    stamp = int(parts[0])
+                except ValueError:
+                    stamp = 0
+                self.tags[tag] = {'stamp': stamp,
+                                  'hash': line_hash,
+                                  'date': datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d'),
+                                  'commits': 0,
+                                  'authors': {}}
+        # collect info on tags, starting from latest
+        tags_sorted_by_date_asc = [tup[1] for tup in sorted([(el[1]['date'], el[0]) for el in self.tags.items()])]
+        # tags_sorted_by_date_desc = map(lambda el: el[1],
+        #                                reversed(sorted(map(lambda el: (el[1]['date'], el[0]), self.tags.items()))))
+        prev = None
+        #        for tag in reversed(tags_sorted_by_date_desc):
+        for tag in tags_sorted_by_date_asc:
+            cmd = 'git shortlog -s "%s"' % tag
+            if prev is not None:
+                cmd += ' "^%s"' % prev
+            output = getpipeoutput([cmd])
+            if len(output) == 0:
                 continue
-
-            # <stamp> <author>
-            if re.search('files? changed', line) is None:
-                pos = line.find(' ')
-                if pos != -1:
-                    try:
-                        oldstamp = stamp
-                        (stamp, author) = (int(line[:pos]), line[pos + 1:])
-                        if oldstamp > stamp:
-                            # clock skew, keep old timestamp to avoid having ugly graph
-                            stamp = oldstamp
-                        if author not in self.authors:
-                            self.authors[author] = {'lines_added': 0, 'lines_removed': 0, 'commits': 0}
-                        self.authors[author]['commits'] = self.authors[author].get('commits', 0) + 1
-                        self.authors[author]['lines_added'] = self.authors[author].get('lines_added', 0) + inserted
-                        self.authors[author]['lines_removed'] = self.authors[author].get('lines_removed', 0) + deleted
-                        if stamp not in self.changes_by_date_by_author:
-                            self.changes_by_date_by_author[stamp] = {}
-                        if author not in self.changes_by_date_by_author[stamp]:
-                            self.changes_by_date_by_author[stamp][author] = {}
-                        self.changes_by_date_by_author[stamp][author]['lines_added'] = self.authors[author][
-                            'lines_added']
-                        self.changes_by_date_by_author[stamp][author]['commits'] = self.authors[author]['commits']
-                        files, inserted, deleted = 0, 0, 0
-                    except ValueError:
-                        logging.warning(f'unexpected line "{line}')
-                else:
-                    logging.warning(f'unexpected line "{line}')
-            else:
-                numbers = getstatsummarycounts(line)
-
-                if len(numbers) == 3:
-                    (files, inserted, deleted) = map(lambda el: int(el), numbers)
-                else:
-                    logging.warning(f'Failed to handle line "{line}"')
-                    (files, inserted, deleted) = (0, 0, 0)
+            prev = tag
+            for line in output.split('\n'):
+                parts = re.split('\s+', line, 2)
+                commits = int(parts[1])
+                author = parts[2]
+                self.tags[tag]['commits'] += commits
+                self.tags[tag]['authors'][author] = commits
 
     def refine(self):
         # authors
         # name -> {place_by_commits, commits_frac, date_first, date_last, timedelta}
-        self.authors_by_commits = getkeyssortedbyvaluekey(self.authors, 'commits')
-        self.authors_by_commits.reverse()  # most first
+        self.authors_by_commits = self.getAuthors()
         for i, name in enumerate(self.authors_by_commits):
-            self.authors[name]['place_by_commits'] = i + 1
+            self.authors[name].place_by_commits = i + 1
 
         for name in self.authors.keys():
             a = self.authors[name]
-            a['commits_frac'] = (100 * float(a['commits'])) / self.getTotalCommits()
-            date_first = datetime.datetime.fromtimestamp(a['first_commit_stamp'])
-            date_last = datetime.datetime.fromtimestamp(a['last_commit_stamp'])
+            a.commits_frac = (100 * float(a.commits)) / self.getTotalCommits()
+            date_first = datetime.datetime.fromtimestamp(a.first_commit_stamp)
+            date_last = datetime.datetime.fromtimestamp(a.last_commit_stamp)
             delta = date_last - date_first
-            a['date_first'] = date_first.strftime('%Y-%m-%d')
-            a['date_last'] = date_last.strftime('%Y-%m-%d')
-            a['timedelta'] = delta
-            if 'lines_added' not in a:
-                a['lines_added'] = 0
-            if 'lines_removed' not in a:
-                a['lines_removed'] = 0
+            a.date_first = date_first.strftime('%Y-%m-%d')
+            a.date_last = date_last.strftime('%Y-%m-%d')
+            a.timedelta = delta
 
     def getActiveDays(self):
         return self.active_days
@@ -407,8 +409,7 @@ class GitDataCollector(DataCollector):
         return self.authors[author]
 
     def getAuthors(self, limit=None):
-        res = getkeyssortedbyvaluekey(self.authors, 'commits')
-        res.reverse()
+        res = [el[0] for el in sorted(self.authors.items(), key=lambda x: x[1].commits, reverse=True)]
         return res[:limit]
 
     def getCommitDeltaDays(self):

gitstats/gitstats.py

@@ -104,8 +104,9 @@ class GitStats:
 
             os.chdir(prevdir)
 
-            logging.info('Refining data...')
         data.saveCache(cachefile)
+
+        logging.info('Refining data...')
         data.refine()
 
         os.chdir(rundir)

gitstats/htmlreportcreator.py

@@ -282,9 +282,9 @@ class HTMLReportCreator(ReportCreator):
             info = data.getAuthorInfo(author)
             f.write(
                 '<tr><td>%s</td><td>%d (%.2f%%)</td><td>%d</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%d</td></tr>' % (
-                    author, info['commits'], info['commits_frac'], info['lines_added'], info['lines_removed'],
-                    info['date_first'], info['date_last'], info['timedelta'], len(info['active_days']),
-                    info['place_by_commits']))
+                    author, info.commits, info.commits_frac, info.lines_added, info.lines_removed,
+                    info.date_first, info.date_last, info.timedelta, len(info.active_days),
+                    info.place_by_commits))
         f.write('</table>')
 
         allauthors = data.getAuthors()
@@ -325,8 +325,8 @@ class HTMLReportCreator(ReportCreator):
             fgc.write('%d' % stamp)
             for author in self.authors_to_plot:
                 if author in data.changes_by_date_by_author[stamp].keys():
-                    lines_by_authors[author] = data.changes_by_date_by_author[stamp][author]['lines_added']
-                    commits_by_authors[author] = data.changes_by_date_by_author[stamp][author]['commits']
+                    lines_by_authors[author] = data.changes_by_date_by_author[stamp][author].lines_added
+                    commits_by_authors[author] = data.changes_by_date_by_author[stamp][author].commits
                 fgl.write(' %d' % lines_by_authors[author])
                 fgc.write(' %d' % commits_by_authors[author])
             fgl.write('\n')

setup.py

@@ -37,6 +37,7 @@ setup(
         'setuptools>=18.0'
     ],
     install_requires=[
+        'dataclasses',
         'multiprocessing_logging'
     ],