Merge lp:~niedbalski/uvtool/trunk into lp:~uvtool-dev/uvtool/trunk

[Jorge Niedbalski]

Added the --progress ( -p ) option to the uvt-simplestreams-libvirt sync command

Displays:

Downloading com.ubuntu.cloud:server:14.04:amd64:20140416.1 ==> 0% ETA: 0:43:58 95.68 kB/s

Unmerged revisions

93. By Jorge Niedbalski on 2014-05-08

- Added the --progress ( -p ) option to the uvt-simplestreams-libvirt sync command

=== modified file 'debian/control'
--- debian/control	2014-02-19 14:10:50 +0000
+++ debian/control	2014-05-08 18:34:56 +0000
@@ -9,6 +9,7 @@
                python-mock,
                python-libvirt,
                python-lxml,
+               python-progressbar,
                python-pyinotify,
                python-simplestreams,
                python-yaml
@@ -32,6 +33,7 @@
          python-libvirt,
          python-simplestreams,
          python-lxml,
+         python-progressbar,
          python-pyinotify,
          python-yaml,
          distro-info,
 
=== modified file 'uvtool/libvirt/__init__.py'
--- uvtool/libvirt/__init__.py	2014-01-23 17:21:41 +0000
+++ uvtool/libvirt/__init__.py	2014-05-08 18:34:56 +0000
@@ -27,9 +27,12 @@
 import tempfile
 
 import libvirt
+
 from lxml import etree
 from lxml.builder import E
 
+from uvtool.utils import copy_progress
+
 LIBVIRT_DNSMASQ_LEASE_FILE = '/var/lib/libvirt/dnsmasq/default.leases'
 
 
@@ -42,14 +45,18 @@
 
 
 def create_volume_from_fobj(new_volume_name, fobj, image_type='raw',
-        pool_name='default'):
+                            pool_name='default', **extras):
     """Create a new libvirt volume and populate it from a file-like object."""
 
     compressed_fobj = tempfile.NamedTemporaryFile()
     decompressed_fobj = tempfile.NamedTemporaryFile()
-    with contextlib.closing(compressed_fobj):
+    with contextlib.closing(compressed_fobj) as compressed:
         with contextlib.closing(decompressed_fobj):
-            shutil.copyfileobj(fobj, compressed_fobj)
+            if extras.get('progress', False):
+                copy_progress(fobj, compressed, **extras)
+            else:
+                shutil.copyfileobj(fobj, compressed_fobj)
+
             compressed_fobj.flush()
             compressed_fobj.seek(0)  # is this necessary?
             subprocess.check_call(
@@ -69,7 +76,7 @@
 
 
 def _create_volume_from_fobj_with_size(new_volume_name, fobj, fobj_size,
-        image_type, pool_name):
+                                       image_type, pool_name):
     conn = libvirt.open('qemu:///system')
     pool = get_libvirt_pool_object(conn, pool_name)
 
 
=== modified file 'uvtool/libvirt/simplestreams.py'
--- uvtool/libvirt/simplestreams.py	2014-02-19 21:45:13 +0000
+++ uvtool/libvirt/simplestreams.py	2014-05-08 18:34:56 +0000
@@ -204,13 +204,15 @@
     query = LibvirtQuery(simplestreams.filters.get_filters(filter_args))
     query.sync_products(None, src=_load_products())
     return (_encode_libvirt_pool_name(product_name, version_name)
-        for product_name, version_name in query.result)
+            for product_name, version_name in query.result)
+
 
 class LibvirtMirror(simplestreams.mirrors.BasicMirrorWriter):
-    def __init__(self, filters, verbose=False):
+    def __init__(self, filters, verbose=False, progress=False):
         super(LibvirtMirror, self).__init__({'max_items': 1})
         self.filters = filters
         self.verbose = verbose
+        self.progress = progress
 
     def load_products(self, path=None, content_id=None):
         return _load_products(path=path, content_id=content_id, clean=True)
@@ -233,11 +235,13 @@
                 encoded_libvirt_name, pool_name=LIBVIRT_POOL_NAME):
             uvtool.libvirt.create_volume_from_fobj(
                 encoded_libvirt_name, contentsource, image_type='qcow2',
-                pool_name=LIBVIRT_POOL_NAME
+                pool_name=LIBVIRT_POOL_NAME,
+                product_name=product_name,
+                version_name=version_name,
+                progress=self.progress)
+            pool_metadata[encoded_libvirt_name] = (
+                simplestreams.util.products_exdata(src, pedigree)
             )
-        pool_metadata[encoded_libvirt_name] = (
-            simplestreams.util.products_exdata(src, pedigree)
-        )
 
     def remove_version(self, data, src, target, pedigree):
         product_name, version_name = pedigree
@@ -265,7 +269,8 @@
     filter_list = simplestreams.filters.get_filters(
         ['datatype=image-downloads', 'ftype=disk1.img'] + args.filters
     )
-    tmirror = LibvirtMirror(filter_list, verbose=args.verbose)
+    tmirror = LibvirtMirror(filter_list, verbose=args.verbose,
+                            progress=args.progress)
     tmirror.sync(smirror, initial_path)
     clean_extraneous_images()
 
@@ -295,6 +300,10 @@
         ['dpkg', '--print-architecture']).decode().strip()
     parser = argparse.ArgumentParser()
     parser.add_argument('--verbose', '-v', action='store_true')
+    parser.add_argument('--progress', '-p',
+                        help="Show the image download progress",
+                        action='store_true')
+
     subparsers = parser.add_subparsers()
 
     sync_subparser = subparsers.add_parser('sync')
@@ -309,7 +318,7 @@
         default='/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'
     )
     sync_subparser.add_argument('--source', dest='mirror_url',
-        default='https://cloud-images.ubuntu.com/releases/')
+                    default='https://cloud-images.ubuntu.com/releases/')
     sync_subparser.add_argument('--no-authentication', action='store_true')
     sync_subparser.add_argument('filters', nargs='*', metavar='filter',
         default=["arch=%s" % system_arch])
 
=== added file 'uvtool/utils.py'
--- uvtool/utils.py	1970-01-01 00:00:00 +0000
+++ uvtool/utils.py	2014-05-08 18:34:56 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
+DEFAULT_CHUNK_SIZE = 1024
+
+from progressbar import (
+    Percentage,
+    ETA,
+    FileTransferSpeed,
+    ProgressBar)
+
+
+def copy_progress(to_download, destination, **extras):
+    (version_name, product_name) = (extras.get('version_name', ''),
+                                    extras.get('product_name', 'Ubuntu'))
+
+    widgets = ['Downloading %s:%s ==>' % (product_name, version_name),
+               Percentage(), ' ',
+               ' ', ETA(), ' ', FileTransferSpeed()]
+
+    to_download.open()
+    pbar = ProgressBar(widgets=widgets, maxval=to_download.fd.size).start()
+
+    readed = 0
+    for chunk in to_download.read_iterable(size=DEFAULT_CHUNK_SIZE):
+        readed += DEFAULT_CHUNK_SIZE
+        pbar.update(readed)
+        destination.write(chunk)
+    pbar.finish()