Notifications - Word difference on HTML style notifications should be configurable, add tests. Re #3740

changedetectionio/__init__.py

@@ -2,7 +2,7 @@
 
 # Read more https://github.com/dgtlmoon/changedetection.io/wiki
 # Semver means never use .01, or 00. Should be .1.
-__version__ = '0.52.6'
+__version__ = '0.52.4'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError
@@ -41,10 +41,9 @@ from loguru import logger
 #
 # IMPLEMENTATION:
 #   1. Explicit contexts everywhere (primary protection):
+#      - Watch.py: ctx = multiprocessing.get_context('spawn')
 #      - playwright.py: ctx = multiprocessing.get_context('spawn')
 #      - puppeteer.py: ctx = multiprocessing.get_context('spawn')
-#      - isolated_opencv.py: ctx = multiprocessing.get_context('spawn')
-#      - isolated_libvips.py: ctx = multiprocessing.get_context('spawn')
 #
 #   2. Global default (defense-in-depth, below):
 #      - Safety net if future code forgets explicit context

changedetectionio/blueprint/settings/templates/settings.html

@@ -86,6 +86,10 @@
             <div class="tab-pane-inner" id="notifications">
                 <fieldset>
                     {{ render_common_settings_form(form.application.form, emailprefix, settings_application, extra_notification_token_placeholder_info) }}
+                </fieldset>
+                 <fieldset class="pure-group">
+                    {{ render_checkbox_field(form.application.form.notification_html_word_diff_enabled) }}
+                    <span class="pure-form-message-inline">HTML notifications - Use "word by word" difference where possible.</span>
                 </fieldset>
                 <div class="pure-control-group" id="notification-base-url">
                     {{ render_field(form.application.form.base_url, class="m-d") }}

changedetectionio/blueprint/watchlist/__init__.py

@@ -2,6 +2,7 @@ import os
 import time
 
 from flask import Blueprint, request, make_response, render_template, redirect, url_for, flash, session
+from flask_login import current_user
 from flask_paginate import Pagination, get_page_parameter
 
 from changedetectionio import forms
@@ -84,7 +85,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             app_rss_token=datastore.data['settings']['application'].get('rss_access_token'),
             datastore=datastore,
             errored_count=errored_count,
-            extra_classes='has-queue' if len(update_q.queue) else '',
             form=form,
             generate_tag_colors=processors.generate_processor_badge_colors,
             guid=datastore.data['app_guid'],
@@ -92,10 +92,9 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             hosted_sticky=os.getenv("SALTED_PASS", False) == False,
             now_time_server=round(time.time()),
             pagination=pagination,
-            processor_badge_css=processors.get_processor_badge_css(),
             processor_badge_texts=processors.get_processor_badge_texts(),
             processor_descriptions=processors.get_processor_descriptions(),
-            queue_size=len(update_q.queue),
+            processor_badge_css=processors.get_processor_badge_css(),
             queued_uuids=[q_uuid.item['uuid'] for q_uuid in update_q.queue],
             search_q=request.args.get('q', '').strip(),
             sort_attribute=request.args.get('sort') if request.args.get('sort') else request.cookies.get('sort'),

changedetectionio/blueprint/watchlist/templates/watch-overview.html

@@ -99,14 +99,9 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
                        data-confirm-message="{{ _('<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>') }}"
                        data-confirm-button="{{ _('Delete') }}"><i data-feather="trash" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Delete') }}</button>
     </div>
-
-    <div id="stats_row">
-        <div class="left">{%- if watches|length >= pagination.per_page -%}{{ pagination.info }}{%- endif -%}</div>
-        <div class="right" >{{ _('Queued size') }}: <span id="queue-size-int">{{ queue_size }}</span></div>
-    </div>
-
-
-
+    {%- if watches|length >= pagination.per_page -%}
+        {{ pagination.info }}
+    {%- endif -%}
     {%- if search_q -%}<div id="search-result-info">{{ _('Searching') }} "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
     <div>
         <a href="{{url_for('watchlist.index')}}" class="pure-button button-tag {{'active' if not active_tag_uuid }}">{{ _('All') }}</a>

changedetectionio/flask_app.py

@@ -9,7 +9,6 @@ import threading
 import time
 import timeago
 from blinker import signal
-from pathlib import Path
 
 from changedetectionio.strtobool import strtobool
 from threading import Event
@@ -85,10 +84,6 @@ app.config['NEW_VERSION_AVAILABLE'] = False
 if os.getenv('FLASK_SERVER_NAME'):
     app.config['SERVER_NAME'] = os.getenv('FLASK_SERVER_NAME')
 
-# Babel/i18n configuration
-app.config['BABEL_TRANSLATION_DIRECTORIES'] = str(Path(__file__).parent / 'translations')
-app.config['BABEL_DEFAULT_LOCALE'] = 'en_GB'
-
 #app.config["EXPLAIN_TEMPLATE_LOADING"] = True
 
 
