X-Git-Url: https://git.ao2.it/winfreed.git/blobdiff_plain/a038a000a90d424d600b62966c9f89fb08ebe495..HEAD:/winfreed.py?ds=sidebyside diff --git a/winfreed.py b/winfreed.py index 99eabb7..d520b1e 100755 --- 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 +# Copyright (C) 2011-2014 Antonio Ospite # # 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 . -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,25 +61,37 @@ 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: + hdr = { + 'User-Agent': 'Wget/1.13.4 (linux-gnu)', + } + request = urllib2.Request(src_url, headers=hdr) + response = urllib2.urlopen(request) + except Exception, e: + print 'Downloading from', src_url, 'failed.', e + 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)) @@ -92,7 +106,9 @@ def download_file(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) @@ -102,6 +118,8 @@ def download_file(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) @@ -117,13 +135,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) @@ -153,7 +168,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: