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

Properly cache image resources

Browse Source 
Also use a unique name per image placement
This commit is contained in:
Kovid Goyal 2023-09-06 12:00:07 +05:30
parent 5082280c0e
commit d540c6db88
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,11 @@ from lxml import html
from qt.core import ( from qt.core import (
QAction, QApplication, QBrush, QByteArray, QCheckBox, QColor, QColorDialog, QDialog, QAction, QApplication, QBrush, QByteArray, QCheckBox, QColor, QColorDialog, QDialog,
QDialogButtonBox, QFont, QFontInfo, QFontMetrics, QFormLayout, QHBoxLayout, QIcon, QDialogButtonBox, QFont, QFontInfo, QFontMetrics, QFormLayout, QHBoxLayout, QIcon,
QKeySequence, QLabel, QLineEdit, QMenu, QPalette, QPlainTextEdit, QPushButton, QKeySequence, QLabel, QLineEdit, QMenu, QPalette, QPlainTextEdit, QPointF,
QSize, QSyntaxHighlighter, Qt, QTabWidget, QTextBlockFormat, QTextCharFormat, QPushButton, QSize, QSyntaxHighlighter, Qt, QTabWidget, QTextBlockFormat,
QTextCursor, QTextEdit, QTextFormat, QTextFrameFormat, QTextListFormat, QTimer, QTextCharFormat, QTextCursor, QTextDocument, QTextEdit, QTextFormat,
QToolButton, QUrl, QVBoxLayout, QWidget, pyqtSignal, pyqtSlot, QPointF, QTextDocument QTextFrameFormat, QTextListFormat, QTimer, QToolButton, QUrl, QVBoxLayout, QWidget,
pyqtSignal, pyqtSlot,
) )
from calibre import xml_replace_entities from calibre import xml_replace_entities

23
src/calibre/gui2/dialogs/edit_category_notes.py
View File

@ -5,7 +5,7 @@ import os
from qt.core import ( from qt.core import (
QButtonGroup, QByteArray, QDialog, QFormLayout, QHBoxLayout, QIcon, QLabel, QButtonGroup, QByteArray, QDialog, QFormLayout, QHBoxLayout, QIcon, QLabel,
QLineEdit, QPixmap, QPushButton, QRadioButton, QSize, Qt, QTextFrameFormat, QLineEdit, QPixmap, QPushButton, QRadioButton, QSize, Qt, QTextFrameFormat,
QTextImageFormat, QVBoxLayout, QWidget, pyqtSlot, QTextImageFormat, QVBoxLayout, QWidget, pyqtSlot, QTextDocument,
) )
from typing import NamedTuple from typing import NamedTuple
@ -14,6 +14,7 @@ from calibre.gui2 import Application, choose_images, error_dialog
from calibre.gui2.comments_editor import Editor, EditorWidget from calibre.gui2.comments_editor import Editor, EditorWidget
from calibre.gui2.widgets import ImageView from calibre.gui2.widgets import ImageView
from calibre.gui2.widgets2 import Dialog from calibre.gui2.widgets2 import Dialog
from calibre.utils.short_uuid import uuid4
IMAGE_EXTENSIONS = 'png', 'jpeg', 'jpg', 'gif', 'svg', 'webp' IMAGE_EXTENSIONS = 'png', 'jpeg', 'jpg', 'gif', 'svg', 'webp'
@ -175,18 +176,23 @@ class NoteEditorWidget(EditorWidget):
@pyqtSlot(int, 'QUrl', result='QVariant') @pyqtSlot(int, 'QUrl', result='QVariant')
def loadResource(self, rtype, qurl): def loadResource(self, rtype, qurl):
if self.db is None or self.images is None: if self.db is None or self.images is None or qurl.scheme() != RESOURCE_URL_SCHEME or int(rtype) != int(QTextDocument.ResourceType.ImageResource):
return
if qurl.scheme() != RESOURCE_URL_SCHEME:
return return
alg = qurl.host()
digest = qurl.path()[1:] digest = qurl.path()[1:]
digest = f'{alg}:{digest}'
ir = self.images.get(digest) ir = self.images.get(digest)
ans = None
if ir is not None: if ir is not None:
if ir.data: if ir.data:
return QByteArray(ir.data) ans = ir.data
if ir.path: elif ir.path:
with open(ir.path, 'rb') as f: with open(ir.path, 'rb') as f:
return QByteArray(f.read()) ans = f.read()
if ans is not None:
r = QByteArray(ans)
self.document().addResource(rtype, qurl, r) # cache the resource
return r
def get_html_callback(self, root): def get_html_callback(self, root):
self.searchable_text = '' self.searchable_text = ''
@ -207,7 +213,8 @@ class NoteEditorWidget(EditorWidget):
self.focus_self() self.focus_self()
c = self.textCursor() c = self.textCursor()
fmt = QTextImageFormat() fmt = QTextImageFormat()
fmt.setName(RESOURCE_URL_SCHEME + ':///' + ir.digest) alg, digest = ir.digest.split(':', 1)
fmt.setName(RESOURCE_URL_SCHEME + f'://{alg}/{digest}?placement={uuid4()}')
c.insertImage(fmt, d.image_layout) c.insertImage(fmt, d.image_layout)