winfreed.py: use the file name from Content-Disposition if available
[winfreed.git] / winfreed.py
index 370caff..a53bda8 100755 (executable)
@@ -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,19 +33,28 @@ 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)
+        basename = os.path.basename(json_file)
+        package_name = os.path.splitext(basename)[0]
+        pkg['package_name'] = package_name
+        f.close()
+        return pkg
+
+    return None
+
 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:
-            pkg = json.load(f)
-            basename = os.path.basename(json_file)
-            package_name = os.path.splitext(basename)[0]
-            pkg['package'] = package_name
-            cb(pkg)
-            f.close()
+        pkg = get_pkg(json_file)
+        if not pkg:
+            sys.stderr.write("Error: cannot get a pkg for: %s\n" % json_file)
+            continue
+        cb(pkg)
 
 def show(pkg):
-    print 'Package:  ', pkg['package']
+    print 'Package:  ', pkg['package_name']
     print 'Program:  ', pkg['name']
     print 'Homepage: ', pkg['homepage']
     print
@@ -58,14 +68,24 @@ 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'], filename, response.geturl()))
+        sys.stderr.write("Debug (%s): filename: %s url: %s\n" %(pkg['package_name'], filename, response.geturl()))
         return
 
     destfile = os.path.join(OUTPUT_DIR, filename)
     if os.path.exists(destfile):
-        sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package'], destfile))
+        sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package_name'], destfile))
         return
 
     outfile = open(destfile, mode='w')