pkgs: update some packages

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index ef96bc5..a9af707 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -49,7 +49,7 @@ def get_pkg(pkg_file):
 
 
 def process_all(path, cb):
 
 
 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:
     for pkg_file in listing:
         pkg = get_pkg(pkg_file)
         if not pkg:


@@ -71,10 +71,13 @@ def download_file(src_url, dest_dir):
     try:
         response = urllib2.urlopen(src_url)
     except Exception, e:
     try:
         response = urllib2.urlopen(src_url)
     except Exception, e:

+        print 'Downloading from', src_url, 'failed.',

         if hasattr(e, 'reason'):
         if hasattr(e, 'reason'):

-            print 'Downloading from', src_url, 'failed. Reason: ', e.reason
+            print 'Reason: ', e.reason

         elif hasattr(e, 'code'):
         elif hasattr(e, 'code'):

-            print 'Downloading from', src_url, 'failed. Error code: ', e.code
+            print 'Error code: ', e.code
+        else:
+            print e

         return
 
     # get the final URL after possible redirect have been followed
         return
 
     # get the final URL after possible redirect have been followed


@@ -105,7 +108,9 @@ def download_file(src_url, dest_dir):
         sys.stderr.write("Warning: %s exists!\n" % destfile)
         return
 
         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)
 
     total_size = response.info().getheader('Content-Length').strip()
     total_size = int(total_size)


@@ -115,6 +120,8 @@ def download_file(src_url, dest_dir):
                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 
                ' ', 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)
     bytes_so_far = 0
     while 1:
         chunk = response.read(CHUNK_SIZE)