X-Git-Url: https://git.ao2.it/winfreed.git/blobdiff_plain/1ea5c7057193337e15eb58ef5ef4ff56a4e03d5e..81ffa4db01ae7dc3d57adf72776c89ba1ed1f6ab:/winfreed.py

diff --git a/winfreed.py b/winfreed.py
index ef96bc5..8b674c3 100755
--- a/winfreed.py
+++ b/winfreed.py
@@ -49,7 +49,7 @@ def get_pkg(pkg_file):
 
 
 def process_all(path, cb):
-    listing = glob.glob(os.path.join(path, '*.ini'))
+    listing = sorted(glob.glob(os.path.join(path, '*.ini')))
     for pkg_file in listing:
         pkg = get_pkg(pkg_file)
         if not pkg:
@@ -71,10 +71,7 @@ def download_file(src_url, dest_dir):
     try:
         response = urllib2.urlopen(src_url)
     except Exception, e:
-        if hasattr(e, 'reason'):
-            print 'Downloading from', src_url, 'failed. Reason: ', e.reason
-        elif hasattr(e, 'code'):
-            print 'Downloading from', src_url, 'failed. Error code: ', e.code
+        print 'Downloading from', src_url, 'failed.', e
         return
 
     # get the final URL after possible redirect have been followed
@@ -105,7 +102,9 @@ def download_file(src_url, dest_dir):
         sys.stderr.write("Warning: %s exists!\n" % destfile)
         return
 
-    outfile = open(destfile, mode='w')
+    if 'Content-Length' not in response.info():
+        sys.stderr.write("Cannot get the size of the file at %s\n" % src_url)
+        return
 
     total_size = response.info().getheader('Content-Length').strip()
     total_size = int(total_size)
@@ -115,6 +114,8 @@ def download_file(src_url, dest_dir):
                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 
+    outfile = open(destfile, mode='w')
+
     bytes_so_far = 0
     while 1:
         chunk = response.read(CHUNK_SIZE)
@@ -163,7 +164,11 @@ if __name__ == "__main__":
         sys.exit(1)
 
     if sys.argv[1] == 'download':
-        download_all()
+        if len(sys.argv) > 2:
+            pkg = get_pkg(sys.argv[2])
+            download(pkg)
+        else:
+            download_all()
     elif sys.argv[1] == 'show':
         show_all()
     else: