winfreed.py: rename 'entry' to 'pkg'

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index c465b63..370caff 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -36,39 +36,44 @@ 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)
+            pkg = json.load(f)
             basename = os.path.basename(json_file)
             package_name = os.path.splitext(basename)[0]
-            entry['package'] = package_name
-            cb(entry)
+            pkg['package'] = package_name
+            cb(pkg)
             f.close()
 
-def show(entry):
-    print 'Package:  ', entry['package']
-    print 'Program:  ', entry['name']
-    print 'Homepage: ', entry['homepage']
+def show(pkg):
+    print 'Package:  ', pkg['package']
+    print 'Program:  ', pkg['name']
+    print 'Homepage: ', pkg['homepage']
     print
 
-def download(entry):
+def download(pkg):
     # the "%s" in URLs are meant to be replaced with LANGCODE
     try:
-        url = entry['URL'] % LANGCODE
+        url = pkg['URL'] % LANGCODE
     except:
-        url = entry['URL']
+        url = pkg['URL']
         pass
 
     response = urllib2.urlopen(url)
     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()))
+        return
+
     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'], destfile))
         return
+
     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()