From 1d965dd5d6ad87a1a668668f6200ebef0962996d Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Sat, 26 Nov 2011 12:52:02 +0100 Subject: [PATCH] winfreed.py: factor out a get_pkg() function --- winfreed.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/winfreed.py b/winfreed.py index f4596b6..108b719 100755 --- a/winfreed.py +++ b/winfreed.py @@ -32,16 +32,25 @@ 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_name'] = 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_name'] -- 2.1.4