winfreed.py: differentiate between pkg_url and actual url

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index c465b63..94524e1 100755 (executable)
--- 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/>.
 
 # 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
 import os
 import sys
 import glob


@@ -32,43 +33,72 @@ LANGCODE = 'en-US'
 PKG_DIR = 'pkgs'
 CHUNK_SIZE = 8192
 
 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:
 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:
-            entry = json.load(f)
-            basename = os.path.basename(json_file)
-            package_name = os.path.splitext(basename)[0]
-            entry['package'] = package_name
-            cb(entry)
-            f.close()
-
-def show(entry):
-    print 'Package:  ', entry['package']
-    print 'Program:  ', entry['name']
-    print 'Homepage: ', entry['homepage']
+        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_name']
+    print 'Program:  ', pkg['name']
+    print 'Homepage: ', pkg['homepage']

     print
 
     print
 

-def download(entry):
+
+def download(pkg):

     # the "%s" in URLs are meant to be replaced with LANGCODE
     try:
     # the "%s" in URLs are meant to be replaced with LANGCODE
     try:

-        url = entry['URL'] % LANGCODE
+        pkg_url = pkg['URL'] % LANGCODE

     except:
     except:

-        url = entry['URL']
+        pkg_url = pkg['URL']

         pass
 
         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 == "":
+        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)
     if os.path.exists(destfile):
     destfile = os.path.join(OUTPUT_DIR, filename)
     if os.path.exists(destfile):

-        sys.stderr.write("Warning: %s exists!\n" % destfile)
+        sys.stderr.write("Warning (%s): %s exists!\n" % (pkg['package_name'], destfile))

         return
         return

+

     outfile = open(destfile, mode='w')
 
     total_size = response.info().getheader('Content-Length').strip()
     total_size = int(total_size)
 
     outfile = open(destfile, mode='w')
 
     total_size = response.info().getheader('Content-Length').strip()
     total_size = int(total_size)
 

-    widgets = [entry['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'),
+    widgets = [pkg['name'], ' ', Percentage(), ' ', Bar(marker='=', left='[', right=']'),

                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 
                ' ', ETA(), ' ', FileTransferSpeed()]
     pbar = ProgressBar(widgets=widgets, maxval=total_size).start()
 


@@ -83,15 +113,18 @@ def download(entry):
         pbar.update(bytes_so_far)
     pbar.finish()
 
         pbar.update(bytes_so_far)
     pbar.finish()
 

+

 def show_all():
     process_all(PKG_DIR, show)
 
 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 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]
 def usage():
     usage = "winfreed - download a selection of Free Software for MS Windows.\n\n"
     usage += "usage: %s <COMMAND>\n\n" % sys.argv[0]


@@ -113,5 +146,5 @@ if __name__ == "__main__":
     else:
         usage()
         sys.exit(1)
     else:
         usage()
         sys.exit(1)

-    
+

     sys.exit(0)
     sys.exit(0)