winfreed.py: factor out a get_pkg() function

[winfreed.git] / winfreed.py

diff --git a/winfreed.py b/winfreed.py
index 370caff..108b719 100755 (executable)
--- a/winfreed.py
+++ b/winfreed.py
@@ -32,19 +32,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
@@ -60,12 +69,12 @@ def download(pkg):
     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()))
+        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')