refactor: unify configuration validation and persistence
This commit is contained in:
@@ -16,6 +16,7 @@ from .export_settings import PageSettings
|
||||
from .file_versions import atomic_write
|
||||
from .markdown_utils import Heading
|
||||
from .render_options import RenderOptions
|
||||
from .preferences import ConfigurationStore
|
||||
from typing import Callable
|
||||
from .pdf_export_task import PdfExportController
|
||||
from .pdf_export import PdfExportSettingsDialog, PdfMargins
|
||||
@@ -46,6 +47,7 @@ class ExportContext:
|
||||
class ExportController:
|
||||
def __init__(self, context: ExportContext):
|
||||
self.context = context
|
||||
self.configuration = ConfigurationStore(context.settings)
|
||||
self._export_jobs = set()
|
||||
self._mhtml_exports = set()
|
||||
self._pdf_controller = None
|
||||
@@ -70,21 +72,14 @@ 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:
|
||||
try:
|
||||
value = json.loads(str(self.context.settings.value("export/page_settings", "{}")))
|
||||
if isinstance(value, dict) and value:
|
||||
return PageSettings.from_dict(value).normalized()
|
||||
except (TypeError, ValueError):
|
||||
pass
|
||||
margins = self._saved_pdf_margins()
|
||||
return PageSettings(top=margins.top, bottom=margins.bottom, left=margins.left, right=margins.right)
|
||||
return self.configuration.load_page_settings()
|
||||
|
||||
def _choose_page_settings(self) -> PageSettings | None:
|
||||
dialog = PdfExportSettingsDialog(self._saved_page_settings(), self.context.parent)
|
||||
if dialog.exec() != QDialog.DialogCode.Accepted:
|
||||
return None
|
||||
settings = dialog.page_settings()
|
||||
self.context.settings.setValue("export/page_settings", json.dumps(asdict(settings), ensure_ascii=False))
|
||||
self.configuration.save_page_settings(settings)
|
||||
return settings
|
||||
|
||||
def _saved_pdf_margins(self) -> PdfMargins:
|
||||
|
||||
Reference in New Issue
Block a user