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

Make loading of notes resources in HTMLDisplay opt-in

Browse Source 
HTMLDisplay is a generic class so its not appropriate for it
to try to load notes resources everywhere.
This commit is contained in:
Kovid Goyal 2023-09-14 15:27:17 +05:30
parent 2856922aeb
commit e6e5f0fe9f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,14 +8,16 @@ from collections import namedtuple
from contextlib import suppress from contextlib import suppress
from functools import lru_cache, partial from functools import lru_cache, partial
from qt.core import ( from qt.core import (
QAction, QApplication, QClipboard, QColor, QDialog, QEasingCurve, QIcon, QPalette, QAction, QApplication, QClipboard, QColor, QDialog, QEasingCurve, QIcon,
QKeySequence, QMenu, QMimeData, QPainter, QPen, QPixmap, QPropertyAnimation, QRect, QKeySequence, QMenu, QMimeData, QPainter, QPalette, QPen, QPixmap,
QSize, QSizePolicy, QSplitter, Qt, QTimer, QUrl, QWidget, pyqtProperty, pyqtSignal, QPropertyAnimation, QRect, QSize, QSizePolicy, QSplitter, Qt, QTimer, QUrl, QWidget,
pyqtProperty, pyqtSignal,
) )
from calibre import fit_image, sanitize_file_name from calibre import fit_image, sanitize_file_name
from calibre.constants import config_dir, iswindows from calibre.constants import config_dir, iswindows
from calibre.db.constants import DATA_DIR_NAME, DATA_FILE_PATTERN from calibre.db.constants import DATA_DIR_NAME, DATA_FILE_PATTERN
from calibre.db.notes.connect import RESOURCE_URL_SCHEME
from calibre.ebooks import BOOK_EXTENSIONS from calibre.ebooks import BOOK_EXTENSIONS
from calibre.ebooks.metadata.book.base import Metadata, field_metadata from calibre.ebooks.metadata.book.base import Metadata, field_metadata
from calibre.ebooks.metadata.book.render import mi_to_html from calibre.ebooks.metadata.book.render import mi_to_html
@ -898,6 +900,7 @@ class BookInfo(HTMLDisplay):
edit_book = pyqtSignal(int, object) edit_book = pyqtSignal(int, object)
edit_identifiers = pyqtSignal() edit_identifiers = pyqtSignal()
find_in_tag_browser = pyqtSignal(object, object) find_in_tag_browser = pyqtSignal(object, object)
notes_resource_scheme = RESOURCE_URL_SCHEME
def __init__(self, vertical, parent=None): def __init__(self, vertical, parent=None):
HTMLDisplay.__init__(self, parent) HTMLDisplay.__init__(self, parent)

6
src/calibre/gui2/dialogs/book_info.py
View File

