X-Git-Url: https://git.ao2.it/winfreed.git/blobdiff_plain/1d965dd5d6ad87a1a668668f6200ebef0962996d..2a0ec06af9f57de11d830a077c0fd37080a25d32:/winfreed.py?ds=sidebyside
diff --git a/winfreed.py b/winfreed.py
index 108b719..a1639c3 100755
--- a/winfreed.py
+++ b/winfreed.py
@@ -17,6 +17,7 @@
# 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
@@ -32,6 +33,7 @@ LANGCODE = 'en-US'
PKG_DIR = 'pkgs'
CHUNK_SIZE = 8192
+
def get_pkg(json_file):
with open(json_file, mode='r') as f:
pkg = json.load(f)
@@ -43,6 +45,7 @@ def get_pkg(json_file):
return None
+
def process_all(path, cb):
listing = glob.glob(os.path.join(path, '*.json'))
for json_file in listing:
@@ -52,12 +55,14 @@ def process_all(path, cb):
continue
cb(pkg)
+
def show(pkg):
print 'Package: ', pkg['package_name']
print 'Program: ', pkg['name']
print 'Homepage: ', pkg['homepage']
print
+
def download(pkg):
# the "%s" in URLs are meant to be replaced with LANGCODE
try:
@@ -67,7 +72,17 @@ def download(pkg):
pass
response = urllib2.urlopen(url)
- filename = urllib2.unquote(os.path.basename(response.geturl()))
+
+ filename = ""
+ if 'Content-Disposition' in response.info():
+ # Use the filename the server tells us if any,
+ # re pattern from http://stackoverflow.com/questions/8035900
+ content_disposition = response.info().getheader('Content-Disposition').strip()
+ filename = re.findall("filename=(\S+)", content_disposition)[0]
+
+ if filename == "":
+ filename = urllib2.unquote(os.path.basename(response.geturl()))
+
if filename == "":
sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package_name'], filename, response.geturl()))
return
@@ -97,15 +112,18 @@ def download(pkg):
pbar.update(bytes_so_far)
pbar.finish()
+
def show_all():
process_all(PKG_DIR, show)
+
def download_all():
if os.path.exists(OUTPUT_DIR) == False:
os.mkdir(OUTPUT_DIR, 0755)
process_all(PKG_DIR, download)
+
def usage():
usage = "winfreed - download a selection of Free Software for MS Windows.\n\n"
usage += "usage: %s \n\n" % sys.argv[0]