feat: isolate project styles and portable export presets

This commit is contained in:
2026-10-29 21:48:19 +08:00
parent 82f5f5a63a
commit a40a6cd749
7 changed files with 390 additions and 11 deletions
+2
View File
@@ -60,3 +60,5 @@ MHTML 的浏览器加载与归档转换分开。`mhtml_archive.py` 分别处理
`batch_documents.py` 负责跨文件资源路径、章节锚点命名和成组输出事务。`batch_export_dialog.py` 持有不可变的文档/样式快照,在工作线程执行 Word 转换,在 Qt 主线程串行驱动已有 PDF 控制器。只有全队列完成后才发布输出;取消和失败可恢复原有目标。Word 合并采用显式章节标识,PDF 使用同一组标识。
`project_presets.py` 管理全局默认、每个项目的独立副本及显式保存的模板库。预设仅包含文档样式和页面参数,使用现有配置规范化器;不携带项目路径、书签、草稿。主窗口在构建界面前应用项目默认,导出控制器通过回调取得同一份页面设置,不引入启动后切换窗口或浏览器的操作。
+8 -1
View File
@@ -41,6 +41,8 @@ class ExportContext:
page_html: Callable
configure_web_settings: Callable
status: Callable[[str], None]
page_settings: Callable[[], PageSettings] | None = None
save_page_settings: Callable[[PageSettings], None] | None = None
class ExportController:
@@ -71,6 +73,8 @@ class ExportController:
return confirm_export(self.context.parent, check_export(snapshot.source, snapshot.path, kind, snapshot.style.get("css", "")))
def _saved_page_settings(self) -> PageSettings:
if self.context.page_settings:
return self.context.page_settings()
return self.configuration.load_page_settings()
def _choose_page_settings(self) -> PageSettings | None:
@@ -78,7 +82,10 @@ class ExportController:
if dialog.exec() != QDialog.DialogCode.Accepted:
return None
settings = dialog.page_settings()
self.configuration.save_page_settings(settings)
if self.context.save_page_settings:
self.context.save_page_settings(settings)
else:
self.configuration.save_page_settings(settings)
return settings
def _saved_pdf_margins(self) -> PdfMargins:
+56 -10
View File
@@ -60,6 +60,7 @@ from .document_session import DocumentStore, DraftStore, DocumentCloseController
from .document_resources import analyze_document
from .tab_controller import TabController, document_path
from .workspace_state import WorkspaceStore, TabState
from .project_presets import ProjectStyles
from .reader_widgets import ReaderPage, ReaderBridge, ReaderView, ReaderTabHost, CompactTreeDelegate
from .video_player import VideoPlayerWidget
from .ui_theme import navigation_theme, apply_title_bar_style
@@ -204,6 +205,8 @@ class MainWindow(QMainWindow):
self._standby_reader_host: ReaderTabHost | None = None
self._load_preferences()
self.project_styles = ProjectStyles(self.settings, self._reader_preferences(), self.configurations.load_page_settings())
self._apply_reader_preferences(self.project_styles.activate(self.project_root if self.has_project else None, self._reader_preferences()))
if self.has_project and not defer_startup:
self.catalog.scan(self.project_root, self.document_file_groups, force=True)
self._apply_auto_refresh_timing()
@@ -219,7 +222,8 @@ class MainWindow(QMainWindow):
self.exports = ExportController(ExportContext(
self, self.settings, self._export_snapshot,
lambda snapshot: render_document(self.renderer, snapshot.path, snapshot.source, snapshot.rendering),
lambda callback: self.web_view.page().toHtml(callback), self._configure_web_settings, self.status_label.setText))
lambda callback: self.web_view.page().toHtml(callback), self._configure_web_settings, self.status_label.setText,
lambda: self.project_styles.page, self._set_project_page_settings))
self.tab_controller = TabController(self.tabs, self.document_closer.confirm, self._release_tab_widget, self._ensure_welcome_if_empty, self._on_tab_changed)
self.scroll_capture_timer.start()
self._populate_tree()
@@ -452,6 +456,9 @@ class MainWindow(QMainWindow):
self.check_documents_action = QAction("检查文档链接与图片", self)
self.check_documents_action.triggered.connect(self.show_document_check)
self.project_presets_action = QAction("项目样式与导出预设…", self)
self.project_presets_action.triggered.connect(self.show_project_presets)
self.tools_menu.addAction(self.project_presets_action)
self.tools_menu.addAction(self.check_documents_action)
self.manage_external_apps_action = QAction("管理外部打开程序", self)
@@ -1945,6 +1952,9 @@ class MainWindow(QMainWindow):
if self.has_project:
self.workspaces.save(self.project_root, *snapshot)
self._save_preferences()
self._apply_reader_preferences(self.project_styles.activate(None, self._reader_preferences()))
self._build_style_menu()
self._startup_generation += 1
self._startup_scan_pending = False
self.has_project = False
@@ -2001,6 +2011,10 @@ class MainWindow(QMainWindow):
if snapshot is not None:
self.workspaces.save(self.project_root, *snapshot)
if root_changed or not self.has_project:
self._save_preferences()
self._apply_reader_preferences(self.project_styles.activate(project_root, self._reader_preferences()))
self._build_style_menu()
self._startup_generation += 1
self._startup_scan_pending = False
self.watch.reset()
@@ -2721,29 +2735,38 @@ class MainWindow(QMainWindow):
)
def _configuration_data(self) -> ApplicationConfiguration:
reader = ReaderPreferences(**{item.name: getattr(self, "auto_refresh_enabled" if item.name == "auto_refresh" else item.name)
for item in fields(ReaderPreferences)})
reader = self._reader_preferences()
return ApplicationConfiguration(reader, str(self.project_root) if self.has_project else "",
[str(path) for path in self.recent_files], self.bookmarks, self.scroll_positions,
self.external_applications, self._saved_page_settings())
def _apply_configuration_data(self, config: ApplicationConfiguration) -> None:
for item in fields(ReaderPreferences):
setattr(self, "auto_refresh_enabled" if item.name == "auto_refresh" else item.name, getattr(config.reader, item.name))
self._apply_reader_preferences(config.reader)
self.recent_files = [Path(path) for path in config.recent_files]
self.bookmarks = config.bookmarks
self.scroll_positions = config.scroll_positions
self.external_applications = config.external_applications
def _reader_preferences(self) -> ReaderPreferences:
return ReaderPreferences(**{item.name: getattr(self, "auto_refresh_enabled" if item.name == "auto_refresh" else item.name)
for item in fields(ReaderPreferences)})
def _apply_reader_preferences(self, reader: ReaderPreferences) -> None:
for item in fields(ReaderPreferences):
setattr(self, "auto_refresh_enabled" if item.name == "auto_refresh" else item.name, getattr(reader, item.name))
if hasattr(self, "theme_menu"):
self._update_theme_menu_state()
def _configuration_snapshot(self) -> dict[str, object]:
return self._configuration_data().to_payload(__version__)
def _apply_configuration(self, payload: dict[str, object]) -> None:
config = ApplicationConfiguration.from_payload(payload, self._configuration_data())
self._apply_configuration_data(config)
self.settings.setValue("export/page_settings", json.dumps(asdict(config.page_settings), ensure_ascii=False))
if config.project_root and Path(config.project_root).exists():
self.set_project_root(Path(config.project_root), save=True)
if not self.set_project_root(Path(config.project_root), save=True):
return
self._apply_configuration_data(config)
self._set_project_page_settings(config.page_settings)
def _is_int_like(self, value: object) -> bool:
try:
@@ -2762,7 +2785,8 @@ class MainWindow(QMainWindow):
) -> None:
path = path.resolve()
if not self.has_project or not self._is_relative_to(path, self.project_root):
self.set_project_root(path.parent, save=True)
if not self.set_project_root(path.parent, save=True):
return
self._save_current_scroll_position()
try:
html = self._render_document_file(path)
@@ -3884,6 +3908,23 @@ class MainWindow(QMainWindow):
self, self.project_root, self._editor_sources, self._open_source_location)
self._document_check_dialog.show()
def show_project_presets(self) -> None:
if not self.has_project:
return
from .project_preset_dialog import ProjectPresetDialog
ProjectPresetDialog(self).exec()
def _set_project_page_settings(self, page) -> None:
self.project_styles.set_page(page, self._reader_preferences())
if not self.project_styles.active:
self.configurations.save_page_settings(page)
def _choose_project_preset(self, preset) -> None:
self._apply_reader_preferences(self.project_styles.choose(preset, self._reader_preferences()))
self._save_preferences()
self._build_style_menu()
self.refresh_all_tab_appearances()
def _open_source_location(self, path: Path, line: int) -> None:
if not path.is_file():
QMessageBox.warning(self, "无法定位", "文件已被移动或删除。")
@@ -3926,6 +3967,7 @@ class MainWindow(QMainWindow):
self.forward_action.setEnabled(history.can_go_forward)
self.check_documents_action.setEnabled(self.has_project)
self.batch_export_action.setEnabled(self.has_project)
self.project_presets_action.setEnabled(self.has_project)
if hasattr(self, "new_file_action"):
self.new_file_action.setEnabled(self.has_project)
if hasattr(self, "edit_current_action"):
@@ -4126,7 +4168,11 @@ class MainWindow(QMainWindow):
self.directory_poll_timer.stop()
def _save_preferences(self) -> None:
self.configurations.save(self._configuration_data())
config = self._configuration_data()
self.project_styles.save_current(config.reader)
config.reader = self.project_styles.global_preferences(config.reader)
config.page_settings = self.project_styles.global_page
self.configurations.save(config)
self.drafts.persist()
if hasattr(self, "splitter"):
self.settings.setValue("window/splitter", self.splitter.saveState())
+102
View File
@@ -0,0 +1,102 @@
"""Small UI over portable presets; reusable templates never change implicitly."""
from __future__ import annotations
import json
from pathlib import Path
from PySide6.QtWidgets import (QDialog, QFileDialog, QHBoxLayout, QInputDialog, QLabel,
QListWidget, QMessageBox, QPushButton, QVBoxLayout)
from .file_versions import atomic_write
from .project_presets import capture_preset, portable_preset, read_portable_preset
class ProjectPresetDialog(QDialog):
def __init__(self, window):
super().__init__(window)
self.window, self.styles = window, window.project_styles
self.setWindowTitle("项目样式与导出预设")
self.resize(720, 540)
layout = QVBoxLayout(self)
self.active_label = QLabel(); self.active_label.setWordWrap(True)
layout.addWidget(self.active_label)
layout.addWidget(QLabel("项目默认保存字体、段落/高级 CSS、阅读宽度、纸张、页边距、目录、页眉页脚和页码。\n启用后,主窗口中的样式调整只记入当前项目;模板库只在明确保存时更新。"))
self.listing = QListWidget(); layout.addWidget(self.listing)
self.detail = QLabel(); self.detail.setWordWrap(True); layout.addWidget(self.detail)
self.listing.currentTextChanged.connect(self.describe)
for actions in [
[("以当前设置启用项目默认", self.use_current), ("应用选中预设到项目", self.apply_selected), ("恢复全局默认", self.use_global)],
[("当前设置另存为预设", self.save_template), ("删除选中模板", self.delete_template), ("页面与导出设置", self.edit_page)],
[("导入预设", self.import_preset), ("导出选中预设", self.export_preset), ("关闭", self.accept)],
]:
row = QHBoxLayout()
for title, callback in actions:
button = QPushButton(title); button.clicked.connect(callback); row.addWidget(button)
layout.addLayout(row)
self.refresh()
def refresh(self, selected=''):
self.active_label.setText(f"项目:{self.window.project_root}\n当前使用:" +
(f"项目默认({self.styles.active['name']})" if self.styles.active else "全局默认"))
self.library = self.styles.store.library()
self.listing.clear(); self.listing.addItems(sorted(self.library))
for index in range(self.listing.count()):
if self.listing.item(index).text() == selected: self.listing.setCurrentRow(index); break
if self.listing.currentRow() < 0 and self.listing.count(): self.listing.setCurrentRow(0)
def describe(self, name):
preset = self.library.get(name)
if not preset: self.detail.setText(''); return
reader, page = preset['reader'], preset['page_settings']
self.detail.setText(f"字体:{reader['document_font_family'] or '默认字体'},{reader['document_font_size']} px;样式:{reader['document_style_id']}\n"
f"纸张:{page['paper']};页眉:{page['header'] or '无'};页脚:{page['footer'] or '无'}")
def current(self, name):
return capture_preset(name, self.window._reader_preferences(), self.styles.page)
def selected(self):
item = self.listing.currentItem()
return self.library.get(item.text()) if item else None
def use_current(self):
self.window._choose_project_preset(self.current(self.window.project_root.name))
self.refresh()
def apply_selected(self):
if (preset := self.selected()) is not None:
self.window._choose_project_preset(preset); self.refresh(preset['name'])
def use_global(self):
self.window._choose_project_preset(None); self.refresh()
def store_template(self, preset):
if preset['name'] in self.styles.store.library() and QMessageBox.question(self, "替换模板?",
f"是否替换同名模板:{preset['name']}?已设置的项目默认副本不受影响。",
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, QMessageBox.StandardButton.No) != QMessageBox.StandardButton.Yes:
return
self.styles.store.save_template(preset); self.refresh(preset['name'])
def save_template(self):
name, ok = QInputDialog.getText(self, "保存样式预设", "预设名称", text=self.window.project_root.name)
if ok and name.strip(): self.store_template(self.current(name.strip()))
def delete_template(self):
preset = self.selected()
if preset and QMessageBox.question(self, "删除模板?", f"删除“{preset['name']}”?已启用的项目默认副本会保留。",
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, QMessageBox.StandardButton.No) == QMessageBox.StandardButton.Yes:
self.styles.store.delete_template(preset['name']); self.refresh()
def edit_page(self):
self.window.exports._choose_page_settings(); self.refresh()
def import_preset(self):
filename, _ = QFileDialog.getOpenFileName(self, "导入样式预设", str(self.window.project_root), "JSON (*.json)")
if not filename: return
try:
self.store_template(read_portable_preset(json.loads(Path(filename).read_text(encoding='utf-8-sig'))))
except (OSError, ValueError) as exc: QMessageBox.warning(self, "导入失败", str(exc))
def export_preset(self):
preset = self.selected()
if not preset: return
filename, _ = QFileDialog.getSaveFileName(self, "导出样式预设", str(self.window.project_root / '样式预设.json'), "JSON (*.json)")
if not filename: return
try: atomic_write(Path(filename), json.dumps(portable_preset(preset), ensure_ascii=False, indent=2).encode('utf-8'))
except OSError as exc: QMessageBox.warning(self, "导出失败", str(exc))
+121
View File
@@ -0,0 +1,121 @@
"""Project style copies, reusable templates and a separate global fallback."""
from __future__ import annotations
import copy
import json
from dataclasses import asdict, replace
from .preferences import ReaderPreferences
from .export_settings import PageSettings
from .workspace_state import WorkspaceStore
STYLE_FIELDS = ('document_font_family', 'document_font_size', 'font_scale', 'reader_width_scale',
'document_style_id', 'custom_document_styles')
def normalize_preset(payload):
if not isinstance(payload, dict) or not isinstance(payload.get('reader'), dict):
raise ValueError('不是有效的 MDHelper 样式预设。')
reader = ReaderPreferences.from_mapping(payload['reader'])
page = payload.get('page_settings', {})
if not isinstance(page, dict): raise ValueError('页面设置格式无效。')
data = asdict(reader)
return {'name': str(payload.get('name', '项目默认')).strip()[:80] or '项目默认',
'reader': {key: data[key] for key in STYLE_FIELDS},
'page_settings': asdict(PageSettings.from_dict(page).normalized())}
def capture_preset(name, reader, page):
return normalize_preset({'name': name, 'reader': asdict(reader), 'page_settings': asdict(page)})
def portable_preset(preset):
return {'app': 'MDHelperProjectPreset', 'schema': 1, 'preset': normalize_preset(preset)}
def read_portable_preset(payload):
if not isinstance(payload, dict) or payload.get('app') != 'MDHelperProjectPreset' or payload.get('schema') != 1:
raise ValueError('不支持的项目预设文件,请选择 MDHelper 导出的预设 JSON。')
return normalize_preset(payload.get('preset'))
class ProjectPresetStore:
def __init__(self, settings): self.settings = settings
def _read(self, key):
try:
value = json.loads(str(self.settings.value(key, '{}')))
return value if isinstance(value, dict) else {}
except (ValueError, TypeError): return {}
def library(self):
result = {}
for name, value in self._read('project_presets/library').items():
try: result[str(name)] = normalize_preset(value)
except ValueError: continue
return result
def save_template(self, preset):
preset = normalize_preset(preset)
library = self.library(); library[preset['name']] = preset
self.settings.setValue('project_presets/library', json.dumps(library, ensure_ascii=False))
def delete_template(self, name):
library = self.library(); library.pop(name, None)
self.settings.setValue('project_presets/library', json.dumps(library, ensure_ascii=False))
def key(self, root): return 'project_presets/bindings/' + WorkspaceStore.key(root).split('/')[-1]
def binding(self, root):
if root is None: return None
try: return normalize_preset(self._read(self.key(root)))
except ValueError: return None
def bind(self, root, preset):
if root is None: return
if preset is None: self.settings.remove(self.key(root))
else: self.settings.setValue(self.key(root), json.dumps(normalize_preset(preset), ensure_ascii=False))
class ProjectStyles:
def __init__(self, settings, reader, page):
self.store = ProjectPresetStore(settings)
self.global_reader, self.global_page = copy.deepcopy(reader), page
self.active, self.root = None, None
@property
def page(self):
return PageSettings.from_dict(self.active['page_settings']) if self.active else self.global_page
def save_current(self, reader):
if self.active:
self.active = capture_preset(self.active['name'], reader, self.page)
self.store.bind(self.root, self.active)
else:
self.global_reader = copy.deepcopy(reader)
def global_preferences(self, reader):
values = {key: copy.deepcopy(getattr(self.global_reader, key)) for key in STYLE_FIELDS}
return replace(reader, **values)
def applied_preferences(self, reader):
baseline = self.global_preferences(reader)
return ReaderPreferences.from_mapping(copy.deepcopy(self.active['reader']), baseline) if self.active else baseline
def activate(self, root, reader):
self.save_current(reader)
self.root = root.resolve() if root is not None else None
self.active = self.store.binding(self.root)
return self.applied_preferences(reader)
def choose(self, preset, reader):
if self.root is None: raise ValueError('请先打开项目文件夹。')
self.save_current(reader)
self.active = normalize_preset(preset) if preset is not None else None
self.store.bind(self.root, self.active)
return self.applied_preferences(reader)
def set_page(self, page, reader):
if self.active:
self.active['page_settings'] = asdict(page)
self.save_current(reader)
else:
self.global_page = page
+29
View File
@@ -82,6 +82,35 @@ def main():
finally:
window.close()
app.processEvents()
# Restore an editor and a project preset before showing the native window.
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
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')))
restored = main_window.MainWindow(root, app_root=ROOT, defer_startup=True)
restored.prepare_reader_before_show()
events = WindowEvents(restored)
try:
editor = restored.tabs.currentWidget()
assert isinstance(editor, MarkdownEditorDialog)
parent = editor.preview.parent()
restored.show()
native_id = int(restored.winId())
settled = []
QTimer.singleShot(1500, lambda: settled.append(True))
wait(lambda: bool(settled))
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 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.')
finally:
restored.close()
app.processEvents()
return 0
+72
View File
@@ -0,0 +1,72 @@
import json
from dataclasses import replace
from PySide6.QtCore import QSettings
from mdhelper.project_presets import ProjectStyles, capture_preset, portable_preset, read_portable_preset
from mdhelper.preferences import ConfigurationStore, ReaderPreferences
from mdhelper.export_settings import PageSettings
from mdhelper import main_window
def test_project_copies_and_portable_presets_do_not_leak_global_settings(tmp_path):
settings = QSettings(str(tmp_path / 'settings.ini'), QSettings.Format.IniFormat)
global_reader = ReaderPreferences()
styles = ProjectStyles(settings, global_reader, PageSettings(header='Global'))
first, second = tmp_path / 'one', tmp_path / 'two'
styles.activate(first, global_reader)
reader = ReaderPreferences.from_mapping({'document_font_size': 24, 'document_font_family': 'SimSun',
'document_style_id': 'custom:report', 'custom_document_styles': {'custom:report': {'name': 'Report', 'css': 'p {line-height: 2; color: red;}'}}})
preset = capture_preset('Report', reader, PageSettings(paper='A3', header='Report header', footer='Report footer'))
portable = read_portable_preset(json.loads(json.dumps(portable_preset(preset))))
assert portable == preset
assert 'project_root' not in json.dumps(portable) and 'bookmarks' not in json.dumps(portable)
styles.store.save_template(preset)
applied = styles.choose(preset, global_reader)
assert applied.document_font_size == 24 and styles.page.paper == 'A3'
modified = replace(applied, document_font_size=22, font_scale=22/16)
fallback = styles.activate(second, modified)
assert fallback.document_font_size == 16 and styles.page.header == 'Global'
assert styles.store.library()['Report']['reader']['document_font_size'] == 24
restored = styles.activate(first, fallback)
assert restored.document_font_size == 22 and styles.page.footer == 'Report footer'
styles.store.delete_template('Report')
assert styles.store.binding(first) is not None
assert styles.choose(None, restored).document_font_size == 16
def test_window_switch_and_restart_keep_project_style_and_export_settings(qt_application, tmp_path, monkeypatch):
settings = QSettings(str(tmp_path / 'settings.ini'), QSettings.Format.IniFormat)
monkeypatch.setattr(main_window, 'QSettings', lambda *_: settings)
first, second = tmp_path / 'first', tmp_path / 'second'; first.mkdir(); second.mkdir()
path = first / 'note.md'; path.write_text('# Note')
window = main_window.MainWindow(first)
try:
preset = capture_preset('Project one', ReaderPreferences(document_font_family='SimSun', document_font_size=22, font_scale=22/16),
PageSettings(paper='Letter', header='One', left=25))
window._choose_project_preset(preset)
assert window.document_font_size == 22 and window._saved_page_settings().header == 'One'
window.document_font_size = 26; window.font_scale = 26/16; window._save_preferences()
assert ConfigurationStore(settings).load().reader.document_font_size == 16
assert ConfigurationStore(settings).load_page_settings().header == ''
window.set_project_root(second)
assert window.document_font_size == 16 and window._saved_page_settings().paper == 'A4'
window.set_project_root(first)
assert window.document_font_size == 26 and window._saved_page_settings().left == 25
window.open_document(path)
assert window._export_snapshot().font == 'SimSun'
finally: window.close()
restarted = main_window.MainWindow(first, defer_startup=True)
try:
assert restarted.document_font_size == 26 and restarted._saved_page_settings().header == 'One'
restarted.close_project_folder()
assert restarted.document_font_size == 16 and restarted._saved_page_settings().header == ''
finally: restarted.close()
def test_invalid_binding_falls_back_without_affecting_other_preferences(tmp_path):
settings = QSettings(str(tmp_path / 'settings.ini'), QSettings.Format.IniFormat)
reader = ReaderPreferences(theme='dark', theme_color='black')
styles = ProjectStyles(settings, reader, PageSettings())
settings.setValue(styles.store.key(tmp_path), '{"reader":[]}')
assert styles.activate(tmp_path, reader) == reader
preset = capture_preset('Only styles', ReaderPreferences(document_font_size=20), PageSettings())
assert styles.choose(preset, reader).theme == 'dark'