fix: protect editor content and harden document exports
Protect pending edits on window close, keep save-as paths and drafts consistent, copy relative image resources, reject oversized table imports without truncation, and preserve independent preview scrolling during refresh. Archive rendered MHTML resources with portable references and embedded local fonts. Preserve existing outputs on export cancellation or failure. Convert editor match positions and filter directory results in linear passes. Include the previously completed editor image/table/history improvements, undoable replacement, export snapshots, shared page settings, and cancellable PDF/Word export workflow. Update documentation and version to 0.3.1. Validation: 142 pytest cases passed; GUI smoke, improvements integration, and offline MHTML/scroll reliability smoke checks passed.
This commit is contained in:
+185
-15
@@ -6,7 +6,8 @@ import re
|
||||
from pathlib import Path
|
||||
from typing import Callable
|
||||
|
||||
from PySide6.QtCore import QRect, QSize, QTimer, QUrl, Qt, Signal
|
||||
from PySide6.QtCore import QObject, QRect, QSize, QSignalBlocker, QTimer, QUrl, Qt, Signal, Slot
|
||||
from PySide6.QtWebChannel import QWebChannel
|
||||
from PySide6.QtGui import (
|
||||
QAction,
|
||||
QColor,
|
||||
@@ -69,6 +70,7 @@ class LineNumberArea(QWidget):
|
||||
class MarkdownSourceEditor(QPlainTextEdit):
|
||||
def __init__(self, parent: QWidget | None = None) -> None:
|
||||
super().__init__(parent)
|
||||
self.image_handler = None
|
||||
self.line_number_background = QColor("#f3f5f8")
|
||||
self.line_number_foreground = QColor("#7a8494")
|
||||
self.current_line_background = QColor("#edf4ff")
|
||||
@@ -79,6 +81,15 @@ class MarkdownSourceEditor(QPlainTextEdit):
|
||||
self.update_line_number_area_width(0)
|
||||
self.highlight_current_line()
|
||||
|
||||
def canInsertFromMimeData(self, source: object) -> bool:
|
||||
from .editor_assets import image_files
|
||||
return bool(source.hasImage() or image_files(source)) or super().canInsertFromMimeData(source)
|
||||
|
||||
def insertFromMimeData(self, source: object) -> None:
|
||||
if callable(self.image_handler) and self.image_handler(source):
|
||||
return
|
||||
super().insertFromMimeData(source)
|
||||
|
||||
def apply_theme(self, dark: bool) -> None:
|
||||
if dark:
|
||||
self.line_number_background = QColor("#22272e")
|
||||
@@ -233,6 +244,12 @@ class MarkdownSyntaxHighlighter(QSyntaxHighlighter):
|
||||
|
||||
|
||||
|
||||
class PreviewScrollBridge(QObject):
|
||||
@Slot(float)
|
||||
def sourceLine(self, line: float) -> None:
|
||||
self.parent()._sync_source_to_preview_line(line)
|
||||
|
||||
|
||||
class MarkdownEditorDialog(QDialog):
|
||||
save_requested = Signal(object, str, object)
|
||||
close_requested = Signal()
|
||||
@@ -306,6 +323,9 @@ class MarkdownEditorDialog(QDialog):
|
||||
self.view_mode_box.setCurrentIndex(2 if embedded else 0)
|
||||
self.view_mode_box.currentIndexChanged.connect(self._apply_view_mode)
|
||||
control_layout.addWidget(self.view_mode_box)
|
||||
self.sync_scroll_checkbox = QCheckBox("同步滚动")
|
||||
self.sync_scroll_checkbox.setChecked(True)
|
||||
control_layout.addWidget(self.sync_scroll_checkbox)
|
||||
|
||||
self.editor_find_box = QLineEdit()
|
||||
self.editor_find_box.setPlaceholderText("查找源码")
|
||||
@@ -348,6 +368,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
|
||||
self.splitter = QSplitter(Qt.Orientation.Horizontal)
|
||||
self.editor = MarkdownSourceEditor()
|
||||
self.editor.image_handler = self._insert_image_mime
|
||||
self.editor.setPlainText(source)
|
||||
self.editor.setLineWrapMode(QPlainTextEdit.LineWrapMode.WidgetWidth)
|
||||
editor_font = QFont("Consolas")
|
||||
@@ -361,9 +382,17 @@ class MarkdownEditorDialog(QDialog):
|
||||
)
|
||||
self.editor.textChanged.connect(self._on_editor_text_changed)
|
||||
self.editor.verticalScrollBar().valueChanged.connect(self._sync_preview_to_editor_scroll)
|
||||
self.scroll_sync_timer = QTimer(self)
|
||||
self.scroll_sync_timer.setSingleShot(True)
|
||||
self.scroll_sync_timer.setInterval(40)
|
||||
self.scroll_sync_timer.timeout.connect(self._sync_preview_to_source_line)
|
||||
self.splitter.addWidget(self.editor)
|
||||
|
||||
self.preview = QWebEngineView()
|
||||
self.preview_channel = QWebChannel(self.preview.page())
|
||||
self.preview_bridge = PreviewScrollBridge(self)
|
||||
self.preview_channel.registerObject("mdhelperEditor", self.preview_bridge)
|
||||
self.preview.page().setWebChannel(self.preview_channel)
|
||||
self.preview.loadFinished.connect(self._restore_preview_scroll)
|
||||
self._configure_preview_settings(self.preview.settings())
|
||||
self.splitter.addWidget(self.preview)
|
||||
@@ -424,6 +453,9 @@ class MarkdownEditorDialog(QDialog):
|
||||
if dark:
|
||||
self.setStyleSheet(
|
||||
"QDialog { background: #1f242b; color: #dbe2ea; }"
|
||||
"QLabel, QCheckBox, QToolButton { color: #dbe2ea; }"
|
||||
"QTableWidget, QListWidget, QPlainTextEdit { background: #15191f; color: #dbe2ea; gridline-color: #444c56; }"
|
||||
"QHeaderView::section { background: #2d333b; color: #dbe2ea; border: 1px solid #444c56; }"
|
||||
"QLineEdit, QComboBox { background: #15191f; color: #dbe2ea; border: 1px solid #3a4553; padding: 4px; }"
|
||||
"QToolBar { background: #22272e; border: 1px solid #3a4553; }"
|
||||
"QPushButton { background: #2d333b; color: #dbe2ea; border: 1px solid #444c56; padding: 4px 8px; }"
|
||||
@@ -482,9 +514,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
("B", "**{selection}**"),
|
||||
("I", "*{selection}*"),
|
||||
("代码", "```\n{selection}\n```"),
|
||||
("表格", "| 列1 | 列2 |\n| --- | --- |\n| 内容 | 内容 |"),
|
||||
("链接", "[{selection}](target.md)"),
|
||||
("图片", ""),
|
||||
("提示", "> [!NOTE]\n> {selection}"),
|
||||
("Mermaid", "```mermaid\ngraph TD\n A --> B\n```"),
|
||||
("公式", "$${selection}$$"),
|
||||
@@ -494,6 +524,13 @@ class MarkdownEditorDialog(QDialog):
|
||||
action.triggered.connect(lambda checked=False, item=template: self.insert_template(item))
|
||||
self.insert_toolbar.addAction(action)
|
||||
|
||||
for label, callback in [("表格", self._edit_table), ("图片", self._choose_images),
|
||||
("历史版本", self.show_history)]:
|
||||
action = QAction(label, self)
|
||||
action.triggered.connect(callback)
|
||||
anchor = next(item for item in self.insert_toolbar.actions() if item.text() == "Mermaid")
|
||||
self.insert_toolbar.insertAction(anchor, action)
|
||||
|
||||
self.convert_latex_formula_action = QAction("转换latex公式到md", self)
|
||||
self.convert_latex_formula_action.setToolTip("将文档中的 \\[ 和 \\] 转换为 $$")
|
||||
self.convert_latex_formula_action.triggered.connect(self.convert_latex_formulas_to_markdown)
|
||||
@@ -649,7 +686,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
pattern = re.escape(query)
|
||||
if self.whole_word_checkbox.isChecked():
|
||||
pattern = r"\b" + pattern + r"\b"
|
||||
self._match_positions = [match.start() for match in re.finditer(pattern, text, flags)]
|
||||
self._match_positions = [start for start, _ in self._qt_match_spans(text, re.finditer(pattern, text, flags))]
|
||||
cursor_pos = self.editor.textCursor().selectionStart()
|
||||
for index, position in enumerate(self._match_positions):
|
||||
if position >= cursor_pos:
|
||||
@@ -667,7 +704,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
query = self.editor_find_box.text()
|
||||
cursor = self.editor.textCursor()
|
||||
cursor.setPosition(self._match_positions[self._current_match_index])
|
||||
cursor.setPosition(cursor.position() + len(query), QTextCursor.MoveMode.KeepAnchor)
|
||||
cursor.setPosition(cursor.position() + self._qt_position(query, len(query)), QTextCursor.MoveMode.KeepAnchor)
|
||||
self.editor.setTextCursor(cursor)
|
||||
self.editor.ensureCursorVisible()
|
||||
self._update_find_status()
|
||||
@@ -717,9 +754,84 @@ class MarkdownEditorDialog(QDialog):
|
||||
pattern = re.escape(query)
|
||||
if self.whole_word_checkbox.isChecked():
|
||||
pattern = r"\b" + pattern + r"\b"
|
||||
self.editor.setPlainText(re.sub(pattern, replacement, self.source_text(), flags=flags))
|
||||
source = self.source_text()
|
||||
matches = self._qt_match_spans(source, re.finditer(pattern, source, flags=flags))
|
||||
cursor = self.editor.textCursor()
|
||||
cursor.beginEditBlock()
|
||||
for start, end in reversed(matches):
|
||||
cursor.setPosition(start)
|
||||
cursor.setPosition(end, QTextCursor.MoveMode.KeepAnchor)
|
||||
cursor.insertText(replacement)
|
||||
cursor.endEditBlock()
|
||||
self._rebuild_find_matches()
|
||||
|
||||
@staticmethod
|
||||
def _qt_match_spans(source: str, matches) -> list[tuple[int, int]]:
|
||||
"""Convert ordered, non-overlapping matches in one pass over UTF-16 text."""
|
||||
spans = []
|
||||
offset = position = 0
|
||||
for match in matches:
|
||||
position += len(source[offset:match.start()].encode("utf-16-le")) // 2
|
||||
end = position + len(source[match.start():match.end()].encode("utf-16-le")) // 2
|
||||
spans.append((position, end))
|
||||
offset, position = match.end(), end
|
||||
return spans
|
||||
|
||||
@staticmethod
|
||||
def _qt_position(source: str, offset: int) -> int:
|
||||
return len(source[:offset].encode("utf-16-le")) // 2
|
||||
|
||||
def replace_source_undoable(self, source: str) -> None:
|
||||
cursor = self.editor.textCursor()
|
||||
cursor.beginEditBlock()
|
||||
cursor.select(QTextCursor.SelectionType.Document)
|
||||
cursor.insertText(source)
|
||||
cursor.endEditBlock()
|
||||
|
||||
def show_history(self) -> None:
|
||||
from .file_versions import show_version_history
|
||||
source = show_version_history(self, self.save_target_path, self.source_text())
|
||||
if source is not None:
|
||||
self.replace_source_undoable(source)
|
||||
|
||||
def _insert_image_mime(self, mime: object) -> bool:
|
||||
from .editor_assets import image_markdown
|
||||
try:
|
||||
text = image_markdown(mime, self.save_target_path)
|
||||
if text is None:
|
||||
return False
|
||||
self.editor.textCursor().insertText(text)
|
||||
except (OSError, ValueError) as exc:
|
||||
QMessageBox.warning(self, "图片插入失败", str(exc))
|
||||
return True
|
||||
|
||||
def _choose_images(self) -> None:
|
||||
from PySide6.QtCore import QMimeData
|
||||
paths, _ = QFileDialog.getOpenFileNames(self, "插入图片", str(self.save_target_path.parent),
|
||||
"图片 (*.png *.jpg *.jpeg *.gif *.webp *.bmp *.svg *.tif *.tiff)")
|
||||
if paths:
|
||||
mime = QMimeData()
|
||||
mime.setUrls([QUrl.fromLocalFile(path) for path in paths])
|
||||
self._insert_image_mime(mime)
|
||||
|
||||
def _edit_table(self) -> None:
|
||||
from .table_editor import edit_table, table_at_line
|
||||
source = self.source_text()
|
||||
selected = table_at_line(source, self.editor.textCursor().blockNumber())
|
||||
table = edit_table(self, selected.rows if selected else None, selected.alignments if selected else None)
|
||||
if table is None:
|
||||
return
|
||||
cursor = self.editor.textCursor()
|
||||
cursor.beginEditBlock()
|
||||
if selected:
|
||||
cursor.setPosition(self._qt_position(source, selected.start))
|
||||
cursor.setPosition(self._qt_position(source, selected.end), QTextCursor.MoveMode.KeepAnchor)
|
||||
cursor.insertText(table + "\n")
|
||||
else:
|
||||
cursor.insertText("\n\n" + table + "\n\n")
|
||||
cursor.endEditBlock()
|
||||
self.editor.setTextCursor(cursor)
|
||||
|
||||
def _configure_preview_settings(self, settings: QWebEngineSettings) -> None:
|
||||
attributes = QWebEngineSettings.WebAttribute
|
||||
settings.setAttribute(attributes.LocalContentCanAccessFileUrls, True)
|
||||
@@ -734,7 +846,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
self.preview.setVisible(mode in {"preview", "split"})
|
||||
if mode in {"preview", "split"} and self._preview_dirty:
|
||||
self._refresh_preview_now()
|
||||
if mode == "split":
|
||||
if mode == "split" and self.sync_scroll_checkbox.isChecked():
|
||||
QTimer.singleShot(0, lambda: self._sync_preview_to_editor_scroll(self.editor.verticalScrollBar().value()))
|
||||
|
||||
def _schedule_preview_refresh(self) -> None:
|
||||
@@ -745,7 +857,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
|
||||
def _refresh_preview_with_scroll_capture(self) -> None:
|
||||
mode = str(self.view_mode_box.currentData() or "source")
|
||||
if mode == "split":
|
||||
if mode == "split" and self.sync_scroll_checkbox.isChecked():
|
||||
self._preview_scroll_ratio = self._editor_scroll_ratio()
|
||||
self._refresh_preview_now()
|
||||
return
|
||||
@@ -773,6 +885,7 @@ class MarkdownEditorDialog(QDialog):
|
||||
document_width_scale=self.document_width_scale,
|
||||
document_style_css=self.document_style_css,
|
||||
math_engine=self.math_engine,
|
||||
source_map=True,
|
||||
)
|
||||
base_path = str(self.save_target_path.parent.resolve()) + os.sep
|
||||
self.preview.setHtml(html_content, QUrl.fromLocalFile(base_path))
|
||||
@@ -781,8 +894,8 @@ class MarkdownEditorDialog(QDialog):
|
||||
def _restore_preview_scroll(self, ok: bool) -> None:
|
||||
if not ok:
|
||||
return
|
||||
if str(self.view_mode_box.currentData() or "source") == "split":
|
||||
self._scroll_preview_to_ratio(self._preview_scroll_ratio)
|
||||
if str(self.view_mode_box.currentData() or "source") == "split" and self.sync_scroll_checkbox.isChecked():
|
||||
self._sync_preview_to_source_line()
|
||||
return
|
||||
if self._preview_scroll_y > 0:
|
||||
script = f"(() => {{ window.scrollTo({{top: {self._preview_scroll_y}, behavior: 'instant'}}); }})();"
|
||||
@@ -794,10 +907,63 @@ class MarkdownEditorDialog(QDialog):
|
||||
|
||||
def _sync_preview_to_editor_scroll(self, value: int) -> None:
|
||||
del value
|
||||
if self._syncing_scroll or str(self.view_mode_box.currentData() or "source") != "split":
|
||||
if self._syncing_scroll or not self.sync_scroll_checkbox.isChecked() or str(self.view_mode_box.currentData() or "source") != "split":
|
||||
return
|
||||
self._preview_scroll_ratio = self._editor_scroll_ratio()
|
||||
self._scroll_preview_to_ratio(self._preview_scroll_ratio)
|
||||
self.scroll_sync_timer.start()
|
||||
|
||||
def _sync_preview_to_source_line(self) -> None:
|
||||
if not isValid(self) or not self.sync_scroll_checkbox.isChecked() or self.view_mode_box.currentData() != "split":
|
||||
return
|
||||
block = self.editor.firstVisibleBlock()
|
||||
line = block.blockNumber()
|
||||
height = max(1.0, self.editor.blockBoundingRect(block).height())
|
||||
offset = -self.editor.blockBoundingGeometry(block).translated(self.editor.contentOffset()).top() / height
|
||||
script = """(() => {
|
||||
window.mdhelperProgrammaticScrollUntil = performance.now() + 200;
|
||||
const line = %s;
|
||||
const blocks = [...document.querySelectorAll('[data-source-line]')]
|
||||
.filter(e => e.getBoundingClientRect().height > 0);
|
||||
let target = null;
|
||||
for (const e of blocks) {
|
||||
const start = Number(e.dataset.sourceLine), end = Number(e.dataset.sourceEnd);
|
||||
if (start <= line && (!target || start >= Number(target.dataset.sourceLine))) target = e;
|
||||
}
|
||||
if (!target) return;
|
||||
const start = Number(target.dataset.sourceLine), end = Number(target.dataset.sourceEnd);
|
||||
const fraction = Math.max(0, Math.min(1, (line - start) / Math.max(1, end - start)));
|
||||
const rect = target.getBoundingClientRect();
|
||||
window.scrollTo({top: window.scrollY + rect.top + rect.height * fraction - 12, behavior: 'instant'});
|
||||
})();""" % json.dumps(line + max(0, offset))
|
||||
self.preview.page().runJavaScript(script)
|
||||
|
||||
def _sync_source_to_preview_line(self, line: float) -> None:
|
||||
if not self.sync_scroll_checkbox.isChecked() or self.view_mode_box.currentData() != "split":
|
||||
return
|
||||
block = self.editor.document().findBlockByNumber(max(0, min(int(line), self.editor.blockCount() - 1)))
|
||||
if not block.isValid():
|
||||
return
|
||||
document = self.editor.document()
|
||||
key = (document.revision(), self.editor.viewport().width(), self.editor.font().toString())
|
||||
if getattr(self, "_visual_line_key", None) != key:
|
||||
offsets = [0]
|
||||
current = document.firstBlock()
|
||||
layout = document.documentLayout()
|
||||
while current.isValid():
|
||||
layout.ensureBlockLayout(current)
|
||||
offsets.append(offsets[-1] + max(1, current.layout().lineCount()))
|
||||
current = current.next()
|
||||
self._visual_line_offsets = offsets
|
||||
self._visual_line_key = key
|
||||
offsets = self._visual_line_offsets
|
||||
index = block.blockNumber()
|
||||
position = offsets[index] + int((line - int(line)) * (offsets[index + 1] - offsets[index]))
|
||||
bar = self.editor.verticalScrollBar()
|
||||
self._syncing_scroll = True
|
||||
try:
|
||||
bar.setValue(position)
|
||||
finally:
|
||||
self._syncing_scroll = False
|
||||
|
||||
def _scroll_preview_to_ratio(self, ratio: float) -> None:
|
||||
if not isValid(self) or not isValid(self.preview):
|
||||
@@ -828,11 +994,11 @@ class MarkdownEditorDialog(QDialog):
|
||||
target = Path(file_name)
|
||||
if target.suffix.lower() not in {".md", ".markdown"}:
|
||||
target = target.with_suffix(".md")
|
||||
self.save_target_path = target.resolve()
|
||||
self._update_dirty_title()
|
||||
if self.embedded:
|
||||
self._emit_save_requested()
|
||||
self.save_requested.emit(target.resolve(), self.source_text(), self.file_signature)
|
||||
else:
|
||||
self.save_target_path = target.resolve()
|
||||
self._update_dirty_title()
|
||||
self.accept()
|
||||
|
||||
def accept(self) -> None:
|
||||
@@ -845,7 +1011,11 @@ class MarkdownEditorDialog(QDialog):
|
||||
self.path = path
|
||||
self.save_target_path = path
|
||||
self.file_signature = file_signature
|
||||
if source != self.source_text():
|
||||
self.replace_source_undoable(source)
|
||||
self._original_source = source
|
||||
self.draft_save_timer.stop()
|
||||
self._preview_dirty = True
|
||||
self._update_dirty_title()
|
||||
|
||||
def confirm_close(self) -> bool:
|
||||
|
||||
Reference in New Issue
Block a user