feat: isolate project styles and portable export presets
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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'
|
||||
Reference in New Issue
Block a user