Rev 31: simplify the output a bit in http://bazaar.launchpad.net/~canonical-bazaar/udd/hottest100

[John Arbash Meinel]

At http://bazaar.launchpad.net/~canonical-bazaar/udd/hottest100

------------------------------------------------------------
revno: 31
revision-id: john at arbash-meinel.com-20100126144503-msbmo7dhlyvb1iay
parent: john at arbash-meinel.com-20100126142427-z5ms3mu6rbtu3tp9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hottest100
timestamp: Tue 2010-01-26 08:45:03 -0600
message:
  simplify the output a bit
-------------- next part --------------
=== modified file 'check-hottest.py'
--- a/check-hottest.py	2010-01-26 14:24:27 +0000
+++ b/check-hottest.py	2010-01-26 14:45:03 +0000
@@ -56,10 +56,10 @@
         f.close()
 
 
-def categorize(category_name, package_name):
+def categorize(category_name, package, output_stream):
     global categories
-    print '  %s categorized %s' % (package_name, category_name)
-    categories.setdefault(category_name, set()).add(package_name)
+    output_stream.write('  categorized %s\n' % (category_name,))
+    categories.setdefault(category_name, set()).add(package)
 
 
 def summarize_categories():
@@ -138,19 +138,19 @@
         print package.name
         # handle tags
         if 'old-version' in package.tags:
-            categorize('old', package)
+            categorize('old', package, output_stream)
             continue
         if 'metapackage' in package.tags:
-            categorize('meta', package)
+            categorize('meta', package, output_stream)
             continue
         if 'special' in package.tags:
-            categorize('special', package)
+            categorize('special', package, output_stream)
             continue
         if 'devfocus' in package.tags:
-            categorize('devfocus', package)
+            categorize('devfocus', package, output_stream)
             continue
         if 'hg-import' in package.tags:
-            categorize('hg', package)
+            categorize('hg', package, output_stream)
             continue
         try:
             package_branch_url = 'lp:ubuntu/%s' % (package.name,)
@@ -162,57 +162,61 @@
             if str(e).find('in ubuntu has no default branch') > -1:
                 output_stream.write('  %s has no default branch\n'
                                     % (package_branch_url,))
-                categorize('unregistered', package)
+                categorize('unregistered', package, output_stream)
             else:
                 output_stream.write('  %s\n' % (e,))
-                categorize('broken', package)
+                categorize('broken', package, output_stream)
         published_source = archive.getPublishedSources(
             source_name=package.name, status='Published')[0]
         source_package_version = published_source.source_package_version
         if source_package_version not in tags:
-            categorize('missing_soyuz', package)
+            categorize('missing_soyuz', package, output_stream)
         else:
-            categorize('ok', package)
+            categorize('ok', package, output_stream)
         output_stream.write(fmt_str % (
             package_branch_url, age.days, source_package_version))
         source_package = published_source.distro_series.getSourcePackage(name=package.name)
         if source_package.productseries is None:
-            categorize('missing_upstream_link', package)
+            categorize('missing_upstream_link', package, output_stream)
             continue
         source_branch = source_package.productseries.branch
         if source_branch is None:
-            categorize('missing_upstream_branch', package)
+            categorize('missing_upstream_branch', package, output_stream)
             continue
         package.upstream_branch_url = source_branch.bzr_identity
         try:
             age, _ = get_branch_age_and_tags(package.upstream_branch_url,
                                              tags=False)
-            output_stream.write(fmt_str
-                                % (package.upstream_branch_url, age.days, ''))
-            if age.days < opts.stale_days:
-                categorize('ok_upstream', package)
+            upstream_days = age.days
+            if upstream_days < opts.stale_days:
+                upstream_status = 'ok_upstream'
+                categorize('ok_upstream', package, output_stream)
             else:
-                categorize('stale_upstream', package)
+                upstream_status = 'stale'
+                categorize('stale_upstream', package, output_stream)
         except errors.BzrError, e:
+            upstream_days = -1
             if "No such project" in str(e):
-                categorize('missing_project', package)
+                categorize('missing_project', package, output_stream)
+                upstream_status = 'no project'
                 output_stream.write('  %s has no project\n'
                                     % (package.upstream_branch_url,))
             elif 'has no default branch' in str(e):
-                categorize('no_default_upstream_branch', package)
+                categorize('no_default_upstream_branch', package, output_stream)
+                upstream_status = 'no branch'
                 output_stream.write('  %s has no default branch\n'
                                     % (package.upstream_branch_url,))
             else:
-                categorize('broken_upstream', package)
+                categorize('broken_upstream', package, output_stream)
                 output_stream.write('  %s\n' % (e,))
         else:
-            if source_branch.last_mirror_attempt is not None:
+            if source_branch.branch_type == 'Mirrored':
                 import_age = datetime.datetime.now() - source_branch.last_mirror_attempt.replace(tzinfo=None)
                 if import_age.days > 1:
-                    categorize('outdated_imports', package)
-                    output_stream.write('  import for %s is outdated, last successful import was %d days ago \n'
-                                        % (package.name,
-                                           import_age.days))
+                    categorize('outdated_imports', package, output_stream)
+                    upstream_status = 'outdated import (%d days)' % (import_age.days,)
+            output_stream.write(fmt_str % (package.upstream_branch_url,
+                upstream_days, upstream_status))
 
     summarize_categories()