Refresh sticky plots

bin/debsources-suite-archive

@@ -23,13 +23,14 @@ import sys
 from debsources import archiver
 from debsources import debmirror
 from debsources import mainlib
+from debsources import updater
 
 
 def main():
     cmdline = argparse.ArgumentParser(description='Debsources suite '
                                       'archive manager')
     cmdline.add_argument('action', metavar='ACTION',
-                         choices=['add', 'list', 'remove'],
+                         choices=['add', 'list', 'remove', 'refresh'],
                          help='action to perform on the archive of '
                          'sticky suites')
     cmdline.add_argument('suite', metavar='SUITE', nargs='?', default=None,
@@ -39,7 +40,8 @@ def main():
     args = cmdline.parse_args()
     if args.action in ['add', 'remove'] and args.suite is None:
         cmdline.error('%s requires a suite name' % args.action)
-
+    if args.action == 'refresh' and args.stages is None:
+        cmdline.error('%s requires a stage' % args.action)
     conf = mainlib.load_conf(args.conffile or mainlib.guess_conffile())
     mainlib.override_conf(conf, args)
     mainlib.init_logging(conf, mainlib.log_level_of_verbosity(args.verbose))
@@ -62,6 +64,9 @@ def main():
                       (suite, present['db'], present['archive']))
         elif args.action == 'remove':
             archiver.remove_suite(conf, session, args.suite)
+        elif args.action == 'refresh':
+            conf['refresh'] = True
+            updater.update(conf, session, stages=conf['stages'])
         if conf['single_transaction']:
             session.commit()
     except SystemExit:  # exit as requested

contrib/docker/config.ini

@@ -13,6 +13,7 @@ sources_dir: 	 %(mirror_dir)s/pool
 python_dir:  	 %(root_dir)s/python
 mirror_dir:    	 %(root_dir)s/testdata/mirror
 pool_dir:        %(mirror_dir)s/pool
+mirror_archive_dir: %(root_dir)s/testdata/archive
 dry_run:     	 false
 # echoes or not the SQL requests to stdout (can be logged with Apache):
 sqlalchemy_echo: false

debsources/statistics.py

@@ -60,13 +60,15 @@ def suites(session, suites='release'):
     return sorted(db_suites, cmp=by_release_date)
 
 
-def sticky_suites(session):
+def sticky_suites(session, order=None):
     """list sticky suites currently present in Debsources DB
 
     """
     q = session.query(SuiteInfo.name) \
                .filter(SuiteInfo.sticky == True)  # NOQA,
     # '== True' can be dropped starting with sqlalchemy >= 0.8
+    if order:
+        q = q.order_by("release_date")
     return [row[0] for row in q]
 
 

debsources/updater.py

@@ -525,7 +525,10 @@ def update_charts(status, conf, session, suites=None):
     from debsources import charts
     logging.info('update charts...')
     ensure_stats_dir(conf)
-    suites = __target_suites(session, suites)
+    if 'refresh' in conf.keys():
+        suites = statistics.sticky_suites(session, True)
+    else:
+        suites = __target_suites(session, suites)
 
     CHARTS = [  # <period, granularity> paris
         ('1 month', 'hourly'),
@@ -560,26 +563,30 @@ def update_charts(status, conf, session, suites=None):
                 charts.sloc_plot(mseries, chart_file)
 
     # sloccount: current pie charts
-    sloc_per_suite = []
     for suite in suites + ['ALL']:
         sloc_suite = suite
         if sloc_suite == 'ALL':
             sloc_suite = None
         slocs = statistics.sloccount_summary(session, suite=sloc_suite)
-        if suite not in ['ALL']:
-            sloc_per_suite.append(slocs)
         chart_file = os.path.join(conf['cache_dir'], 'stats',
                                   '%s-sloc_pie-current.png' % suite)
         if not conf['dry_run']:
             charts.sloc_pie(slocs, chart_file)
 
     # sloccount: bar chart plot
+    all_suites = statistics.sticky_suites(session, True) \
+        + __target_suites(session, None)
+    sloc_per_suite = []
+    for suite in all_suites:
+        slocs = statistics.sloccount_summary(session, suite=suite)
+        sloc_per_suite.append(slocs)
+
     if 'charts_top_langs' in conf.keys():
         top_langs = int(conf['charts_top_langs'])
     else:
         top_langs = 6
     chart_file = os.path.join(conf['cache_dir'], 'stats', 'sloc_bar_plot.png')
-    charts.bar_chart(sloc_per_suite, suites, chart_file, top_langs)
+    charts.bar_chart(sloc_per_suite, all_suites, chart_file, top_langs)
 
 # update stages
 (STAGE_EXTRACT,

etc/config.travis.ini

@@ -13,6 +13,7 @@ sources_dir: 	 %(mirror_dir)s/pool
 python_dir:  	 %(root_dir)s/python
 mirror_dir:    	 %(root_dir)s/testdata/mirror
 pool_dir:        %(mirror_dir)s/pool
+mirror_archive_dir: %(root_dir)s/testdata/archive
 dry_run:     	 false
 # echoes or not the SQL requests to stdout (can be logged with Apache):
 sqlalchemy_echo: false