%(html_title)s

' for idx, ((left_no, left_line), (right_no, right_line), change) in enumerate(self.diffs): # print idx, ((left_no, left_line),(right_no, right_line),change) try: if self.isLeft: if change: if isinstance(left_no, int) and isinstance(right_no, int) and left_no <= len(source): i, t = source[left_no - 1] t = '' + t + "" elif isinstance(left_no, int) and not isinstance(right_no, int) and left_no <= len(source): i, t = source[left_no - 1] t = '' + t + "" elif not isinstance(left_no, int) and isinstance(right_no, int): i, t = 1, left_line t = '' + t + "" else: raise else: if left_no <= len(source): i, t = source[left_no - 1] else: i = 1 t = left_line else: if change: if isinstance(left_no, int) and isinstance(right_no, int) and right_no <= len(source): i, t = source[right_no - 1] t = '' + t + "" elif isinstance(left_no, int) and not isinstance(right_no, int): i, t = 1, right_line t = '' + t + "" elif not isinstance(left_no, int) and isinstance(right_no, int) and right_no <= len(source): i, t = source[right_no - 1] t = '' + t + "" else: raise else: if right_no <= len(source): i, t = source[right_no - 1] else: i = 1 t = right_line yield i, t except: # print "WARNING! failed to enumerate diffs fully!" pass # this is expected sometimes yield 0, '\n

here: since the # content in the other cell also is wrapped in a div, some browsers in # some configurations seem to mess up the formatting... if nocls: yield 0, ('' % self.cssclass + '

' '

' +
                      ls + '

') else: yield 0, ('' % self.cssclass + '

' +
                      ls + '

') yield 0, dummyoutfile.getvalue() yield 0, '

' class CodeDiff(object): """ Manages a pair of source files and generates a single html diff page comparing the contents. """ pygmentsStyleOpt = "vs" pygmentsCssFile = "./deps/codeformats/%s.css" % pygmentsStyleOpt diffCssFile = "./deps/diff.css" diffJsFile = "./deps/diff.js" resetCssFile = "./deps/reset.css" jqueryJsFile = "./deps/jquery.min.js" def __init__(self, fromfile, tofile, fromtxt=None, totxt=None, name=None): self.filename = name self.fromfile = fromfile if fromtxt == None: try: with open(fromfile) as f: self.fromlines = f.readlines() except Exception as e: print("Problem reading file %s" % fromfile) print(e) sys.exit(1) else: self.fromlines = [n + "\n" for n in fromtxt.split("\n")] self.leftcode = "".join(self.fromlines) self.tofile = tofile if totxt == None: try: with open(tofile) as f: self.tolines = f.readlines() except Exception as e: print("Problem reading file %s" % tofile) print(e) sys.exit(1) else: self.tolines = [n + "\n" for n in totxt.split("\n")] self.rightcode = "".join(self.tolines) def getDiffDetails(self, fromdesc='', todesc='', context=False, numlines=5, tabSize=8): # change tabs to spaces before it gets more difficult after we insert # markkup def expand_tabs(line): # hide real spaces line = line.replace(' ', '\0') # expand tabs into spaces line = line.expandtabs(tabSize) # replace spaces from expanded tabs back into tab characters # (we'll replace them with markup after we do differencing) line = line.replace(' ', '\t') return line.replace('\0', ' ').rstrip('\n') self.fromlines = [expand_tabs(line) for line in self.fromlines] self.tolines = [expand_tabs(line) for line in self.tolines] # create diffs iterator which generates side by side from/to data if context: context_lines = numlines else: context_lines = None diffs = difflib._mdiff(self.fromlines, self.tolines, context_lines, linejunk=None, charjunk=difflib.IS_CHARACTER_JUNK) return list(diffs) def format(self, verbose=False): self.diffs = self.getDiffDetails(self.fromfile, self.tofile) if verbose: for diff in self.diffs: print("%-6s %-80s %-80s" % (diff[2], diff[0], diff[1])) fields = ((self.leftcode, True, self.fromfile), (self.rightcode, False, self.tofile)) codeContents = [] for (code, isLeft, filename) in fields: inst = DiffHtmlFormatter(isLeft, self.diffs, nobackground=False, linenos=True, style=self.pygmentsStyleOpt) try: self.lexer = guess_lexer_for_filename(self.filename, code) except pygments.util.ClassNotFound: if verbose: print("No Lexer Found! Using default...") self.lexer = DefaultLexer() formatted = pygments.highlight(code, self.lexer, inst) codeContents.append(formatted) answers = { "html_title": self.filename, "reset_css": self.resetCssFile, "pygments_css": self.pygmentsCssFile, "diff_css": self.diffCssFile, "page_title": self.filename, "original_code": codeContents[0], "modified_code": codeContents[1], "jquery_js": self.jqueryJsFile, "diff_js": self.diffJsFile, } self.htmlContents = HTML_TEMPLATE % answers def write(self, path="index.html"): fh = open(path, 'w') fh.write(self.htmlContents) fh.close() def main(fromfile, tofile, verbose=False): codeDiff = CodeDiff(fromfile, tofile, name=tofile) codeDiff.format(verbose) codeDiff.write() if __name__ == "__main__": description = """Given two source files this application\ creates an html page which highlights the differences between the two. """ parser = argparse.ArgumentParser(description=description) parser.add_argument('-v', action='store_true', help='show verbose output.') parser.add_argument( 'file1', help='source file to compare ("before" file).') parser.add_argument('file2', help='source file to compare ("after" file).') args = parser.parse_args() main(args.file1, args.file2, args.v)