winfreed.py: print also errors with no reason or code attribute

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index 1192f47..b58358c 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -2,7 +2,7 @@
 #
 # 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
@@ -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/>.
 
-import re
 import os
 import sys
 import glob
-import json
+import ConfigParser
 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'
 
-# 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
 
 
-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()
@@ -47,11 +49,11 @@ def get_pkg(json_file):
 
 
 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:
-            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)
 
@@ -59,12 +61,26 @@ def process_all(path, cb):
 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
 
 
-def download_file(url, dest_dir):
-    response = urllib2.urlopen(url)
+def download_file(src_url, dest_dir):
+    try:
+        response = urllib2.urlopen(src_url)
+    except Exception, e:
+        print 'Downloading from', src_url, 'failed.',
+        if hasattr(e, 'reason'):
+            print 'Reason: ', e.reason
+        elif hasattr(e, 'code'):
+            print 'Error code: ', e.code
+        else:
+            print e
+        return
+
+    # get the final URL after possible redirect have been followed
     url = response.geturl()
 
     filename = ""
@@ -117,13 +133,10 @@ def download_file(url, dest_dir):
 
 
 def download(pkg):
-    # the "%s" in URLs are meant to be replaced with LANGCODE
     try:
-        pkg_url = pkg['URL'] % LANGCODE
-    except:
-        pkg_url = pkg['URL']
-        pass
-
+        pkg_url = pkg['url_' + ARCHITECTURE]
+    except KeyError:
+        pkg_url = pkg['url']
     download_file(pkg_url, OUTPUT_DIR)