From 9f747c4acad4315a6ac5535713e58a09362fa4ab Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 3 Mar 2014 20:17:26 +0530 Subject: [PATCH] cdiff : handle original_* files --- src/calibre/gui2/tweak_book/diff/main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/calibre/gui2/tweak_book/diff/main.py b/src/calibre/gui2/tweak_book/diff/main.py index 33fd25a293..9069ae905e 100644 --- a/src/calibre/gui2/tweak_book/diff/main.py +++ b/src/calibre/gui2/tweak_book/diff/main.py @@ -442,6 +442,10 @@ def main(args=sys.argv): from calibre.gui2 import Application left, right = sys.argv[-2:] ext1, ext2 = left.rpartition('.')[-1].lower(), right.rpartition('.')[-1].lower() + if ext1.startswith('original_'): + ext1 = ext1.partition('_')[-1] + if ext2.startswith('original_'): + ext2 = ext2.partition('_')[-2] if os.path.isdir(left): attr = 'dir_diff' elif (ext1, ext2) in {('epub', 'epub'), ('azw3', 'azw3')}: