X-Git-Url: https://git.ao2.it/winfreed.git/blobdiff_plain/1d965dd5d6ad87a1a668668f6200ebef0962996d..7b480f7a232dfa08c40ec67991734fb45b2657ce:/winfreed.py?ds=sidebyside

diff --git a/winfreed.py b/winfreed.py
index 108b719..94524e1 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 <http://www.gnu.org/licenses/>.
 
+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,24 +55,37 @@ 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:
-        url = pkg['URL'] % LANGCODE
+        pkg_url = pkg['URL'] % LANGCODE
     except:
-        url = pkg['URL']
+        pkg_url = pkg['URL']
         pass
 
-    response = urllib2.urlopen(url)
-    filename = urllib2.unquote(os.path.basename(response.geturl()))
+    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 == "":
-        sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package_name'], filename, response.geturl()))
+        filename = urllib2.unquote(os.path.basename(response.geturl()))
+
+    if filename == "":
+        sys.stderr.write("Debug (%s): filename: %s url: %s\n" % (pkg['package_name'], filename, url))
         return
 
     destfile = os.path.join(OUTPUT_DIR, filename)
@@ -97,15 +113,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 <COMMAND>\n\n" % sys.argv[0]
@@ -127,5 +146,5 @@ if __name__ == "__main__":
     else:
         usage()
         sys.exit(1)
-    
+
     sys.exit(0)