Merge lp:~dpm/lp-get-ul10nstats/distro-support into lp:lp-get-ul10nstats

[David Planella]

As per RT #74952, added distro support for specifying a distro (e.g. 'ubuntu' or 'ubuntu-rtm') and a series (e.g. 'utopic' or '14.09')

This required https://code.launchpad.net/~cjwatson/launchpad/ul10nstats-security-distribution/+merge/248257 to be deployed first, which has now already happened.

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~dpm/lp-get-ul10nstats/distro-support]

21. By David Planella on 2015-02-02

Fixed issue with 'missing FROM-clause entry for table distribution'

22. By David Planella on 2015-02-02

Fixed missing + operator

23. By David Planella on 2015-02-02

Removed unused imports

24. By David Planella on 2015-02-02

Added compatibility code to allow the script to run with the old cron job

[David Planella (dpm)]

I believe I've addressed all the comments pointed in the review, thanks!

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~dpm/lp-get-ul10nstats/distro-support]

25. By David Planella on 2015-02-02

Fixed typo in help message

26. By David Planella on 2015-02-02

Added back, 'join distroseries', had removed it erroneously

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lp-get-ul10nstats.py'
--- lp-get-ul10nstats.py	2011-06-09 10:03:44 +0000
+++ lp-get-ul10nstats.py	2015-02-02 14:14:57 +0000
@@ -26,9 +26,7 @@
 import subprocess
 import json
 import gzip
-import csv
 import errno
-from tempfile import TemporaryFile
 import psycopg2
 import datetime
 
@@ -66,11 +64,13 @@
   from potemplate
   join sourcepackagename on sourcepackagename=sourcepackagename.id
   join distroseries on distroseries=distroseries.id
+  join distribution on distroseries.distribution=distribution.id
   join pofile on pofile.potemplate=potemplate.id
   join language on pofile.language=language.id
   where
     (potemplate.iscurrent or sourcepackagename.name='openoffice.org') and
-    distroseries.name='{0}'
+    distribution.name='{0}' and
+    distroseries.name='{1}'
   order by language.code,
            sourcepackagename.name,
            potemplate.translation_domain,
@@ -89,8 +89,10 @@
   from potemplate
   join sourcepackagename on sourcepackagename=sourcepackagename.id
   join distroseries on distroseries=distroseries.id
+  join distribution on distroseries.distribution=distribution.id
   where
-    distroseries.name='{0}'
+    distribution.name='{0}' and
+    distroseries.name='{1}'
   order by sourcepackagename.name,
            potemplate.name;'''
 
@@ -131,15 +133,16 @@
     '''
 
     def __init__(self, query, query_id, hostname, database, user, port,
-                 distro_codename, private_path, public_path = None,
+                 distribution, distroseries, private_path, public_path = None,
                  public_server_user = None, ssh_key_path = None):
-        self.query = query.format(distro_codename)
+        self.query = query.format(distribution, distroseries)
         self.query_id = query_id
         self.hostname = hostname
         self.database = database
         self.user = user
         self.port = port
-        self.distro_codename = distro_codename
+        self.distribution = distribution
+        self.distroseries = distroseries
         self.private_path = private_path
         self.public_path = public_path
         self.public_server_user = public_server_user
@@ -204,7 +207,7 @@
         Builds and returns the full name of the output file, given its
         format
         '''
-        return(self.distro_codename + '-' + self.query_id + '.' + format)
+        return(self.distribution + '_' + self.distroseries + '_' + self.query_id + '.' + format)
 
     def __postprocess_result(self, results, description, format):
         '''
@@ -276,7 +279,7 @@
 
     usage = (
 '''
-%prog [options] distro_codename
+%prog [options] distribution distroseries
 
 Execute PostgreSQL queries to obtain a raw database dump in text files in
 both csv and json formats, containing statistics about translation coverage
@@ -292,12 +295,12 @@
 --  Run the script having set all the defaults for options and specifying
     natty as the distro to get the data from:
 
-    ./lp-get-ul10nstats.py natty
+    ./lp-get-ul10nstats.py ubuntu natty
 
 --  Run the script against a local launchpad instance for testing purposes,
     obtaining natty data:
 
-    ./lp-get-ul10nstats.py -n localhost -d launchpad_dev natty
+    ./lp-get-ul10nstats.py -n localhost -d launchpad_dev ubuntu natty
 '''
         )
     parser = optparse.OptionParser(usage = usage)
@@ -347,15 +350,19 @@
                         )
     (options, args) = parser.parse_args()
 
-    if not args or len(args) > 1:
+    if not args or len(args) > 2:
         logging.error(
             "You've either specified no arguments or too many of them.\n" +
-            "You need to specify at least (and at most) a distro " +
-            "codename (e.g. natty)")
+            "You need to specify a distro if different from 'ubuntu' " +
+            "and at least a series (e.g. ubuntu trusty)")
         parser.print_help()
         sys.exit(1)
-
-    distro_codename = args[0]
+    elif len(args) == 2:
+        distribution = args[0]
+        distroseries = args[1]
+    elif len(args) == 1:
+        distribution = "ubuntu"
+        distroseries = args[0]
 
     # Set the verbosity
     logging_format = '%(asctime)s %(levelname)s %(message)s'
@@ -374,7 +381,8 @@
                                    options.database,
                                    options.user,
                                    options.port,
-                                   distro_codename,
+                                   distribution,
+                                   distroseries,
                                    options.private_path,
                                    options.public_path,
                                    options.public_server_user,