fix: prewarm and reuse WebEngine reader

This commit is contained in:
2026-09-21 17:12:16 +08:00
parent a097ce8f4b
commit 76f9588787
5 changed files with 128 additions and 28 deletions
+2
View File
@@ -93,6 +93,8 @@ MDHelper/
当前阅读模式中,正文在 `QWebEngineView` 内滚动。左侧 `QTabWidget` 在文件目录与当前文档大纲间切换;大纲仅在点击时跳转,不随滚动选中标题。状态栏不显示阅读进度。 当前阅读模式中,正文在 `QWebEngineView` 内滚动。左侧 `QTabWidget` 在文件目录与当前文档大纲间切换;大纲仅在点击时跳转,不随滚动选中标题。状态栏不显示阅读进度。
主窗口首先显示轻量 Qt 欢迎页,随后由单次定时器在后台创建并加载隐藏的 `QWebEngineView`。首次打开文档时复用预热实例,并在欢迎页仍存在时完成标签替换,阅读区不会短暂变为空白。关闭全部阅读标签后会保留一个隐藏阅读器,避免同一进程内再次承担 Chromium 冷启动成本。
## 6. 当前渲染流程 ## 6. 当前渲染流程
```text ```text
+2 -1
View File
@@ -131,7 +131,8 @@ MDHelper 是一个本地 Markdown / 代码文档阅读器,使用 PySide6 构
## 启动优化 ## 启动优化
- 使用目录式程序和安装包,Qt、Pandoc 等资源只在安装时解压一次。 - 使用目录式程序和安装包,Qt、Pandoc 等资源只在安装时解压一次。
- 欢迎页使用普通 Qt 控件;打开文档时才创建浏览器页面。 - 欢迎页使用普通 Qt 控件;主窗口显示后在后台预热一个常驻浏览器页面,首次打开文档时直接复用,避免窗口闪烁。
- 关闭全部文档后保留一个隐藏阅读器供后续复用;Windows 渲染后端由 Qt WebEngine 自动选择。
- 先显示主窗口,后台扫描初始目录;去掉读取设置前的重复扫描和打开初始文件时的重复扫描。 - 先显示主窗口,后台扫描初始目录;去掉读取设置前的重复扫描和打开初始文件时的重复扫描。
- 普通文档不加载公式、图表运行库;公式与图表按页面内容分别加载。 - 普通文档不加载公式、图表运行库;公式与图表按页面内容分别加载。
- 缓存阅读样式、脚本和高亮样式;仅在使用 PDF 页码解析时加载相关依赖。 - 缓存阅读样式、脚本和高亮样式;仅在使用 PDF 页码解析时加载相关依赖。
+92 -25
View File
@@ -104,6 +104,7 @@ EXTERNAL_APPLICATIONS_SETTING_KEY = "external_apps/by_extension"
EDITOR_DRAFTS_SETTING_KEY = "editor/drafts" EDITOR_DRAFTS_SETTING_KEY = "editor/drafts"
LAST_PROJECT_ROOT_SETTING_KEY = "project/last_root" LAST_PROJECT_ROOT_SETTING_KEY = "project/last_root"
DIRECTORY_POLL_INTERVAL_MS = 1000 DIRECTORY_POLL_INTERVAL_MS = 1000
READER_PREWARM_DELAY_MS = 350
CUSTOM_DOCUMENT_STYLES_SETTING_KEY = "reader/custom_document_styles" CUSTOM_DOCUMENT_STYLES_SETTING_KEY = "reader/custom_document_styles"
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
THEME_COLOR_VALUES = {"white", "black", "dark_gray", "colorful"} THEME_COLOR_VALUES = {"white", "black", "dark_gray", "colorful"}
@@ -586,6 +587,12 @@ class MainWindow(QMainWindow):
self.scroll_capture_timer.setInterval(1500) self.scroll_capture_timer.setInterval(1500)
self.scroll_capture_timer.timeout.connect(self._save_current_scroll_position) self.scroll_capture_timer.timeout.connect(self._save_current_scroll_position)
self.reader_prewarm_timer = QTimer(self)
self.reader_prewarm_timer.setSingleShot(True)
self.reader_prewarm_timer.setInterval(READER_PREWARM_DELAY_MS)
self.reader_prewarm_timer.timeout.connect(self._prewarm_reader_view)
self._standby_reader_view: ReaderView | None = None
self._load_preferences() self._load_preferences()
if self.has_project and not defer_startup: if self.has_project and not defer_startup:
self.entries = discover_documents(self.project_root, self.document_file_groups) self.entries = discover_documents(self.project_root, self.document_file_groups)
@@ -1135,6 +1142,56 @@ class MainWindow(QMainWindow):
web_view.loadFinished.connect(self._on_load_finished) web_view.loadFinished.connect(self._on_load_finished)
return web_view return web_view
def _prewarm_reader_view(self) -> None:
if self._standby_reader_view is not None:
return
if any(isinstance(self.tabs.widget(index), ReaderView) for index in range(self.tabs.count())):
return
started = time.perf_counter()
web_view = self._create_reader_view()
web_view.setProperty("is_reader_standby", True)
web_view.hide()
self._standby_reader_view = web_view
def prewarm_finished(ok: bool) -> None:
try:
web_view.loadFinished.disconnect(prewarm_finished)
except (RuntimeError, TypeError):
pass
LOGGER.info("Reader prewarm finished in %.3f s (ok=%s)", time.perf_counter() - started, ok)
web_view.loadFinished.connect(prewarm_finished)
web_view.setHtml("<!doctype html><html><body></body></html>", QUrl("about:blank"))
LOGGER.debug("Reader prewarm requested")
def _take_standby_reader_view(self) -> ReaderView:
web_view = self._standby_reader_view
if web_view is None:
web_view = self._create_reader_view()
else:
self._standby_reader_view = None
web_view.setProperty("is_reader_standby", False)
return web_view
def _release_tab_widget(self, widget: QWidget | None) -> None:
if widget is None:
return
if isinstance(widget, VideoPlayerWidget):
widget.stop()
if isinstance(widget, ReaderView) and self._standby_reader_view is None:
widget.stop()
widget.navigation_history = NavigationHistory()
widget.setProperty("current_file", None)
widget.setProperty("current_fragment", "")
widget.setProperty("is_reader_standby", True)
widget.hide()
widget.setParent(None)
self._standby_reader_view = widget
widget.setHtml("<!doctype html><html><body></body></html>", QUrl("about:blank"))
return
widget.deleteLater()
def _apply_wheel_scroll_speed_to_tabs(self) -> None: def _apply_wheel_scroll_speed_to_tabs(self) -> None:
for index in range(self.tabs.count()): for index in range(self.tabs.count()):
widget = self.tabs.widget(index) widget = self.tabs.widget(index)
@@ -1142,23 +1199,33 @@ class MainWindow(QMainWindow):
widget.set_wheel_scroll_speed(self.wheel_scroll_speed) widget.set_wheel_scroll_speed(self.wheel_scroll_speed)
def _prepare_target_tab(self, new_tab: bool, title: str) -> ReaderView: def _prepare_target_tab(self, new_tab: bool, title: str) -> ReaderView:
self._close_welcome_tab()
if new_tab:
web_view = self._create_reader_view()
index = self.tabs.addTab(web_view, title)
self.tabs.setCurrentIndex(index)
self.web_view = web_view
return web_view
current = self.tabs.currentWidget() current = self.tabs.currentWidget()
if isinstance(current, ReaderView): if not new_tab and isinstance(current, ReaderView):
self.web_view = current self.web_view = current
return current return current
self.web_view = self._create_reader_view() web_view = self._take_standby_reader_view()
index = self.tabs.addTab(self.web_view, title) welcome_index = self._welcome_tab_index()
self.tabs.setCurrentIndex(index) if welcome_index >= 0:
return self.web_view welcome_widget = self.tabs.widget(welcome_index)
self.tabs.setUpdatesEnabled(False)
try:
index = self.tabs.insertTab(welcome_index, web_view, title)
self.tabs.setCurrentIndex(index)
shifted_welcome_index = self.tabs.indexOf(welcome_widget)
if shifted_welcome_index >= 0:
self.tabs.removeTab(shifted_welcome_index)
if welcome_widget is not None:
welcome_widget.deleteLater()
finally:
self.tabs.setUpdatesEnabled(True)
self.tabs.update()
else:
index = self.tabs.addTab(web_view, title)
self.tabs.setCurrentIndex(index)
self.web_view = web_view
return web_view
def _prepare_video_tab(self, path: Path, new_tab: bool) -> VideoPlayerWidget: def _prepare_video_tab(self, path: Path, new_tab: bool) -> VideoPlayerWidget:
self._close_welcome_tab() self._close_welcome_tab()
@@ -1953,11 +2020,8 @@ class MainWindow(QMainWindow):
for index in target_indexes: for index in target_indexes:
widget = self.tabs.widget(index) widget = self.tabs.widget(index)
if isinstance(widget, VideoPlayerWidget):
widget.stop()
self.tabs.removeTab(index) self.tabs.removeTab(index)
if widget is not None: self._release_tab_widget(widget)
widget.deleteLater()
if show_welcome: if show_welcome:
self._ensure_welcome_if_empty() self._ensure_welcome_if_empty()
@@ -2012,11 +2076,8 @@ class MainWindow(QMainWindow):
for index in range(self.tabs.count() - 1, -1, -1): for index in range(self.tabs.count() - 1, -1, -1):
widget = self.tabs.widget(index) widget = self.tabs.widget(index)
if isinstance(widget, VideoPlayerWidget):
widget.stop()
self.tabs.removeTab(index) self.tabs.removeTab(index)
if widget is not None: self._release_tab_widget(widget)
widget.deleteLater()
self.current_file = None self.current_file = None
self.current_fragment = "" self.current_fragment = ""
@@ -2032,11 +2093,8 @@ class MainWindow(QMainWindow):
widget = self.tabs.widget(index) widget = self.tabs.widget(index)
if isinstance(widget, RichMarkdownEditorDialog) and not widget.confirm_close(): if isinstance(widget, RichMarkdownEditorDialog) and not widget.confirm_close():
return return
if isinstance(widget, VideoPlayerWidget):
widget.stop()
self.tabs.removeTab(index) self.tabs.removeTab(index)
if widget is not None: self._release_tab_widget(widget)
widget.deleteLater()
self._ensure_welcome_if_empty() self._ensure_welcome_if_empty()
def _render_local_file_page(self, path: Path) -> str: def _render_local_file_page(self, path: Path) -> str:
@@ -5449,6 +5507,13 @@ class MainWindow(QMainWindow):
def closeEvent(self, event: QCloseEvent) -> None: def closeEvent(self, event: QCloseEvent) -> None:
self._startup_generation += 1 self._startup_generation += 1
self._startup_scan_pending = False self._startup_scan_pending = False
self.reader_prewarm_timer.stop()
standby_reader = self._standby_reader_view
self._standby_reader_view = None
if standby_reader is not None:
standby_reader.stop()
standby_reader.close()
standby_reader.deleteLater()
self._save_current_scroll_position() self._save_current_scroll_position()
self._save_preferences() self._save_preferences()
super().closeEvent(event) super().closeEvent(event)
@@ -5456,4 +5521,6 @@ class MainWindow(QMainWindow):
def showEvent(self, event: QShowEvent) -> None: def showEvent(self, event: QShowEvent) -> None:
super().showEvent(event) super().showEvent(event)
QTimer.singleShot(0, self._apply_navigation_style) QTimer.singleShot(0, self._apply_navigation_style)
if not self.reader_prewarm_timer.isActive() and self._standby_reader_view is None:
self.reader_prewarm_timer.start()
+1 -1
View File
@@ -5,7 +5,7 @@ import os
os.environ.setdefault( os.environ.setdefault(
"QTWEBENGINE_CHROMIUM_FLAGS", "QTWEBENGINE_CHROMIUM_FLAGS",
"--disable-gpu --disable-gpu-compositing --disable-software-rasterizer --log-level=3", "--log-level=3",
) )
os.environ.setdefault( os.environ.setdefault(
"QT_LOGGING_RULES", "QT_LOGGING_RULES",
+31 -1
View File
@@ -8,7 +8,7 @@ import time
from pathlib import Path from pathlib import Path
import pytest import pytest
from PySide6.QtCore import QSettings, QThreadPool from PySide6.QtCore import QSettings, QThreadPool, Signal
from PySide6.QtWidgets import QApplication, QTextBrowser from PySide6.QtWidgets import QApplication, QTextBrowser
from mdhelper import main_window, startup_scan from mdhelper import main_window, startup_scan
@@ -45,6 +45,36 @@ def test_welcome_does_not_create_browser_process(gui, tmp_path, monkeypatch):
window.close() window.close()
def test_prewarmed_reader_replaces_welcome_without_empty_tab(gui, tmp_path, monkeypatch):
class StandbyReader(QTextBrowser):
loadFinished = Signal(bool)
def setHtml(self, html, _base_url=None):
super().setHtml(html)
self.loadFinished.emit(True)
window = main_window.MainWindow(None, app_root=tmp_path)
standby = StandbyReader()
standby.navigation_history = None
tab_counts: list[int] = []
try:
monkeypatch.setattr(window, "_create_reader_view", lambda: standby)
window._prewarm_reader_view()
assert window._standby_reader_view is standby
window.tabs.currentChanged.connect(lambda _index: tab_counts.append(window.tabs.count()))
target = window._prepare_target_tab(False, "Guide")
assert target is standby
assert window._standby_reader_view is None
assert window._welcome_tab_index() == -1
assert window.tabs.count() == 1
assert window.tabs.currentWidget() is standby
assert all(count > 0 for count in tab_counts)
finally:
window.close()
def test_directory_scan_does_not_block_first_window(gui, tmp_path, monkeypatch): def test_directory_scan_does_not_block_first_window(gui, tmp_path, monkeypatch):
(tmp_path / "guide.md").write_text("# Guide\n", encoding="utf-8") (tmp_path / "guide.md").write_text("# Guide\n", encoding="utf-8")
entered, release = threading.Event(), threading.Event() entered, release = threading.Event(), threading.Event()