@@ -400,9 +395,13 @@ def changedetection_app(config=None, datastore_o=None):
     def get_locale():
         # 1. Try to get locale from session (user explicitly selected)
         if 'locale' in session:
-            return session['locale']
+            locale = session['locale']
+            logger.trace(f"DEBUG: get_locale() returning from session: {locale}")
+            return locale
         # 2. Fall back to Accept-Language header
-        return request.accept_languages.best_match(language_codes)
+        locale = request.accept_languages.best_match(language_codes)
+        logger.trace(f"DEBUG: get_locale() returning from Accept-Language: {locale}")
+        return locale
 
     # Initialize Babel with locale selector
     babel = Babel(app, locale_selector=get_locale)
@@ -519,20 +518,9 @@ def changedetection_app(config=None, datastore_o=None):
     @app.route('/set-language/<locale>')
     def set_language(locale):
         """Set the user's preferred language in the session"""
-        if not request.cookies:
-            logger.error("Cannot set language without session cookie")
-            flash("Cannot set language without session cookie", 'error')
-            return redirect(url_for('watchlist.index'))
-
         # Validate the locale against available languages
         if locale in language_codes:
             session['locale'] = locale
-
-            # CRITICAL: Flask-Babel caches the locale in the request context (ctx.babel_locale)
-            # We must refresh to clear this cache so the new locale takes effect immediately
-            # This is especially important for tests where multiple requests happen rapidly
-            from flask_babel import refresh
-            refresh()
         else:
             logger.error(f"Invalid locale {locale}, available: {language_codes}")
 

changedetectionio/forms.py

@@ -991,6 +991,7 @@ class globalSettingsApplicationForm(commonSettingsForm):
                            render_kw={"placeholder": os.getenv('BASE_URL', 'Not set')}
                            )
     empty_pages_are_a_change =  BooleanField(_l('Treat empty pages as a change?'), default=False)
