X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=scripts%2Fsnapdiff.py;h=689898512acd75ff1e23b06ce2af2f5b09352d24;hb=HEAD;hp=53d9f826579f70fcdbbdccf9f33f242e96a024f1;hpb=61840fb9f088ba86135d72db977ceb7748b41dba;p=apitrace diff --git a/scripts/snapdiff.py b/scripts/snapdiff.py index 53d9f82..6898985 100755 --- a/scripts/snapdiff.py +++ b/scripts/snapdiff.py @@ -134,7 +134,6 @@ def is_image(path): def find_images(prefix): - prefix = os.path.abspath(prefix) if os.path.isdir(prefix): prefix_dir = prefix else: @@ -155,6 +154,10 @@ def main(): optparser = optparse.OptionParser( usage="\n\t%prog [options] ") + optparser.add_option( + '-v', '--verbose', + action="store_true", dest="verbose", default=False, + help="verbose output") optparser.add_option( '-o', '--output', metavar='FILE', type="string", dest="output", default='index.html', @@ -171,6 +174,10 @@ def main(): '--overwrite', action="store_true", dest="overwrite", default=False, help="overwrite images") + optparser.add_option( + '--show-all', + action="store_true", dest="show_all", default=False, + help="show all images, including similar ones") (options, args) = optparser.parse_args(sys.argv[1:]) @@ -192,31 +199,46 @@ def main(): html.write('\n') html.write(' \n') html.write(' \n') - html.write(' \n' % (ref_prefix, src_prefix)) + html.write(' \n' % (ref_prefix, src_prefix)) + failures = 0 for image in images: ref_image = ref_prefix + image src_image = src_prefix + image root, ext = os.path.splitext(src_image) delta_image = "%s.diff.png" % (root, ) if os.path.exists(ref_image) and os.path.exists(src_image): - if options.overwrite \ - or not os.path.exists(delta_image) \ - or (os.path.getmtime(delta_image) < os.path.getmtime(ref_image) \ - and os.path.getmtime(delta_image) < os.path.getmtime(src_image)): - - comparer = Comparer(ref_image, src_image, options.alpha) - comparer.write_diff(delta_image, fuzz=options.fuzz) - + if options.verbose: + sys.stdout.write('Comparing %s and %s ...' % (ref_image, src_image)) + comparer = Comparer(ref_image, src_image, options.alpha) + match = comparer.ae(fuzz=options.fuzz) == 0 + if match: + result = 'MATCH' + bgcolor = '#20ff20' + else: + result = 'MISMATCH' + failures += 1 + bgcolor = '#ff2020' + if options.verbose: + sys.stdout.write(' %s\n' % (result,)) html.write(' \n') - surface(html, ref_image) - surface(html, src_image) - surface(html, delta_image) + html.write(' \n' % (bgcolor, ref_image, image)) + if not match or options.show_all: + if options.overwrite \ + or not os.path.exists(delta_image) \ + or (os.path.getmtime(delta_image) < os.path.getmtime(ref_image) \ + and os.path.getmtime(delta_image) < os.path.getmtime(src_image)): + comparer.write_diff(delta_image, fuzz=options.fuzz) + surface(html, ref_image) + surface(html, src_image) + surface(html, delta_image) html.write(' \n') html.flush() html.write('

%s	%s	Δ
File	%s	%s	Δ
%s

\n') html.write(' \n') html.write('\n') + if failures: + sys.exit(1) if __name__ == '__main__': main()