Use INI format instead of JSON for packages

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index 99eabb7..362911a 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -17,11 +17,10 @@
 # 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
 
@@ -34,10 +33,12 @@ 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 +48,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 = 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)
 
@@ -63,21 +64,30 @@ def show(pkg):
     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:
+        if hasattr(e, 'reason'):
+            print 'Download failed. Reason: ', e.reason
+        elif hasattr(e, 'code'):
+            print 'Download failed. Error code: ', e.code
+        return
+
+    # get the final URL after possible redirect have been followed
     url = response.geturl()
 
     filename = ""
 
     # From http://paste.pound-python.org/show/9545/
     # TODO: use a proper module to parse HTTP headers
-    if response.info().has_key('Content-Disposition') and len(response.info()['Content-Disposition'].split('filename=')) > 1:
+    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'))
+        filename = urllib2.unquote(url.split('/')[-1].decode('utf_8'))
 
     if filename == "":
         sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, url))
@@ -117,13 +127,7 @@ 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']
     download_file(pkg_url, OUTPUT_DIR)