Changeset 8254020 for asadb/groups/diffs.py

Timestamp:

Mar 16, 2012, 5:49:17 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

b2cee30

Parents:

9a30b56

git-author:

Alex Dehnert <adehnert@…> (03/16/12 05:49:17)

git-committer:

Alex Dehnert <adehnert@…> (03/16/12 05:49:17)

Message:

Better summaries of groups/diffs.py operation

• Nice table of changes in email, instead of printing the dicts directly
• Display all signatory types, not just those ignored, in the script terminal output
• Accurate counts of changed signatories listed (was listing number of lines)

File:

• asadb/groups/diffs.py (modified) (4 diffs)

asadb/groups/diffs.py

@@ -62 +62 @@
             'Expired': collections.defaultdict(lambda: 0),
         }
+        self.signatory_types_seen = set()
         self.since = since
         self.now = now
-        self.stats = collections.defaultdict(lambda: 0)
 
     def handle_group(self, before, after, before_fields, after_fields, ):
@@ -86 +86 @@
             counter = self.signatory_type_counts[change_type]
             counter[signatory.role.slug] += 1
+            self.signatory_types_seen.add(signatory.role.slug)
             if signatory.role.slug in self.interesting_signatories:
                 if signatory.group != prev_group:
@@ -100 +101 @@
                 prev_group = signatory.group
             else:
-                self.stats["role." + signatory.role.slug] += 1
+                pass
                 #print "Ignoring role %s (signatory %s)" % (signatory.role.slug, signatory, )
 
+    def build_change_stats(self, ):
+        lines = []
+        care_about = 0
+
+        line = "%20s" % ("", )
+        change_types = self.signatory_type_counts.keys()
+        for change_type in change_types:
+            line += "\t%s" % (change_type, )
+        lines.append(line); line = ""
+
+        for sig_type in self.signatory_types_seen:
+            line += "%20s" % (sig_type, )
+            for change_type in change_types:
+                if sig_type in self.signatory_type_counts[change_type]:
+                    count = self.signatory_type_counts[change_type][sig_type]
+                else:
+                    count = 0
+                if sig_type in self.interesting_signatories:
+                    care_about += count
+                out = "\t%4d" % (count, )
+                line += out
+            lines.append(line); line = ""
+
+        return "\n".join(lines), care_about
+
     def end_run(self, ):
+        change_stats, care_about = self.build_change_stats()
         print "\nChange stats for email to %s:" % (self.address, )
-        for stat_key, stat_val in self.stats.items():
-            print "%20s:\t%6d" % (stat_key, stat_val, )
-        print ""
+        print change_stats
 
         message = "\n\n".join(self.updates)
@@ -119 +144 @@
             'num_groups': len(self.updates),
             'groups_message': message,
-            'num_signatory_records': len(self.signatory_updates),
+            'care_about': care_about,
+            'change_stats': change_stats,
             'signatory_types': self.interesting_signatories,
-            'signatory_type_counts': self.signatory_type_counts,
             'signatories_message': signatories_message,
         })