From dfe30a0d0f036ed563765b5f7f34457a02f3f151 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Sun, 10 Apr 2011 04:01:14 -0400 Subject: [PATCH] now checks for optimize-img programs with '.exe' as well as no suffix fix for issue #314 --- optimizeimages.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/optimizeimages.py b/optimizeimages.py index 6fe8b78..b3daff7 100644 --- a/optimizeimages.py +++ b/optimizeimages.py @@ -23,11 +23,14 @@ advdef = "advdef" def check_programs(level): path = os.environ.get("PATH").split(os.pathsep) - + + def exists_in_path(prog): + result = filter(lambda x: os.path.exists(os.path.join(x, prog)), path) + return len(result) != 0 + for prog,l in [(pngcrush,1), (optipng,2), (advdef,2)]: if l <= level: - result = filter(lambda x: os.path.exists(os.path.join(x, prog)), path) - if len(result) == 0: + if (not exists_in_path(prog)) or (not exists_in_path(prog + ".exe")): raise Exception("Optimization prog %s for level %d not found!" % (prog, l)) def optimize_image(imgpath, imgformat, optimizeimg):