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

Book details panel: Fix HTML comment tags in the comments breaking display of book details. Fixes #2000881 [Description Format Breaking Book View Display](https://bugs.launchpad.net/calibre/+bug/2000881)

Browse Source 
Apparently QTextBrowser flakes out when it sees comments.
This commit is contained in:
Kovid Goyal 2023-01-04 14:06:02 +05:30
parent ed930aaf87
commit 9473599b28
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/book_details.py
View File

@ -5,7 +5,7 @@
import os import os
import re import re
from collections import namedtuple from collections import namedtuple
from functools import partial from functools import partial, lru_cache
from qt.core import ( from qt.core import (
QAction, QApplication, QClipboard, QColor, QDialog, QEasingCurve, QIcon, QAction, QApplication, QClipboard, QColor, QDialog, QEasingCurve, QIcon,
QKeySequence, QMenu, QMimeData, QPainter, QPen, QPixmap, QSplitter, QKeySequence, QMenu, QMimeData, QPainter, QPen, QPixmap, QSplitter,
@ -197,6 +197,11 @@ def init_find_in_grouped_search(menu, field, value, book_info):
'{}:"={}"'.format(g, value.replace('"', r'\"')), '')) '{}:"={}"'.format(g, value.replace('"', r'\"')), ''))
@lru_cache(maxsize=2)
def comments_pat():
return re.compile(r'<!--.*?-->', re.DOTALL)
def render_html(mi, vertical, widget, all_fields=False, render_data_func=None, pref_name='book_display_fields'): # {{{ def render_html(mi, vertical, widget, all_fields=False, render_data_func=None, pref_name='book_display_fields'): # {{{
from calibre.gui2.ui import get_gui from calibre.gui2.ui import get_gui
func = render_data_func or partial(render_data, func = render_data_func or partial(render_data,
@ -227,6 +232,8 @@ def render_html(mi, vertical, widget, all_fields=False, render_data_func=None, p
comments = '' comments = ''
if comment_fields: if comment_fields:
comments = '\n'.join('<div>%s</div>' % x for x in comment_fields) comments = '\n'.join('<div>%s</div>' % x for x in comment_fields)
# Comments cause issues with rendering in QTextBrowser
comments = comments_pat().sub('', comments)
right_pane = comments right_pane = comments
if vertical: if vertical: