winfreed.py: sort packages by name before processing

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index 068480b..c49de16 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -2,7 +2,7 @@
 #
 # winfreed - download a selection of Free Software for MS Windows.
 #
 #
 # winfreed - download a selection of Free Software for MS Windows.
 #

-# Copyright (C) 2011  Antonio Ospite <ospite@studenti.unina.it>
+# Copyright (C) 2011-2014  Antonio Ospite <ao2@ao2.it>

 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -17,27 +17,29 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-import re

 import os
 import sys
 import glob
 import os
 import sys
 import glob

-import json
+import ConfigParser

 import urllib2
 from progressbar import Bar, ETA, FileTransferSpeed, Percentage, ProgressBar
 
 import urllib2
 from progressbar import Bar, ETA, FileTransferSpeed, Percentage, ProgressBar
 

-# TODO make OUTPUT_DIR and LANGCODE configurable from command line

 OUTPUT_DIR = 'downloads'
 LANGCODE = 'en-US'
 
 OUTPUT_DIR = 'downloads'
 LANGCODE = 'en-US'
 

-# TODO PKG_DIR in $(datadir) or something like that for python projects
+# One of i386 or x64
+ARCHITECTURE = 'x64'
+

 PKG_DIR = 'pkgs'
 CHUNK_SIZE = 8192
 
 
 PKG_DIR = 'pkgs'
 CHUNK_SIZE = 8192
 
 

-def get_pkg(json_file):
-    with open(json_file, mode='r') as f:
-        pkg = json.load(f)
-        basename = os.path.basename(json_file)
+def get_pkg(pkg_file):
+    config = ConfigParser.SafeConfigParser({'language': LANGCODE})
+    with open(pkg_file, mode='r') as f:
+        config.readfp(f)
+        pkg = dict(config.items('Package'))
+        basename = os.path.basename(pkg_file)

         package_name = os.path.splitext(basename)[0]
         pkg['package_name'] = package_name
         f.close()
         package_name = os.path.splitext(basename)[0]
         pkg['package_name'] = package_name
         f.close()


@@ -47,11 +49,11 @@ def get_pkg(json_file):
 
 
 def process_all(path, cb):
 
 
 def process_all(path, cb):

-    listing = glob.glob(os.path.join(path, '*.json'))
-    for json_file in listing:
-        pkg = get_pkg(json_file)
+    listing = sorted(glob.glob(os.path.join(path, '*.ini')))
+    for pkg_file in listing:
+        pkg = get_pkg(pkg_file)

         if not pkg:
         if not pkg:

-            sys.stderr.write("Error: cannot get a pkg for: %s\n" % json_file)
+            sys.stderr.write("Error: cannot get a pkg for: %s\n" % pkg_file)

             continue
         cb(pkg)
 
             continue
         cb(pkg)
 


@@ -59,37 +61,48 @@ def process_all(path, cb):
 def show(pkg):
     print 'Package:  ', pkg['package_name']
     print 'Program:  ', pkg['name']
 def show(pkg):
     print 'Package:  ', pkg['package_name']
     print 'Program:  ', pkg['name']

+    if pkg.has_key('version'):
+        print 'Version:  ', pkg['version']

     print 'Homepage: ', pkg['homepage']
     print
 
 
     print 'Homepage: ', pkg['homepage']
     print
 
 

-def download(pkg):
-    # the "%s" in URLs are meant to be replaced with LANGCODE
+def download_file(src_url, dest_dir):

     try:
     try:

-        url = pkg['URL'] % LANGCODE
-    except:
-        url = pkg['URL']
-        pass
+        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
+        return

 
 

-    response = urllib2.urlopen(url)
+    # get the final URL after possible redirect have been followed
+    url = response.geturl()

 
     filename = ""
 
     filename = ""

-    if 'Content-Disposition' in  response.info():
-        # Use the filename the server tells us if any,
-        # re pattern from http://stackoverflow.com/questions/8035900
-        content_disposition = response.info().getheader('Content-Disposition').strip()
-        filename = re.findall("filename=(\S+)", content_disposition)[0]

 
 

-    if filename == "":
-        filename = urllib2.unquote(os.path.basename(response.geturl()))
+    # From http://paste.pound-python.org/show/9545/
+    # TODO: use a proper module to parse HTTP headers
+    if 'Content-Disposition' in response.info() and len(response.info()['Content-Disposition'].split('filename=')) > 1:
+        # If the response has Content-Disposition, we take file name from it
+        filename = response.info()['Content-Disposition'].split('filename=')[1].decode('utf-8')
+        if filename[0] == '"' or filename[0] == "'":
+            filename = urllib2.unquote(filename.split('"')[1])
+    else:
+        filename = urllib2.unquote(url.split('/')[-1].decode('utf_8'))

 
     if filename == "":
 
     if filename == "":

-        sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, response.geturl()))
+        sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, url))

         return
 
         return
 

-    destfile = os.path.join(OUTPUT_DIR, filename)
+    # TODO: Add some integrity verification of downloaded files (md5, sha256?)
+
+    destfile = os.path.join(dest_dir, filename)

     if os.path.exists(destfile):
     if os.path.exists(destfile):

-        sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package_name'], destfile))
+        # TODO: check if the file is a full download from previous run,
+        # if not download again discarding the existing file?
+        sys.stderr.write("Warning: %s exists!\n" % destfile)

         return
 
     outfile = open(destfile, mode='w')
         return
 
     outfile = open(destfile, mode='w')


@@ -97,7 +110,8 @@ def download(pkg):
     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)
 

-    widgets = [pkg['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'),
+    #widgets = [pkg['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'),
+    widgets = [filename, ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'),

                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 
                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 


@@ -112,6 +126,16 @@ def download(pkg):
         pbar.update(bytes_so_far)
     pbar.finish()
 
         pbar.update(bytes_so_far)
     pbar.finish()
 

+    outfile.close()
+
+
+def download(pkg):
+    try:
+        pkg_url = pkg['url_' + ARCHITECTURE]
+    except KeyError:
+        pkg_url = pkg['url']
+    download_file(pkg_url, OUTPUT_DIR)
+

 
 def show_all():
     process_all(PKG_DIR, show)
 
 def show_all():
     process_all(PKG_DIR, show)