lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2026-09-23 13:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix markup

Browse Source
This commit is contained in:
dgtlmoon
2025-10-25 20:12:34 +02:00
parent 10e3db50f6
commit 892ea6b198
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changedetectionio/blueprint/ui/views.py
+15 -8
View File
@@ -38,20 +38,26 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
# Step 1: Escape everything like Jinja2 would (this makes it XSS-safe)
escaped_content = escape(str(content))
# Step 2: Simple regex to unescape only our exact diff spans
# Unescape outer span opening tags with exact styles (with title attribute)
# This matches the styles used in DIFF_HTML_LABEL_REMOVED, DIFF_HTML_LABEL_ADDED, etc.
# Step 2: Unescape only our exact diff spans generated by apply_html_color_to_body()
# Pattern matches the exact structure:
# <span style="{STYLE}" role="{ROLE}" aria-label="{LABEL}" title="{TITLE}">
# Unescape outer span opening tags with full attributes (role, aria-label, title)
# Matches removed/added/changed/changed_into spans
result = re.sub(
rf'&lt;span style=&#34;({REMOVED_STYLE}|{ADDED_STYLE})&#34; title=&#34;([A-Za-z0-9]+)&#34;&gt;',
r'<span style="\1" title="\2">',
rf'&lt;span style=&#34;({re.escape(REMOVED_STYLE)}|{re.escape(ADDED_STYLE)})&#34; '
rf'role=&#34;(deletion|insertion|note)&#34; '
rf'aria-label=&#34;([^&]+?)&#34; '
rf'title=&#34;([^&]+?)&#34;&gt;',
r'<span style="\1" role="\2" aria-label="\3" title="\4">',
str(escaped_content),
flags=re.IGNORECASE
)
# Unescape inner span opening tags (without title attribute)
# Unescape inner span opening tags (without additional attributes)
# This matches the darker background styles for changed parts within lines
result = re.sub(
rf'&lt;span style=&#34;({REMOVED_INNER_STYLE}|{ADDED_INNER_STYLE})&#34;&gt;',
rf'&lt;span style=&#34;({re.escape(REMOVED_INNER_STYLE)}|{re.escape(ADDED_INNER_STYLE)})&#34;&gt;',
r'<span style="\1">',
result,
flags=re.IGNORECASE
@@ -65,6 +71,8 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
for _ in range(min(open_count, close_count)):
result = result.replace('&lt;/span&gt;', '</span>', 1)
# Not necessary because the CSS/HTML will lay it out by linefeed
result = result.replace(CUSTOM_LINEBREAK_PLACEHOLDER, '')
return Markup(result)
@views_blueprint.route("/preview/<string:uuid>", methods=['GET'])
@@ -260,7 +268,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
word_diff=diff_prefs.get('diff_type') == 'diffWords',
context_lines=5
)
content = content.replace(CUSTOM_LINEBREAK_PLACEHOLDER, '<br>')
content = apply_html_color_to_body(n_body=content)
output = render_template("diff.html",