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

Compare books: Fix error when previously different files become identical after beautifying

Browse Source
This commit is contained in:
Kovid Goyal 2014-02-01 07:35:15 +05:30
parent 2d96b9a835
commit 42b8155440
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/tweak_book/diff/view.py
View File

@ -656,6 +656,13 @@ class DiffSplit(QSplitter): # {{{
right_text = unicodedata.normalize('NFC', right_text) right_text = unicodedata.normalize('NFC', right_text)
if beautify and syntax in {'xml', 'html', 'css'}: if beautify and syntax in {'xml', 'html', 'css'}:
left_text, right_text = beautify_text(left_text, syntax), beautify_text(right_text, syntax) left_text, right_text = beautify_text(left_text, syntax), beautify_text(right_text, syntax)
if len(left_text) == len(right_text) and left_text == right_text:
for v in (self.left, self.right):
c = v.textCursor()
c.movePosition(c.End)
c.insertText('[%s]\n\n' % _('The files are identical after beautifying'))
return
left_lines = self.left_lines = left_text.splitlines() left_lines = self.left_lines = left_text.splitlines()
right_lines = self.right_lines = right_text.splitlines() right_lines = self.right_lines = right_text.splitlines()