Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

cdiff: Fix no msg being displayed for identical files

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-03 20:15:32 +05:30
parent 576c9b3476
commit d203e9cd3a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/tweak_book/diff/main.py
View File

@ -126,7 +126,8 @@ def file_diff(left, right):
raw1, raw2 = open(left, 'rb').read(), open(right, 'rb').read() raw1, raw2 = open(left, 'rb').read(), open(right, 'rb').read()
cache = Cache() cache = Cache()
cache.set_left(left, raw1), cache.set_right(right, raw2) cache.set_left(left, raw1), cache.set_right(right, raw2)
return cache, {left:syntax1, right:syntax2}, {left:right}, {}, set(), set() changed_names = {} if raw1 == raw2 else {left:right}
return cache, {left:syntax1, right:syntax2}, changed_names, {}, set(), set()
def dir_diff(left, right): def dir_diff(left, right):
ldata, rdata, lsmap, rsmap = {}, {}, {}, {} ldata, rdata, lsmap, rsmap = {}, {}, {}, {}
@ -438,6 +439,7 @@ def compare_books(path1, path2, revert_msg=None, revert_callback=None, parent=No
d.break_cycles() d.break_cycles()
def main(args=sys.argv): def main(args=sys.argv):
from calibre.gui2 import Application
left, right = sys.argv[-2:] left, right = sys.argv[-2:]
ext1, ext2 = left.rpartition('.')[-1].lower(), right.rpartition('.')[-1].lower() ext1, ext2 = left.rpartition('.')[-1].lower(), right.rpartition('.')[-1].lower()
if os.path.isdir(left): if os.path.isdir(left):
@ -446,11 +448,12 @@ def main(args=sys.argv):
attr = 'ebook_diff' attr = 'ebook_diff'
else: else:
attr = 'file_diff' attr = 'file_diff'
app = QApplication([]) app = Application([]) # noqa
d = Diff(show_as_window=True) d = Diff(show_as_window=True)
d.show() func = getattr(d, attr)
getattr(d, attr)(left, right) QTimer.singleShot(0, lambda : func(left, right))
return app.exec_() d.exec_()
return 0
if __name__ == '__main__': if __name__ == '__main__':
main() main()