From 6e0fd656b3ad3ee1b8b1cbc7330db504b4e7b256 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Sat, 26 Nov 2011 12:42:10 +0100 Subject: [PATCH 1/1] winfreed.py: rename 'entry' to 'pkg' --- winfreed.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/winfreed.py b/winfreed.py index b9da36e..370caff 100755 --- a/winfreed.py +++ b/winfreed.py @@ -36,36 +36,36 @@ def process_all(path, cb): listing = glob.glob(os.path.join(path, '*.json')) for json_file in listing: with open(json_file, mode='r') as f: - entry = json.load(f) + pkg = json.load(f) basename = os.path.basename(json_file) package_name = os.path.splitext(basename)[0] - entry['package'] = package_name - cb(entry) + pkg['package'] = package_name + cb(pkg) f.close() -def show(entry): - print 'Package: ', entry['package'] - print 'Program: ', entry['name'] - print 'Homepage: ', entry['homepage'] +def show(pkg): + print 'Package: ', pkg['package'] + print 'Program: ', pkg['name'] + print 'Homepage: ', pkg['homepage'] print -def download(entry): +def download(pkg): # the "%s" in URLs are meant to be replaced with LANGCODE try: - url = entry['URL'] % LANGCODE + url = pkg['URL'] % LANGCODE except: - url = entry['URL'] + url = pkg['URL'] pass response = urllib2.urlopen(url) filename = urllib2.unquote(os.path.basename(response.geturl())) if filename == "": - sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(entry['package'], filename, response.geturl())) + sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package'], filename, response.geturl())) return destfile = os.path.join(OUTPUT_DIR, filename) if os.path.exists(destfile): - sys.stderr.write("Warning (%s): %s exists!\n" % (entry['package'], destfile)) + sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package'], destfile)) return outfile = open(destfile, mode='w') @@ -73,7 +73,7 @@ def download(entry): total_size = response.info().getheader('Content-Length').strip() total_size = int(total_size) - widgets = [entry['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'), + widgets = [pkg['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'), ' ', ETA(), ' ', FileTransferSpeed()] pbar = ProgressBar(widgets=widgets, maxval=total_size).start() -- 2.1.4