feat: batch and combine Word and PDF exports transactionally

This commit is contained in:
2026-10-29 21:37:30 +08:00
parent 7355cad156
commit 82f5f5a63a
8 changed files with 489 additions and 3 deletions
+16 -2
View File
@@ -10,7 +10,7 @@ from .file_versions import atomic_write
from .pdf_export import build_pdf_export_html, build_pdf_page_layout, extract_heading_page_numbers
class PdfExportController:
def __init__(self, owner, output, content, headings, settings, source_path):
def __init__(self, owner, output, content, headings, settings, source_path, completed=None):
self.owner, self.output, self.content, self.settings = owner, output, content, settings
self.headings = [h for h in headings if h.level <= settings.toc_depth] if settings.include_toc else []
self.base_url = QUrl.fromLocalFile(str(source_path.parent.resolve()) + os.sep)
@@ -20,6 +20,7 @@ class PdfExportController:
self.lifecycle = ExportLifecycle(owner.context.parent, "导出 PDF", "正在准备 PDF 页面…", self.cancel, self.timeout)
self.progress = self.lifecycle.progress
self.job = None
self.completed, self.result, self.error = completed, None, ""
def start(self):
from PySide6.QtWebEngineCore import QWebEnginePage
@@ -90,13 +91,20 @@ class PdfExportController:
check_cancelled(cancel)
atomic_write(self.output, result)
return self.output
self.job = self.owner._start_export_job("正在完成 PDF…", decorate, self.cleanup)
self.job = self.owner._start_export_job("正在完成 PDF…", decorate, outcome=self.job_finished)
def job_finished(self, result, error, cancelled):
self.result = result if not cancelled else None
self.error = error
self.job = None
self.cleanup()
def timeout(self):
if self.page is not None and not self.cancelled:
self.fail("PDF 导出超时。")
def fail(self, message):
self.error = message
self.cancel()
QMessageBox.warning(self.owner.context.parent, "导出失败", message)
@@ -110,11 +118,17 @@ class PdfExportController:
self.page.deleteLater(); self.page = None
if getattr(self.owner, "_pdf_controller", None) is self:
self.owner._pdf_controller = None
if self.completed:
callback, self.completed = self.completed, None
callback(self.result, self.error)
def cancel(self):
if self.cancelled:
return
if self.job:
self.cancelled = True
self.job.cancel.set()
self.lifecycle.close()
return
self.owner.context.status("已取消 PDF 导出,原有输出文件保持不变")
self.cleanup()