projects
/
winfreed.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
winfreed.py: support downloading a single package
[winfreed.git]
/
winfreed.py
diff --git
a/winfreed.py
b/winfreed.py
index
e7f186e
..
b2d7ac1
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
@@
-27,6
+27,9
@@
from progressbar import Bar, ETA, FileTransferSpeed, Percentage, ProgressBar
OUTPUT_DIR = 'downloads'
LANGCODE = 'en-US'
OUTPUT_DIR = 'downloads'
LANGCODE = 'en-US'
+# One of i386 or x64
+ARCHITECTURE = 'x64'
+
PKG_DIR = 'pkgs'
CHUNK_SIZE = 8192
PKG_DIR = 'pkgs'
CHUNK_SIZE = 8192
@@
-46,7
+49,7
@@
def get_pkg(pkg_file):
def process_all(path, cb):
def process_all(path, cb):
- listing =
glob.glob(os.path.join(path, '*.ini'
))
+ listing =
sorted(glob.glob(os.path.join(path, '*.ini')
))
for pkg_file in listing:
pkg = get_pkg(pkg_file)
if not pkg:
for pkg_file in listing:
pkg = get_pkg(pkg_file)
if not pkg:
@@
-68,10
+71,13
@@
def download_file(src_url, dest_dir):
try:
response = urllib2.urlopen(src_url)
except Exception, e:
try:
response = urllib2.urlopen(src_url)
except Exception, e:
+ print 'Downloading from', src_url, 'failed.',
if hasattr(e, 'reason'):
if hasattr(e, 'reason'):
- print '
Downloading from', src_url, 'failed.
Reason: ', e.reason
+ print 'Reason: ', e.reason
elif hasattr(e, 'code'):
elif hasattr(e, 'code'):
- print 'Downloading from', src_url, 'failed. Error code: ', e.code
+ print 'Error code: ', e.code
+ else:
+ print e
return
# get the final URL after possible redirect have been followed
return
# get the final URL after possible redirect have been followed
@@
-102,7
+108,9
@@
def download_file(src_url, dest_dir):
sys.stderr.write("Warning: %s exists!\n" % destfile)
return
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)
total_size = response.info().getheader('Content-Length').strip()
total_size = int(total_size)
@@
-112,6
+120,8
@@
def download_file(src_url, dest_dir):
' ', ETA(), ' ', FileTransferSpeed()]
pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
' ', 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)
bytes_so_far = 0
while 1:
chunk = response.read(CHUNK_SIZE)
@@
-127,7
+137,10
@@
def download_file(src_url, dest_dir):
def download(pkg):
def download(pkg):
- pkg_url = pkg['url']
+ try:
+ pkg_url = pkg['url_' + ARCHITECTURE]
+ except KeyError:
+ pkg_url = pkg['url']
download_file(pkg_url, OUTPUT_DIR)
download_file(pkg_url, OUTPUT_DIR)
@@
-157,7
+170,11
@@
if __name__ == "__main__":
sys.exit(1)
if sys.argv[1] == 'download':
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:
elif sys.argv[1] == 'show':
show_all()
else: