From a3bef339882b0351bcda2d09893df9c1e8c180fe Mon Sep 17 00:00:00 2001 From: shen Date: Thu, 5 Nov 2026 14:59:37 +0800 Subject: [PATCH] fix: restore only the directory at startup and load tabs on request --- README.md | 2 +- docs/user_manual.md | 2 +- mdhelper/main_window.py | 90 +++++++++++++++++------------------ tests/startup_smoke.py | 27 +++++++---- tests/test_workspace_state.py | 84 ++++++++++++++++++++++++++++++-- 5 files changed, 144 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 427a906..26a2546 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ MDHelper 是一个本地 Markdown / 代码文档阅读器,使用 PySide6 构 ## 项目设置与批量导出 -- 工作现场在正常退出或切换项目时保存;未保存内容仍由原有草稿恢复流程保护。指定启动文件时优先打开该文件。 +- 普通启动只恢复上次的目录,不自动打开文件或历史文档标签。工作现场在有文档打开时保存,可通过“文件 → 恢复上次打开的标签”手动恢复;未保存内容仍由原有草稿恢复流程保护。明确指定启动文件时打开该文件。 - 启用“以当前设置启用项目默认”后,字体、段落和页面修改自动保存在当前项目;未启用的项目使用全局默认。模板是独立副本,修改一个项目不会改动其他项目。 - 样式预设 JSON 包含字体、核心样式/高级 CSS 和页面设置,不包含项目路径、书签或草稿。高级 CSS 在 Word 中仍受其排版能力限制,导出前会提示不支持的效果。 - 批量导出使用当前编辑内容;分别导出时文件名带顺序编号。全部转换成功后才发布输出,目标文件在导出期间发生变化会停止替换。 diff --git a/docs/user_manual.md b/docs/user_manual.md index b1f15f4..4dbc201 100644 --- a/docs/user_manual.md +++ b/docs/user_manual.md @@ -335,7 +335,7 @@ MDHelper 会保存: # 0.4 新增工作流 -- **恢复工作现场**:正常退出后,再次打开同一文件夹会恢复标签顺序、当前文档、编辑模式和分屏状态。后台标签在点击时加载;可在“文件 → 启动时恢复工作现场”中关闭。未保存草稿仍按原有方式提示恢复。 +- **启动与历史标签**:普通启动只恢复上次打开的文件夹,不自动打开其中的文件,也不恢复文档标签。需要历史标签时,可在没有打开文档的情况下选择“文件 → 恢复上次打开的标签”,手动恢复标签顺序、当前文档、编辑模式和分屏状态;后台标签在点击时加载。只打开文件夹后退出不会清除历史标签。未保存草稿仍按原有方式提示恢复;通过文件关联或启动参数明确指定的文件仍会正常打开。 - **文档检查**:在“工具 → 检查文档链接与图片”中扫描当前项目,检查本地链接、图片和章节锚点。检查使用当前编辑内容,双击结果可定位 Markdown 编辑行或查看 HTML 源码。 - **安全重命名**:在文件树重命名时,若存在需要同步修改的引用,会显示差异预览。确认后统一保存这些修改,并更新标签、最近文件和书签。备份位于本地应用数据目录的 `MDHelper/rename-backups`。 diff --git a/mdhelper/main_window.py b/mdhelper/main_window.py index 7d0a49a..bebf0fc 100644 --- a/mdhelper/main_window.py +++ b/mdhelper/main_window.py @@ -143,7 +143,6 @@ class MainWindow(QMainWindow): self._startup_prompt = prompt_for_project self.settings = QSettings("MDHelper", "MDHelper") self.workspaces = WorkspaceStore(self.settings) - self._workspace_restored = False self._restoring_workspace = False self.configurations = ConfigurationStore(self.settings) self.documents = DocumentStore() @@ -401,10 +400,8 @@ class MainWindow(QMainWindow): file_menu.addSeparator() file_menu.addAction(self.clear_recent_action) - self.restore_workspace_action = QAction("启动时恢复工作现场", self) - self.restore_workspace_action.setCheckable(True) - self.restore_workspace_action.setChecked(self.settings.value("workspace/restore", True, type=bool)) - self.restore_workspace_action.toggled.connect(lambda enabled: self.settings.setValue("workspace/restore", enabled)) + self.restore_workspace_action = QAction("恢复上次打开的标签", self) + self.restore_workspace_action.triggered.connect(self._restore_workspace) file_menu.addAction(self.restore_workspace_action) self.exit_action = QAction("退出", self) @@ -844,19 +841,9 @@ class MainWindow(QMainWindow): LOGGER.debug("Reader prewarm requested") def prepare_reader_before_show(self, timeout_ms: int = 8000) -> None: + # Preparing a fixed reader host prevents startup flicker; it must not + # open historical documents. Tab restoration is an explicit menu action. self._prepare_reader_before_show(timeout_ms) - if not self.isVisible() and not self._workspace_restored and self._startup_initial_path is None: - self._restore_workspace() - editor = self.tabs.currentWidget() - if isinstance(editor, RichMarkdownEditorDialog) and editor.preview.page().isLoading(): - loop, deadline = QEventLoop(self), QTimer(self) - deadline.setSingleShot(True) - deadline.timeout.connect(loop.quit) - editor.preview.loadFinished.connect(loop.quit) - deadline.start(timeout_ms) - loop.exec() - deadline.stop() - editor.preview.loadFinished.disconnect(loop.quit) def _prepare_reader_before_show(self, timeout_ms: int = 8000) -> None: if self.isVisible(): @@ -1955,7 +1942,7 @@ class MainWindow(QMainWindow): if not self._close_all_tabs(show_welcome=False): return - if self.has_project: + if self.has_project and snapshot[0]: self.workspaces.save(self.project_root, *snapshot) self._save_preferences() @@ -2014,7 +2001,7 @@ class MainWindow(QMainWindow): snapshot = self._workspace_snapshot() if root_changed else None if root_changed and not self._close_all_tabs(show_welcome=False): return False - if snapshot is not None: + if snapshot is not None and snapshot[0]: self.workspaces.save(self.project_root, *snapshot) if root_changed or not self.has_project: @@ -4002,6 +3989,7 @@ class MainWindow(QMainWindow): editor.setFocus() def _update_actions(self) -> None: + self.restore_workspace_action.setEnabled(self.has_project and not self._has_open_content_tabs()) history = self._current_history() self.back_action.setEnabled(history.can_go_back) self.forward_action.setEnabled(history.can_go_forward) @@ -4450,7 +4438,9 @@ class MainWindow(QMainWindow): event.ignore() return if self.has_project and not self._restoring_workspace: - self.workspaces.save(self.project_root, *self._workspace_snapshot()) + snapshot = self._workspace_snapshot() + # Simply opening a directory must not erase its saved tab history. + if snapshot[0]: self.workspaces.save(self.project_root, *snapshot) self.exports.cancel_all() batch_dialog = getattr(self, "_batch_export_dialog", None) if batch_dialog is not None: @@ -4500,11 +4490,13 @@ class MainWindow(QMainWindow): return states, active def _restore_workspace(self) -> bool: - self._workspace_restored = True - if not self.has_project or not self.settings.value("workspace/restore", True, type=bool): + if not self.has_project: return False states, active = self.workspaces.load(self.project_root) - if not states or self._has_open_content_tabs(): + if self._has_open_content_tabs(): + return False + if not states: + self.status_label.setText("此文件夹没有可恢复的历史标签") return False seed = self.tabs.currentWidget() if not isinstance(seed, ReaderTabHost): @@ -4534,29 +4526,35 @@ class MainWindow(QMainWindow): if not path.is_file(): host.welcome_view.setPlainText(f"文件已不存在:\n{path}") return - host.workspace_state = None - if host.reader_view is None: - host.set_reader_view(self._create_reader_view()) - self._standby_reader_view = None - host.reader_view.setProperty("is_reader_standby", False) - self.current_file = path - if path.suffix.lower() in {".md", ".markdown"} or is_code_document(path): - self.open_document(path, add_history=False, scroll_y=state.scroll) - elif path.suffix.lower() in {".html", ".htm", ".xhtml"}: - self._open_webpage_file_now(path) - else: - self._open_preview_file_now(path) - if state.editing: - self.edit_current_markdown() - editor = self.tabs.currentWidget() - if isinstance(editor, RichMarkdownEditorDialog): - editor.sync_scroll_checkbox.setChecked(state.sync) - editor.view_mode_box.setCurrentIndex(editor.view_mode_box.findData(state.view)) - editor.splitter.setSizes(state.sizes) - cursor = editor.editor.textCursor() - cursor.setPosition(min(state.cursor, editor.editor.document().characterCount() - 1)) - editor.editor.setTextCursor(cursor) - QTimer.singleShot(0, editor, lambda: editor.editor.verticalScrollBar().setValue(state.source_scroll)) + # Replacing a restored reader with its editor must not activate and + # load the neighbouring background tab during the intermediate removal. + with QSignalBlocker(self.tabs): + host.workspace_state = None + if host.reader_view is None: + host.set_reader_view(self._create_reader_view()) + self._standby_reader_view = None + host.reader_view.setProperty("is_reader_standby", False) + host.begin_reader_load() + self.current_file = path + if path.suffix.lower() in {".md", ".markdown"} or is_code_document(path): + self.open_document(path, add_history=False, scroll_y=state.scroll) + elif path.suffix.lower() in {".html", ".htm", ".xhtml"}: + self._open_webpage_file_now(path) + else: + self._open_preview_file_now(path) + if state.editing: + self.edit_current_markdown() + editor = self.tabs.currentWidget() + if isinstance(editor, RichMarkdownEditorDialog): + editor.sync_scroll_checkbox.setChecked(state.sync) + editor.view_mode_box.setCurrentIndex(editor.view_mode_box.findData(state.view)) + editor.splitter.setSizes(state.sizes) + cursor = editor.editor.textCursor() + cursor.setPosition(min(state.cursor, editor.editor.document().characterCount() - 1)) + editor.editor.setTextCursor(cursor) + QTimer.singleShot(0, editor, lambda: editor.editor.verticalScrollBar().setValue(state.source_scroll)) + self._on_tab_changed(self.tabs.currentIndex()) + @property def editor_drafts(self) -> dict: diff --git a/tests/startup_smoke.py b/tests/startup_smoke.py index d7cfd4c..24698dd 100644 --- a/tests/startup_smoke.py +++ b/tests/startup_smoke.py @@ -82,12 +82,12 @@ def main(): finally: window.close() app.processEvents() - # Restore an editor and a project preset before showing the native window. + # Restore only the directory/preset, even when old settings saved an editor. from mdhelper.workspace_state import WorkspaceStore, TabState from mdhelper.project_presets import ProjectPresetStore, capture_preset from mdhelper.preferences import ReaderPreferences from mdhelper.export_settings import PageSettings - from mdhelper.markdown_editor import MarkdownEditorDialog + settings.setValue('workspace/restore', True) WorkspaceStore(settings).save(root, [TabState(str(note), editing=True)], 0) ProjectPresetStore(settings).bind(root, capture_preset('Startup preset', ReaderPreferences(document_font_size=22, font_scale=22/16), PageSettings(header='Project header'))) @@ -95,19 +95,28 @@ def main(): restored.prepare_reader_before_show() events = WindowEvents(restored) try: - editor = restored.tabs.currentWidget() - assert isinstance(editor, MarkdownEditorDialog) - parent = editor.preview.parent() + host = restored.tabs.currentWidget() + reader = host.reader_view + assert restored.current_file is None and host.property('is_welcome') + assert getattr(host,'workspace_state',None) is None + parent = reader.parent() restored.show() native_id = int(restored.winId()) settled = [] QTimer.singleShot(1500, lambda: settled.append(True)) - wait(lambda: bool(settled)) + wait(lambda: bool(settled) and not restored._startup_scan_pending) assert restored.document_font_size == 22 and restored._saved_page_settings().header == 'Project header' - assert int(restored.winId()) == native_id and restored.tabs.currentWidget() is editor - assert editor.preview.parent() is parent + assert restored.current_file is None and restored.tabs.count()==1 + assert int(restored.winId()) == native_id and restored.tabs.currentWidget() is host + assert reader.parent() is parent and host.stack.currentWidget() is host.welcome_view assert events.events.count(QEvent.Type.Show) == 1 and QEvent.Type.Hide not in events.events, events.events - print('Restored editor and project preset passed: one show, no hide, stable native window and preview parent.') + startup_events = list(events.events) + loaded=[];reader.loadFinished.connect(loaded.append) + restored.open_document(note) + wait(lambda:bool(loaded) and loaded[-1]) + assert restored.tabs.currentWidget() is host and host.stack.currentWidget() is reader + assert int(restored.winId())==native_id and events.events==startup_events + print('Directory-only restore and manual file open passed: no document tabs at startup, one show, no hide, stable reader host.') finally: restored.close() app.processEvents() diff --git a/tests/test_workspace_state.py b/tests/test_workspace_state.py index e5a91fc..f4c91cc 100644 --- a/tests/test_workspace_state.py +++ b/tests/test_workspace_state.py @@ -1,4 +1,6 @@ from pathlib import Path +import time +import pytest from PySide6.QtCore import QSettings from mdhelper import main_window from mdhelper.markdown_editor import MarkdownEditorDialog @@ -6,6 +8,70 @@ from mdhelper.tab_controller import document_path from mdhelper.workspace_state import TabState, WorkspaceStore +def wait_until(app, condition): + deadline=time.monotonic()+10 + while not condition() and time.monotonic()