@ -2,9 +2,8 @@
# License: GPLv3 Copyright: 2008, Kovid Goyal <kovid at kovidgoyal.net> # License: GPLv3 Copyright: 2008, Kovid Goyal <kovid at kovidgoyal.net>
from enum import IntEnum
import textwrap import textwrap
from enum import IntEnum
from qt.core import ( from qt.core import (
QAction, QApplication, QBrush, QCheckBox, QDialog, QDialogButtonBox, QGridLayout, QAction, QApplication, QBrush, QCheckBox, QDialog, QDialogButtonBox, QGridLayout,
QHBoxLayout, QIcon, QKeySequence, QLabel, QListView, QModelIndex, QPalette, QPixmap, QHBoxLayout, QIcon, QKeySequence, QLabel, QListView, QModelIndex, QPalette, QPixmap,
@ -13,6 +12,7 @@ from qt.core import (
) )
from calibre import fit_image from calibre import fit_image
from calibre.db.notes.connect import RESOURCE_URL_SCHEME
from calibre.gui2 import NO_URL_FORMATTING, gprefs from calibre.gui2 import NO_URL_FORMATTING, gprefs
from calibre.gui2.book_details import ( from calibre.gui2.book_details import (
create_open_cover_with_menu, resolved_css, details_context_menu_event, render_html, set_html, create_open_cover_with_menu, resolved_css, details_context_menu_event, render_html, set_html,
@ -119,6 +119,8 @@ class Configure(Dialog):
class Details(HTMLDisplay): class Details(HTMLDisplay):
notes_resource_scheme = RESOURCE_URL_SCHEME
def __init__(self, book_info, parent=None, allow_context_menu=True, is_locked=False): def __init__(self, book_info, parent=None, allow_context_menu=True, is_locked=False):
HTMLDisplay.__init__(self, parent) HTMLDisplay.__init__(self, parent)
self.book_info = book_info self.book_info = book_info

8
src/calibre/gui2/widgets2.py
View File

@ -9,12 +9,11 @@ from qt.core import (
QFontInfo, QFontMetrics, QFrame, QIcon, QKeySequence, QLabel, QLayout, QMenu, QFontInfo, QFontMetrics, QFrame, QIcon, QKeySequence, QLabel, QLayout, QMenu,
QMimeData, QPainter, QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea, QMimeData, QPainter, QPalette, QPixmap, QPoint, QPushButton, QRect, QScrollArea,
QSize, QSizePolicy, QStyle, QStyledItemDelegate, QStyleOptionToolButton, QSize, QSizePolicy, QStyle, QStyledItemDelegate, QStyleOptionToolButton,
QStylePainter, Qt, QTabWidget, QTextBrowser, QTextDocument, QTextCursor, QTimer, QToolButton, QStylePainter, Qt, QTabWidget, QTextBrowser, QTextCursor, QTextDocument, QTimer,
QUndoCommand, QUndoStack, QUrl, QWidget, pyqtSignal, QToolButton, QUndoCommand, QUndoStack, QUrl, QWidget, pyqtSignal,
) )
from calibre import prepare_string_for_xml from calibre import prepare_string_for_xml
from calibre.db.notes.connect import RESOURCE_URL_SCHEME
from calibre.constants import builtin_colors_dark, builtin_colors_light from calibre.constants import builtin_colors_dark, builtin_colors_light
from calibre.ebooks.metadata import rating_to_stars from calibre.ebooks.metadata import rating_to_stars
from calibre.gui2 import UNDEFINED_QDATETIME, gprefs, rating_font from calibre.gui2 import UNDEFINED_QDATETIME, gprefs, rating_font
@ -519,6 +518,7 @@ class Separator(QWidget): # {{{
class HTMLDisplay(QTextBrowser): class HTMLDisplay(QTextBrowser):
anchor_clicked = pyqtSignal(object) anchor_clicked = pyqtSignal(object)
notes_resource_scheme = '' # set to scheme to use to load resources for notes from the current db
def __init__(self, parent=None): def __init__(self, parent=None):
QTextBrowser.__init__(self, parent) QTextBrowser.__init__(self, parent)
@ -590,7 +590,7 @@ class HTMLDisplay(QTextBrowser):
return QByteArray(data) return QByteArray(data)
elif qurl.scheme() == 'calibre-icon': elif qurl.scheme() == 'calibre-icon':
return QIcon.icon_as_png(qurl.path().lstrip('/'), as_bytearray=True) return QIcon.icon_as_png(qurl.path().lstrip('/'), as_bytearray=True)
elif qurl.scheme() == RESOURCE_URL_SCHEME and int(rtype) == int(QTextDocument.ResourceType.ImageResource): elif self.notes_resource_scheme and qurl.scheme() == self.notes_resource_scheme and int(rtype) == int(QTextDocument.ResourceType.ImageResource):
from calibre.gui2.ui import get_gui from calibre.gui2.ui import get_gui
gui = get_gui() gui = get_gui()
if gui is not None: if gui is not None: