From ca2abaa6136b90b6c3adff3cb75358a56ba40416 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Fri, 9 Sep 2011 22:44:16 +0200
Subject: [PATCH] * ubuntutools.archive:   - Add quiet option to silence
 downloading.   - Use wget-style progress bar (fixed width) (LP: #845787)

---
 debian/changelog       |  3 +++
 ubuntutools/archive.py | 52 +++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e9368f..844e4f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ ubuntu-dev-tools (0.131) UNRELEASED; urgency=low
     past illegal version numbers (LP: #727314)
   * ubuntutools.update_maintainer: Don't use strict changelog parsing
     (LP: #806633)
+  * ubuntutools.archive:
+    - Add quiet option to silence downloading.
+    - Use wget-style progress bar (fixed width) (LP: #845787)
 
   [ Colin Watson ]
   * syncpackage: Fix typo.
diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py
index 51e7c64..aa00f88 100644
--- a/ubuntutools/archive.py
+++ b/ubuntutools/archive.py
@@ -128,7 +128,7 @@ class SourcePackage(object):
     distribution = None
 
     def __init__(self, package=None, version=None, component=None,
-                 dscfile=None, lp=None, mirrors=(), workdir='.'):
+                 dscfile=None, lp=None, mirrors=(), workdir='.', quiet=False):
         "Can be initialised either using package, version or dscfile"
         assert ((package is not None and version is not None)
                 or dscfile is not None)
@@ -136,6 +136,7 @@ class SourcePackage(object):
         self.source = package
         self._lp = lp
         self.workdir = workdir
+        self.quiet = quiet
 
         # Cached values:
         self._component = component
@@ -305,43 +306,46 @@ class SourcePackage(object):
 
     def _download_file(self, url, filename):
         "Download url to filename in workdir."
-        logurl = url
-        if os.path.basename(url) != filename:
-            logurl += ' -> ' + filename
         pathname = os.path.join(self.workdir, filename)
-        if self.dsc:
-            if self.dsc.verify_file(pathname):
-                Logger.debug('Using existing %s', filename)
-                return True
-            size = [entry['size'] for entry in self.dsc['Files']
-                    if entry['name'] == filename]
-            assert len(size) == 1
-            size = int(size[0])
-            Logger.normal('Downloading %s (%0.3f MiB)', logurl,
-                          size / 1024.0 / 1024)
-        else:
-            Logger.normal('Downloading %s', logurl)
+        if self.dsc.verify_file(pathname):
+            Logger.debug('Using existing %s', filename)
+            return True
+        size = [entry['size'] for entry in self.dsc['Files']
+                if entry['name'] == filename]
+        assert len(size) == 1
+        size = int(size[0])
+        host = urlparse.urlparse(url).hostname
+        if not self.quiet:
+            Logger.normal('Downloading %s from %s (%0.3f MiB)',
+                          filename, host, size / 1024.0 / 1024)
 
         try:
             in_ = urllib2.build_opener().open(url)
         except urllib2.URLError:
             return False
 
+        downloaded = 0
+        bar_width = 60
         with open(pathname, 'wb') as out:
             while True:
                 block = in_.read(10240)
                 if block == '':
                     break
+                downloaded += len(block)
                 out.write(block)
-                Logger.stdout.write('.')
-                Logger.stdout.flush()
+                if not self.quiet:
+                    percent = downloaded * 100 // size
+                    bar = '=' * int(round(downloaded * bar_width / size))
+                    bar = (bar + '>' + ' ' * bar_width)[:bar_width]
+                    Logger.stdout.write('[%s] %#3i%%\r' % (bar, percent))
+                    Logger.stdout.flush()
         in_.close()
-        Logger.stdout.write(' done\n')
-        Logger.stdout.flush()
-        if self.dsc:
-            if not self.dsc.verify_file(pathname):
-                Logger.error('Checksum does not match.')
-                return False
+        if not self.quiet:
+            Logger.stdout.write(' ' * (bar_width + 7) + '\r')
+            Logger.stdout.flush()
+        if not self.dsc.verify_file(pathname):
+            Logger.error('Checksum for %s does not match.', filename)
+            return False
         return True
 
     def pull(self):