X-Git-Url: https://git.ao2.it/winfreed.git/blobdiff_plain/2a0ec06af9f57de11d830a077c0fd37080a25d32..e93cdab002a9df30cfeddd54ef036582f59af318:/winfreed.py

diff --git a/winfreed.py b/winfreed.py
index a1639c3..4b4f6bb 100755
--- a/winfreed.py
+++ b/winfreed.py
@@ -66,29 +66,36 @@ def show(pkg):
 def download(pkg):
     # the "%s" in URLs are meant to be replaced with LANGCODE
     try:
-        url = pkg['URL'] % LANGCODE
+        pkg_url = pkg['URL'] % LANGCODE
     except:
-        url = pkg['URL']
+        pkg_url = pkg['URL']
         pass
 
-    response = urllib2.urlopen(url)
+    response = urllib2.urlopen(pkg_url)
+    url = 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()))
+
+    # 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 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'))
 
     if filename == "":
-        sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package_name'], filename, response.geturl()))
+        sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, url))
         return
 
+    # TODO: Add some integrity verification of downloaded files (md5, sha256?)
+
     destfile = os.path.join(OUTPUT_DIR, filename)
     if os.path.exists(destfile):
+        # TODO: check if the file is a full download from previous run,
+        # if not download again discarding the existing file?
         sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package_name'], destfile))
         return
 
@@ -145,5 +152,5 @@ if __name__ == "__main__":
     else:
         usage()
         sys.exit(1)
-    
+
     sys.exit(0)