diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-07-02 09:56:08 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2008-07-02 09:56:08 (GMT) |
commit | 3feeedfa4a0c7b043a598e316b76a8cf53428630 (patch) | |
tree | d9a72c8578086788856bcbfbc8e6df193bac76dc /scripts | |
parent | b6d15a6ebf408936ccec28e3bb75d9c3d9aae0d5 (diff) |
Fixes to reviews report
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/report.py | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/scripts/report.py b/scripts/report.py index 5ec52af..3ad7010 100644 --- a/scripts/report.py +++ b/scripts/report.py @@ -34,7 +34,9 @@ class TextWriter(object): self.out.write('= ' + headline + ' =\n\n') def write_tickets(self, tickets, compact=False): - for number, summary in tickets: + for ticket in tickets: + number = ticket['number'] + summary = ticket['summary'] if compact: self.out.write('* #%s %s\n' % (number, summary)) else: @@ -148,7 +150,7 @@ class ReviewsReport(object): 'component=presence-service&' \ 'component=journal-activity&' \ 'col=id&col=summary&col=keywords&' \ - 'keywords=%7Er%3F') + 'keywords=~r%2B&keywords=~r-&keywords=~r%3F') reader = csv.reader(f) reader.next() @@ -156,13 +158,18 @@ class ReviewsReport(object): for row in reader: number = row[0] keyword = row[2] - ticket = row[0:2] + + ticket = { 'number' : row[0], + 'summary' : row[1] } if 'r?' in keyword: + ticket['review_state'] = 'r?' self._requested[number] = ticket if 'r+' in keyword: + ticket['review_state'] = 'r+' self._approved[number] = ticket if 'r-' in keyword: + ticket['review_state'] = 'r-' self._rejected[number] = ticket f.close() @@ -205,7 +212,16 @@ class ReviewsReport(object): return ({}, {}, {}) def _diff_tickets(self, old, new): - return [ t for n, t in new.items() if n not in old ] + diff = [] + for number, ticket in new.items(): + if number in old: + old_ticket = old[number] + if old_ticket['review_state'] != ticket['review_state']: + diff.append(ticket) + else: + diff.append(ticket) + + return diff class cmd_report(Command): |