+    notification_html_word_diff_enabled = BooleanField(_l('Notification HTML as word-by-word difference'), default=True, validators=[validators.Optional()])
     fetch_backend = RadioField(_l('Fetch Method'), default="html_requests", choices=content_fetchers.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
     global_ignore_text = StringListField(_l('Ignore Text'), [ValidateListRegex()])
     global_subtractive_selectors = StringListField(_l('Remove elements'), [ValidateCSSJSONXPATHInput(allow_json=False)])

changedetectionio/languages.py

@@ -29,9 +29,7 @@ def get_timeago_locale(flask_locale):
     """
     locale_map = {
         'zh': 'zh_CN',      # Chinese Simplified
-        # timeago library just hasn't been updated to use the more modern locale naming convention, before BCP 47 / RFC 5646.
-        'zh_TW': 'zh_TW',   # Chinese Traditional (timeago uses zh_TW)
-        'zh_Hant_TW': 'zh_TW',  # Flask-Babel normalizes zh_TW to zh_Hant_TW, map back to timeago's zh_TW
+        'zh_Hant_TW': 'zh_TW',  # Flask-Babel normalizes zh_TW to zh_Hant_TW
         'pt': 'pt_PT',      # Portuguese (Portugal)
         'sv': 'sv_SE',      # Swedish
         'no': 'nb_NO',      # Norwegian Bokmål
@@ -56,7 +54,7 @@ LANGUAGE_DATA = {
     'it': {'flag': 'fi fi-it fis', 'name': 'Italiano'},
     'ja': {'flag': 'fi fi-jp fis', 'name': '日本語'},
     'zh': {'flag': 'fi fi-cn fis', 'name': '中文 (简体)'},
-    'zh_Hant_TW': {'flag': 'fi fi-tw fis', 'name': '繁體中文'},
+    'zh_TW': {'flag': 'fi fi-tw fis', 'name': '繁體中文'},
     'ru': {'flag': 'fi fi-ru fis', 'name': 'Русский'},
     'pl': {'flag': 'fi fi-pl fis', 'name': 'Polski'},
     'nl': {'flag': 'fi fi-nl fis', 'name': 'Nederlands'},

changedetectionio/model/App.py

@@ -49,6 +49,7 @@ class model(dict):
                     'ssim_threshold': '0.96',  # Default SSIM threshold for screenshot comparison
                     'notification_body': default_notification_body,
                     'notification_format': default_notification_format,
+                    'notification_html_word_diff': True,
                     'notification_title': default_notification_title,
                     'notification_urls': [], # Apprise URL list
                     'pager_size': 50,

changedetectionio/model/Watch.py

@@ -18,31 +18,21 @@ BROTLI_COMPRESS_SIZE_THRESHOLD = int(os.getenv('SNAPSHOT_BROTLI_COMPRESSION_THRE
 minimum_seconds_recheck_time = int(os.getenv('MINIMUM_SECONDS_RECHECK_TIME', 3))
 mtable = {'seconds': 1, 'minutes': 60, 'hours': 3600, 'days': 86400, 'weeks': 86400 * 7}
 
-def _brotli_save(contents, filepath, mode=None, fallback_uncompressed=False):
+def _brotli_compress_worker(conn, filepath, mode=None):
     """
-    Save compressed data using native brotli.
-    Testing shows no memory leak when using gc.collect() after compression.
+    Worker function to compress data with brotli in a separate process.
+    This isolates memory - when process exits, OS reclaims all memory.
 
     Args:
-        contents: data to compress (str or bytes)
+        conn: multiprocessing.Pipe connection to receive data
         filepath: destination file path
         mode: brotli compression mode (e.g., brotli.MODE_TEXT)
-        fallback_uncompressed: if True, save uncompressed on failure; if False, raise exception
-
-    Returns:
-        str: actual filepath saved (may differ from input if fallback used)
-
-    Raises:
-        Exception: if compression fails and fallback_uncompressed is False
     """
     import brotli
-    import gc
-
-    # Ensure contents are bytes
-    if isinstance(contents, str):
-        contents = contents.encode('utf-8')
 
     try:
+        # Receive data from parent process via pipe (avoids pickle overhead)
+        contents = conn.recv()
         logger.debug(f"Starting brotli compression of {len(contents)} bytes.")
 
         if mode is not None:
@@ -53,25 +43,111 @@ def _brotli_save(contents, filepath, mode=None, fallback_uncompressed=False):
         with open(filepath, 'wb') as f:
             f.write(compressed_data)
 
+        # Send success status back
+        conn.send(True)
         logger.debug(f"Finished brotli compression - From {len(contents)} to {len(compressed_data)} bytes.")
+        # No need for explicit cleanup - process exit frees all memory
+    except Exception as e:
+        logger.critical(f"Brotli compression worker failed: {e}")
+        conn.send(False)
+    finally:
+        conn.close()
 
-        # Force garbage collection to prevent memory buildup
-        gc.collect()
 
-        return filepath
+def _brotli_subprocess_save(contents, filepath, mode=None, timeout=30, fallback_uncompressed=False):
+    """
+    Save compressed data using subprocess to isolate memory.
+    Uses Pipe to avoid pickle overhead for large data.
+
+    Args:
+        contents: data to compress (str or bytes)
+        filepath: destination file path
+        mode: brotli compression mode (e.g., brotli.MODE_TEXT)
+        timeout: subprocess timeout in seconds
+        fallback_uncompressed: if True, save uncompressed on failure; if False, raise exception
+
+    Returns:
+        str: actual filepath saved (may differ from input if fallback used)
+
+    Raises:
+        Exception: if compression fails and fallback_uncompressed is False
+    """
+    import multiprocessing
+    import sys
+
+    # Ensure contents are bytes
+    if isinstance(contents, str):
+        contents = contents.encode('utf-8')
+
+    # Use explicit spawn context for thread safety (avoids fork() with multi-threaded parent)
+    # Always use spawn - consistent behavior in tests and production
+    ctx = multiprocessing.get_context('spawn')
+    parent_conn, child_conn = ctx.Pipe()
+
+    # Run compression in subprocess using spawn (not fork)
+    proc = ctx.Process(target=_brotli_compress_worker, args=(child_conn, filepath, mode))
+
+    # Windows-safe: Set daemon=False explicitly to avoid issues with process cleanup
+    proc.daemon = False
+    proc.start()
+
+    try:
+        # Send data to subprocess via pipe (avoids pickle)
+        parent_conn.send(contents)
+
+        # Wait for result with timeout
+        if parent_conn.poll(timeout):
+            success = parent_conn.recv()
+        else:
+            success = False
+            logger.warning(f"Brotli compression subprocess timed out after {timeout}s")
+            # Graceful termination with platform-aware cleanup
+            try:
+                proc.terminate()
+            except Exception as term_error:
+                logger.debug(f"Process termination issue (may be normal on Windows): {term_error}")
+
+        parent_conn.close()
+        proc.join(timeout=5)
+
+        # Force kill if still alive after graceful termination
+        if proc.is_alive():
+            try:
+                if sys.platform == 'win32':
+                    # Windows: use kill() which is more forceful
+                    proc.kill()
+                else:
+                    # Unix: terminate() already sent SIGTERM, now try SIGKILL
+                    proc.kill()
+                proc.join(timeout=2)
+            except Exception as kill_error:
+                logger.warning(f"Failed to kill brotli compression process: {kill_error}")
+
+        # Check if file was created successfully
+        if success and os.path.exists(filepath):
+            return filepath
 
     except Exception as e:
         logger.error(f"Brotli compression error: {e}")
+        try:
+            parent_conn.close()
+        except:
+            pass
+        try:
+            proc.terminate()
+            proc.join(timeout=2)
+        except:
+            pass
 
-        # Compression failed
-        if fallback_uncompressed:
-            logger.warning(f"Brotli compression failed for {filepath}, saving uncompressed")
-            fallback_path = filepath.replace('.br', '')
-            with open(fallback_path, 'wb') as f:
-                f.write(contents)
-            return fallback_path
-        else:
-            raise Exception(f"Brotli compression failed for {filepath}: {e}")
+    # Compression failed
+    if fallback_uncompressed:
+        logger.warning(f"Brotli compression failed for {filepath}, saving uncompressed")
+        fallback_path = filepath.replace('.br', '')
+        with open(fallback_path, 'wb') as f:
+            f.write(contents)
+        return fallback_path
+    else:
+        raise Exception(f"Brotli compression subprocess failed for {filepath}")
 
 
 class model(watch_base):
@@ -447,7 +523,7 @@ class model(watch_base):
 
                 if not os.path.exists(dest):
                     try:
-                        actual_dest = _brotli_save(contents, dest, mode=brotli.MODE_TEXT, fallback_uncompressed=True)
+                        actual_dest = _brotli_subprocess_save(contents, dest, mode=brotli.MODE_TEXT, fallback_uncompressed=True)
                         if actual_dest != dest:
                             snapshot_fname = os.path.basename(actual_dest)
                     except Exception as e:
@@ -873,13 +949,13 @@ class model(watch_base):
     def save_last_text_fetched_before_filters(self, contents):
         import brotli
         filepath = os.path.join(self.watch_data_dir, 'last-fetched.br')
-        _brotli_save(contents, filepath, mode=brotli.MODE_TEXT, fallback_uncompressed=False)
+        _brotli_subprocess_save(contents, filepath, mode=brotli.MODE_TEXT, fallback_uncompressed=False)
 
     def save_last_fetched_html(self, timestamp, contents):
         self.ensure_data_dir_exists()
         snapshot_fname = f"{timestamp}.html.br"
         filepath = os.path.join(self.watch_data_dir, snapshot_fname)
-        _brotli_save(contents, filepath, mode=None, fallback_uncompressed=True)
+        _brotli_subprocess_save(contents, filepath, mode=None, fallback_uncompressed=True)
         self._prune_last_fetched_html_snapshots()
 
     def get_fetched_html(self, timestamp):

changedetectionio/notification/handler.py

@@ -309,6 +309,9 @@ def process_notification(n_object: NotificationContextData, datastore):
     if not isinstance(n_object, NotificationContextData):
         raise TypeError(f"Expected NotificationContextData, got {type(n_object)}")
 
+    if not n_object.get('notification_urls'):
+        return None
+
     now = time.time()
     if n_object.get('notification_timestamp'):
         logger.trace(f"Time since queued {now-n_object['notification_timestamp']:.3f}s")
@@ -348,16 +351,15 @@ def process_notification(n_object: NotificationContextData, datastore):
     apprise.plugins.N_MGR.remove('discord')
     apprise.plugins.N_MGR.add(NotifyDiscordCustom, schemas='discord')
 
-    if not n_object.get('notification_urls'):
-        return None
+    # Should always be false for 'text' mode or its too hard to read, otherwise it's a setting (for html style).
+    word_diff_enable = requested_output_format_original == 'text' or (
+                n_object.get('notification_html_word_diff_enabled', True) and requested_output_format_original.startswith('html'))
 
     n_object.update(add_rendered_diff_to_notification_vars(
         notification_scan_text=n_object.get('notification_body', '')+n_object.get('notification_title', ''),
         current_snapshot=n_object.get('current_snapshot'),
         prev_snapshot=n_object.get('prev_snapshot'),
-        # Should always be false for 'text' mode or its too hard to read
-        # But otherwise, this could be some setting
-        word_diff=False if requested_output_format_original == 'text' else True,
+        word_diff=word_diff_enable
         )
     )
 

changedetectionio/notification_service.py

@@ -250,6 +250,7 @@ class NotificationService:
         if n_object.get('notification_format') == USE_SYSTEM_DEFAULT_NOTIFICATION_FORMAT_FOR_WATCH:
             n_object['notification_format'] = self.datastore.data['settings']['application'].get('notification_format')
 
+        n_object['notification_html_word_diff_enabled'] = self.datastore.data['settings']['application'].get('notification_html_word_diff_enabled', True)
 
         triggered_text = ''
         if len(trigger_text):

changedetectionio/processors/image_ssim_diff/image_handler/isolated_libvips.py

@@ -13,9 +13,14 @@ Research: https://github.com/libvips/pyvips/issues/234
 
 import multiprocessing
 
-# CRITICAL: Use 'spawn' context instead of 'fork' to avoid inheriting parent's
+# CRITICAL: Use 'spawn' instead of 'fork' to avoid inheriting parent's
 # LibVIPS threading state which can cause hangs in gaussblur operations
 # https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
+try:
+    multiprocessing.set_start_method('spawn', force=False)
+except RuntimeError:
+    # Already set, ignore
+    pass
 
 
 def _worker_generate_diff(conn, img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height):
@@ -90,10 +95,9 @@ def generate_diff_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma,
     Returns:
         bytes: JPEG diff image or None on failure
     """
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
+    parent_conn, child_conn = multiprocessing.Pipe()
 
-    p = ctx.Process(
+    p = multiprocessing.Process(
         target=_worker_generate_diff,
         args=(child_conn, img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height)
     )
@@ -136,8 +140,7 @@ def calculate_change_percentage_isolated(img_bytes_from, img_bytes_to, threshold
     Returns:
         float: Change percentage
     """
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
+    parent_conn, child_conn = multiprocessing.Pipe()
 
     def _worker_calculate(conn):
         try:
@@ -182,7 +185,7 @@ def calculate_change_percentage_isolated(img_bytes_from, img_bytes_to, threshold
         finally:
             conn.close()
 
-    p = ctx.Process(target=_worker_calculate, args=(child_conn,))
+    p = multiprocessing.Process(target=_worker_calculate, args=(child_conn,))
     p.start()
 
     result = 0.0
@@ -230,8 +233,7 @@ def compare_images_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma,
         tuple: (changed_detected, change_percentage)
     """
     print(f"[Parent] Starting compare_images_isolated subprocess", flush=True)
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
+    parent_conn, child_conn = multiprocessing.Pipe()
 
     def _worker_compare(conn):
         try:
@@ -299,7 +301,7 @@ def compare_images_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma,
         finally:
             conn.close()
 
-    p = ctx.Process(target=_worker_compare, args=(child_conn,))
+    p = multiprocessing.Process(target=_worker_compare, args=(child_conn,))
     print(f"[Parent] Starting subprocess (pid will be assigned)", flush=True)
     p.start()
     print(f"[Parent] Subprocess started (pid={p.pid}), waiting for result (30s timeout)", flush=True)

changedetectionio/static/js/realtime.js

@@ -76,7 +76,7 @@ $(document).ready(function () {
 
     // Cache DOM elements for performance
     const queueBubble = document.getElementById('queue-bubble');
-    const queueSizePagerInfoText = document.getElementById('queue-size-int');
+
     // Only try to connect if authentication isn't required or user is authenticated
     // The 'is_authenticated' variable will be set in the template
     if (typeof is_authenticated !== 'undefined' ? is_authenticated : true) {
@@ -118,10 +118,6 @@ $(document).ready(function () {
 
             socket.on('queue_size', function (data) {
                 console.log(`${data.event_timestamp} - Queue size update: ${data.q_length}`);
-                if(queueSizePagerInfoText) {
-                    queueSizePagerInfoText.textContent = parseInt(data.q_length).toLocaleString() || 'None';
-                }
-                document.body.classList.toggle('has-queue', parseInt(data.q_length) > 0);
 
                 // Update queue bubble in action sidebar
                 //if (queueBubble) {

changedetectionio/static/styles/scss/parts/_pagination.scss

@@ -1,4 +1,6 @@
 .pagination-page-info {
+  color: #fff;
+  font-size: 0.85rem;
   text-transform: capitalize;
 }
 

changedetectionio/static/styles/scss/parts/_watch_table.scss

@@ -1,32 +1,4 @@
 /* table related */
-#stats_row {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  color: #fff;
-  font-size: 0.85rem;
-  >* {
-    padding-bottom: 0.5rem;
-  }
-  .left {
-    text-align: left;
-  }
-
-  .right {
-    opacity: 0.5;
-    transition: opacity 0.6s ease;
-    margin-left: auto; /* pushes it to the far right */
-    text-align: right;
-  }
-}
-body.has-queue {
-  #stats_row {
-    .right {
-      opacity: 1.0;
-    }
-  }
-}
-
 .watch-table {
   width: 100%;
   font-size: 80%;

changedetectionio/templates/_common_fields.html

@@ -1,5 +1,5 @@
 
-{% from '_helpers.html' import render_field %}
+{% from '_helpers.html' import render_field, render_checkbox_field %}
 
 {% macro show_token_placeholders(extra_notification_token_placeholder_info, suffix="") %}
 
@@ -8,9 +8,7 @@
             <span class="pure-form-message-inline">
         Body for all notifications &dash; You can use <a target="newwindow" href="https://jinja.palletsprojects.com/en/3.0.x/templates/">Jinja2</a> templating in the notification title, body and URL, and tokens from below.
     </span><br>
-        <div data-target="#notification-tokens-info{{ suffix }}" class="toggle-show pure-button button-tag button-xsmall">Show
-            token/placeholders
-        </div>
+        <div data-target="#notification-tokens-info{{ suffix }}" class="toggle-show pure-button button-tag button-xsmall">Show extra help and tokens</div>
     </div>
     <div class="pure-controls" style="display: none;" id="notification-tokens-info{{ suffix }}">
         <table class="pure-table" id="token-table">
@@ -105,11 +103,30 @@
                 {% endif %}
             </tbody>
         </table>
-
-        <span class="pure-form-message-inline">
+        <br>
+        <div class="pure-form-message-inline">
         Warning: Contents of <code>{{ '{{diff}}' }}</code>, <code>{{ '{{diff_removed}}' }}</code>, and <code>{{ '{{diff_added}}' }}</code> depend on how the difference algorithm perceives the change. <br>
-        For example, an addition or removal could be perceived as a change in some cases. <a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/wiki/Using-the-%7B%7Bdiff%7D%7D,-%7B%7Bdiff_added%7D%7D,-and-%7B%7Bdiff_removed%7D%7D-notification-tokens">More Here</a> <br>
-        </span>
+        For example, an addition or removal could be perceived as a change in some cases. <a target="newwindow"  href="https://github.com/dgtlmoon/changedetection.io/wiki/Using-the-%7B%7Bdiff%7D%7D,-%7B%7Bdiff_added%7D%7D,-and-%7B%7Bdiff_removed%7D%7D-notification-tokens">More Here</a> <br>
+        </div>
+    <br><br>
+        <div class="pure-form-message-inline">
+            <ul>
+                <li><span class="pure-form-message-inline">
+                For JSON payloads, use <strong>|tojson</strong> without quotes for automatic escaping, for example - <code>{ "name": {{ '{{ watch_title|tojson }}' }} }</code>
+            </span></li>
+                <li><span class="pure-form-message-inline">
+                URL encoding, use <strong>|urlencode</strong>, for example - <code>gets://hook-website.com/test.php?title={{ '{{ watch_title|urlencode }}' }}</code>
+            </span></li>
+                <li><span class="pure-form-message-inline">
+                Regular-expression replace, use <strong>|regex_replace</strong>, for example -   <code>{{ "{{ \"hello world 123\" | regex_replace('[0-9]+', 'no-more-numbers') }}" }}</code>
+            </span></li>
+                <li><span class="pure-form-message-inline">
+                For a complete reference of all Jinja2 built-in filters, users can refer to the <a
+                        href="https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters">https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters</a>
+            </span></li>
+            </ul>
+            <br>
+        </div>
     </div>
 {%  endmacro %}
 
@@ -151,28 +168,11 @@
                                 {{ render_field(form.notification_title, class="m-d notification-title", placeholder=settings_application['notification_title']) }}
                                 <span class="pure-form-message-inline">Title for all notifications</span>
                             </div>
-                            <div class="pure-control-group">
+                            <div>
                                 {{ render_field(form.notification_body , rows=5, class="notification-body", placeholder=settings_application['notification_body']) }}
                                 {{ show_token_placeholders(extra_notification_token_placeholder_info=extra_notification_token_placeholder_info) }}
-                                <div class="pure-form-message-inline">
-                                    <ul>
-                                    <li><span class="pure-form-message-inline">
-                                        For JSON payloads, use <strong>|tojson</strong> without quotes for automatic escaping, for example - <code>{ "name": {{ '{{ watch_title|tojson }}' }} }</code>
-                                    </span></li>
-                                    <li><span class="pure-form-message-inline">
-                                        URL encoding, use <strong>|urlencode</strong>, for example - <code>gets://hook-website.com/test.php?title={{ '{{ watch_title|urlencode }}' }}</code>
-                                    </span></li>
-                                    <li><span class="pure-form-message-inline">
-                                        Regular-expression replace, use <strong>|regex_replace</strong>, for example -   <code>{{ "{{ \"hello world 123\" | regex_replace('[0-9]+', 'no-more-numbers') }}" }}</code>
-                                    </span></li>
-                                    <li><span class="pure-form-message-inline">
-                                        For a complete reference of all Jinja2 built-in filters, users can refer to the <a href="https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters">https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters</a>
-                                    </span></li>
-                                    </ul>
-                                    <br>
-                                </div>
                             </div>
-                            <div class="">
+                            <div>
                                 {{ render_field(form.notification_format , class="notification-format") }}
                                 <span class="pure-form-message-inline">Format for all notifications</span>
                             </div>

changedetectionio/templates/base.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ get_locale()|replace('_', '-') }}" data-darkmode="{{ get_darkmode_state() }}">
+<html lang="{{ get_locale() }}" data-darkmode="{{ get_darkmode_state() }}">
 
   <head>
     <meta charset="utf-8" >

changedetectionio/tests/test_i18n.py

@@ -1,71 +1,7 @@
 #!/usr/bin/env python3
 
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks
-
-
-def test_zh_TW(client, live_server, measure_memory_usage, datastore_path):
-    import time
-    test_url = url_for('test_endpoint', _external=True)
-
-    # Be sure we got a session cookie
-    res = client.get(url_for("watchlist.index"), follow_redirects=True)
-
-    res = client.get(
-        url_for("set_language", locale="zh_Hant_TW"), # Traditional
-        follow_redirects=True
-    )
-    # HTML follows BCP 47 language tag rules, not underscore-based locale formats.
-    assert b'<html lang="zh-Hant-TW"' in res.data
-    assert b'Cannot set language without session cookie' not in res.data
-    assert '選擇語言'.encode() in res.data
-
-    # Check second set works
-    res = client.get(
-        url_for("set_language", locale="en_GB"),
-        follow_redirects=True
-    )
-    assert b'Cannot set language without session cookie' not in res.data
-    res = client.get(url_for("watchlist.index"), follow_redirects=True)
-    assert b"Select Language" in res.data, "Second set of language worked"
-
-    # Check arbitration between zh_Hant_TW<->zh
-    res = client.get(
-        url_for("set_language", locale="zh"), # Simplified chinese
-        follow_redirects=True
-    )
-    res = client.get(url_for("watchlist.index"), follow_redirects=True)
-    assert "选择语言".encode() in res.data, "Simplified chinese worked and it means the flask-babel cache worked"
-
-
-# timeago library just hasn't been updated to use the more modern locale naming convention, before BCP 47 / RFC 5646.
-# The Python timeago library (https://github.com/hustcc/timeago) supports 48 locales but uses different naming conventions than Flask-Babel.
-def test_zh_Hant_TW_timeago_integration():
-    """Test that zh_Hant_TW mapping works and timeago renders Traditional Chinese correctly"""
-    import timeago
-    from datetime import datetime, timedelta
-    from changedetectionio.languages import get_timeago_locale
-
-    # 1. Test the mapping
-    mapped_locale = get_timeago_locale('zh_Hant_TW')
-    assert mapped_locale == 'zh_TW', "zh_Hant_TW should map to timeago's zh_TW"
-    assert get_timeago_locale('zh_TW') == 'zh_TW', "zh_TW should also map to zh_TW"
-
-    # 2. Test timeago library renders Traditional Chinese with the mapped locale
-    now = datetime.now()
-
-    # Test various time periods with Traditional Chinese strings
-    result_15s = timeago.format(now - timedelta(seconds=15), now, mapped_locale)
-    assert '秒前' in result_15s, f"Expected '秒前' in '{result_15s}'"
-
-    result_5m = timeago.format(now - timedelta(minutes=5), now, mapped_locale)
-    assert '分鐘前' in result_5m, f"Expected '分鐘前' in '{result_5m}'"
-
-    result_2h = timeago.format(now - timedelta(hours=2), now, mapped_locale)
-    assert '小時前' in result_2h, f"Expected '小時前' in '{result_2h}'"
-
-    result_3d = timeago.format(now - timedelta(days=3), now, mapped_locale)
-    assert '天前' in result_3d, f"Expected '天前' in '{result_3d}'"
+from .util import live_server_setup
 
 
 def test_language_switching(client, live_server, measure_memory_usage, datastore_path):
@@ -77,9 +13,6 @@ def test_language_switching(client, live_server, measure_memory_usage, datastore
     3. Switch back to English and verify English text appears
     """
 
-    # Establish session cookie
-    client.get(url_for("watchlist.index"), follow_redirects=True)
-
     # Step 1: Set the language to Italian using the /set-language endpoint
     res = client.get(
         url_for("set_language", locale="it"),
@@ -128,9 +61,6 @@ def test_invalid_locale(client, live_server, measure_memory_usage, datastore_pat
     The app should ignore invalid locales and continue working.
     """
 
-    # Establish session cookie
-    client.get(url_for("watchlist.index"), follow_redirects=True)
-
     # First set to English
     res = client.get(
         url_for("set_language", locale="en"),
@@ -163,9 +93,6 @@ def test_language_persistence_in_session(client, live_server, measure_memory_usa
     within the same session.
     """
 
-    # Establish session cookie
-    client.get(url_for("watchlist.index"), follow_redirects=True)
-
     # Set language to Italian
     res = client.get(
         url_for("set_language", locale="it"),
@@ -192,9 +119,6 @@ def test_set_language_with_redirect(client, live_server, measure_memory_usage, d
     """
     from flask import url_for
 
-    # Establish session cookie
-    client.get(url_for("watchlist.index"), follow_redirects=True)
-
     # Set language with a redirect parameter (simulating language change from /settings)
     res = client.get(
         url_for("set_language", locale="de", redirect="/settings"),

changedetectionio/tests/test_notification.py

@@ -532,7 +532,7 @@ def test_single_send_test_notification_on_watch(client, live_server, measure_mem
         assert 'Current snapshot: Example text: example test' in x
     os.unlink(os.path.join(datastore_path, "notification.txt"))
 
-def _test_color_notifications(client, notification_body_token, datastore_path):
+def _test_color_notifications(client, notification_body_token, datastore_path, word_diff_enabled = True):
 
     set_original_response(datastore_path=datastore_path)
 
@@ -551,6 +551,7 @@ def _test_color_notifications(client, notification_body_token, datastore_path):
             "application-minutes_between_check": 180,
             "application-notification_body": notification_body_token,
             "application-notification_format": "htmlcolor",
+            "application-notification_html_word_diff_enabled": 'y' if word_diff_enabled else '',
             "application-notification_urls": test_notification_url,
             "application-notification_title": "New ChangeDetection.io Notification - {{ watch_url }}",
         },
@@ -559,17 +560,13 @@ def _test_color_notifications(client, notification_body_token, datastore_path):
     assert b'Settings updated' in res.data
 
     test_url = url_for('test_endpoint', _external=True)
-    res = client.post(
-        url_for("ui.ui_views.form_quick_watch_add"),
-        data={"url": test_url, "tags": 'nice one'},
-        follow_redirects=True
-    )
-
-    assert b"Watch added" in res.data
+    uuid = client.application.config.get('DATASTORE').add_watch(url=test_url)
+    res = client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
+    assert b'Queued 1 watch for rechecking.' in res.data
 
     wait_for_all_checks(client)
-
-    set_modified_response(datastore_path=datastore_path)
+    extras='XXX ' if word_diff_enabled else ''
+    set_modified_response(datastore_path=datastore_path, extras=extras)
 
 
     res = client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
@@ -579,9 +576,13 @@ def _test_color_notifications(client, notification_body_token, datastore_path):
     wait_for_notification_endpoint_output(datastore_path=datastore_path)
 
     with open(os.path.join(datastore_path, "notification.txt"), 'r') as f:
-        x = f.read()
+        contents = f.read()
         s = f'<span style="{HTML_CHANGED_STYLE}" role="note" aria-label="Changed text" title="Changed text">Which is across multiple lines</span><br>'
-        assert s in x
+        assert s in contents
+        if word_diff_enabled:
+            assert '>XXX</span>' in contents
+        else:
+            assert '>XXX</span>' not in contents
 
     client.get(
         url_for("ui.form_delete", uuid="all"),
@@ -590,6 +591,12 @@ def _test_color_notifications(client, notification_body_token, datastore_path):
 
 # Just checks the format of the colour notifications was correct
 def test_html_color_notifications(client, live_server, measure_memory_usage, datastore_path):
-    _test_color_notifications(client, '{{diff}}',datastore_path=datastore_path)
-    _test_color_notifications(client, '{{diff_full}}',datastore_path=datastore_path)
+    # Word-level diff only triggers when difflib.SequenceMatcher identifies a single-line to single-line replacement.
+    # If you have multiple changed lines close together, you need at least 1 unchanged content line (not empty) between them to
+    # prevent them from being grouped into a multi-line replacement that falls back to line-level diff.
 
+    _test_color_notifications(client, '{{diff}}',datastore_path=datastore_path, word_diff_enabled = True)
+    _test_color_notifications(client, '{{diff_full}}',datastore_path=datastore_path, word_diff_enabled = True)
+
+    _test_color_notifications(client, '{{diff}}',datastore_path=datastore_path, word_diff_enabled = False)
+    _test_color_notifications(client, '{{diff_full}}',datastore_path=datastore_path, word_diff_enabled = False)

changedetectionio/tests/util.py

@@ -7,7 +7,7 @@ import logging
 import time
 import os
 
-def set_original_response(datastore_path, extra_title=''):
+def set_original_response(datastore_path, extra_title='', extras=''):
     test_return_data = f"""<html>
     <head><title>head title{extra_title}</title></head>
     <body>
@@ -15,6 +15,9 @@ def set_original_response(datastore_path, extra_title=''):
      <p>Which is across multiple lines</p>
      <br>
      So let's see what happens.  <br>
+     with more text that helps word-diff if needed<br>
+     and more text that helps word-diff if needed<br>
+     and even more text {extras}that helps word-diff if needed<br>     
      <span class="foobar-detection" style='display:none'></span>
      </body>
      </html>
@@ -24,14 +27,17 @@ def set_original_response(datastore_path, extra_title=''):
         f.write(test_return_data)
     return None
 
-def set_modified_response(datastore_path):
-    test_return_data = """<html>
+def set_modified_response(datastore_path, extras=''):
+    test_return_data =f"""<html>
     <head><title>modified head title</title></head>
     <body>
      Some initial text<br>
      <p>which has this one new line</p>
      <br>
      So let's see what happens.  <br>
+     with more text that helps word-diff if needed<br>
+     and more text that helps word-diff if needed<br>
+     and even more text {extras}that helps word-diff if needed<br>     
      </body>
      </html>
     """
@@ -92,8 +98,8 @@ def wait_for_notification_endpoint_output(datastore_path):
     #@todo - could check the apprise object directly instead of looking for this file
     from os.path import isfile
     notification_file = os.path.join(datastore_path, "notification.txt")
-    for i in range(1, 20):
-        time.sleep(1)
+    for i in range(1, 100):
+        time.sleep(0.3)
         if isfile(notification_file):
             return True
 

requirements.txt

@@ -91,7 +91,7 @@ jq~=1.3; python_version >= "3.8" and sys_platform == "linux"
 
 # playwright is installed at Dockerfile build time because it's not available on all platforms
 
-pyppeteer-ng==2.0.0rc11
+pyppeteer-ng==2.0.0rc10
 pyppeteerstealth>=0.0.4
 
 # Include pytest, so if theres a support issue we can ask them to run these tests on their setup
@@ -100,7 +100,7 @@ pytest-flask ~=1.3
 pytest-mock ~=3.15
 
 # Anything 4.0 and up but not 5.0
-jsonschema ~= 4.26
+jsonschema ~= 4.25
 
 # OpenAPI validation support
 openapi-core[flask] >= 0.19.0