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

Multi-language / Translations Support (#3696)
  - Complete internationalization system implemented
  - Support for 7 languages: Czech (cs), German (de), French (fr), Italian (it), Korean (ko), Chinese Simplified (zh), Chinese Traditional (zh_TW)
  - Language selector with localized flags and theming
  - Flash message translations
  - Multiple translation fixes and improvements across all languages
  - Language setting preserved across redirects

  Pluggable Content Fetchers (#3653)
  - New architecture for extensible content fetcher system
  - Allows custom fetcher implementations

  Image / Screenshot Comparison Processor (#3680)
  - New processor for visual change detection (disabled for this release)
  - Supporting CSS/JS infrastructure added

  UI Improvements

  Design & Layout
  - Auto-generated tag color schemes
  - Simplified login form styling
  - Removed hard-coded CSS, moved to SCSS variables
  - Tag UI cleanup and improvements
  - Automatic tab wrapper functionality
  - Menu refactoring for better organization
  - Cleanup of offset settings
  - Hide sticky tabs on narrow viewports
  - Improved responsive layout (#3702)

  User Experience
  - Modal alerts/confirmations on delete/clear operations (#3693, #3598, #3382)
  - Auto-add https:// to URLs in quickwatch form if not present
  - Better redirect handling on login (#3699)
  - 'Recheck all' now returns to correct group/tag (#3673)
  - Language set redirect keeps hash fragment
  - More friendly human-readable text throughout UI

  Performance & Reliability

  Scheduler & Processing
  - Soft delays instead of blocking time.sleep() calls (#3710)
  - More resilient handling of same UUID being processed (#3700)
  - Better Puppeteer timeout handling
  - Improved Puppeteer shutdown/cleanup (#3692)
  - Requests cleanup now properly async

  History & Rendering
  - Faster server-side "difference" rendering on History page (#3442)
  - Show ignored/triggered rows in history
  - API: Retry watch data if watch dict changed (more reliable)

  API Improvements

  - Watch get endpoint: retry mechanism for changed watch data
  - WatchHistoryDiff API endpoint includes extra format args (#3703)

  Testing Improvements

  - Replace time.sleep with wait_for_notification_endpoint_output (#3716)
  - Test for mode switching (#3701)
  - Test for #3720 added (#3725)
  - Extract-text difference test fixes
  - Improved dev workflow

  Bug Fixes

  - Notification error text output (#3672, #3669, #3280)
  - HTML validation fixes (#3704)
  - Template discovery path fixes
  - Notification debug log now uses system locale for dates/times
  - Puppeteer spelling mistake in log output
  - Recalculation on anchor change
  - Queue bubble update disabled temporarily

  Dependency Updates

  - beautifulsoup4 updated (#3724)
  - psutil 7.1.0 → 7.2.1 (#3723)
  - python-engineio ~=4.12.3 → ~=4.13.0 (#3707)
  - python-socketio ~=5.14.3 → ~=5.16.0 (#3706)
  - flask-socketio ~=5.5.1 → ~=5.6.0 (#3691)
  - brotli ~=1.1 → ~=1.2 (#3687)
  - lxml updated (#3590)
  - pytest ~=7.2 → ~=9.0 (#3676)
  - jsonschema ~=4.0 → ~=4.25 (#3618)
  - pluggy ~=1.5 → ~=1.6 (#3616)
  - cryptography 44.0.1 → 46.0.3 (security) (#3589)

  Documentation

  - README updated with viewport size setup information

  Development Infrastructure

  - Dev container only built on dev branch
  - Improved dev workflow tooling

MANIFEST.in

@@ -11,6 +11,7 @@ recursive-include changedetectionio/realtime *
 recursive-include changedetectionio/static *
 recursive-include changedetectionio/templates *
 recursive-include changedetectionio/tests *
+recursive-include changedetectionio/translations *
 recursive-include changedetectionio/widgets *
 prune changedetectionio/static/package-lock.json
 prune changedetectionio/static/styles/node_modules

README.md

@@ -183,6 +183,9 @@ docker compose pull && docker compose up -d
 
 See the wiki for more information https://github.com/dgtlmoon/changedetection.io/wiki
 
+## Different browser viewport sizes (mobile, desktop etc)
+
+If you are using the recommended `sockpuppetbrowser` (which is in the docker-compose.yml as a setting to be uncommented) you can easily set different viewport sizes for your web page change detection, [see more information here about setting up different viewport sizes](https://github.com/dgtlmoon/sockpuppetbrowser?tab=readme-ov-file#setting-viewport-size).
 
 ## Filters
 

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.51.4'
+__version__ = '0.52.4'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError

changedetectionio/api/Watch.py

@@ -64,8 +64,17 @@ class Watch(Resource):
     @validate_openapi_request('getWatch')
     def get(self, uuid):
         """Get information about a single watch, recheck, pause, or mute."""
+        import time
         from copy import deepcopy
-        watch = deepcopy(self.datastore.data['watching'].get(uuid))
+        watch = None
+        for _ in range(20):
+            try:
+                watch = deepcopy(self.datastore.data['watching'].get(uuid))
+                break
+            except RuntimeError:
+                # Incase dict changed, try again
+                time.sleep(0.01)
+
         if not watch:
             abort(404, message='No watch exists with the UUID of {}'.format(uuid))
 
@@ -302,18 +311,28 @@ class WatchHistoryDiff(Resource):
         from_version_file_contents = watch.get_history_snapshot(from_timestamp)
         to_version_file_contents = watch.get_history_snapshot(to_timestamp)
 
-        # Get diff preferences (using defaults similar to the existing code)
-        diff_prefs = {
-            'diff_ignoreWhitespace': False,
-            'diff_changesOnly': True
-        }
+        # Get diff preferences from query parameters (matching UI preferences in DIFF_PREFERENCES_CONFIG)
+        # Support both 'type' (UI parameter) and 'word_diff' (API parameter) for backward compatibility
+        diff_type = request.args.get('type', 'diffLines')
+        if diff_type == 'diffWords':
+            word_diff = True
 
-        # Generate the diff
+        # Get boolean diff preferences with defaults from DIFF_PREFERENCES_CONFIG
+        changes_only = strtobool(request.args.get('changesOnly', 'true'))
+        ignore_whitespace = strtobool(request.args.get('ignoreWhitespace', 'false'))
+        include_removed = strtobool(request.args.get('removed', 'true'))
+        include_added = strtobool(request.args.get('added', 'true'))
+        include_replaced = strtobool(request.args.get('replaced', 'true'))
+
+        # Generate the diff with all preferences
         content = diff.render_diff(
             previous_version_file_contents=from_version_file_contents,
             newest_version_file_contents=to_version_file_contents,
-            ignore_junk=diff_prefs.get('diff_ignoreWhitespace'),
-            include_equal=not diff_prefs.get('diff_changesOnly'),
+            ignore_junk=ignore_whitespace,
+            include_equal=changes_only,
+            include_removed=include_removed,
+            include_added=include_added,
+            include_replaced=include_replaced,
             word_diff=word_diff,
         )
 

changedetectionio/async_update_worker.py

@@ -1,5 +1,4 @@
 from blinker import signal
-
 from .processors.exceptions import ProcessorException
 import changedetectionio.content_fetchers.exceptions as content_fetchers_exceptions
 from changedetectionio.processors.text_json_diff.processor import FilterNotFoundInResponse
@@ -9,7 +8,6 @@ from changedetectionio.flask_app import watch_check_update
 import asyncio
 import importlib
 import os
-import queue
 import time
 
 from loguru import logger
@@ -17,36 +15,48 @@ from loguru import logger
 # Async version of update_worker
 # Processes jobs from AsyncSignalPriorityQueue instead of threaded queue
 
-async def async_update_worker(worker_id, q, notification_q, app, datastore):
+async def async_update_worker(worker_id, q, notification_q, app, datastore, executor=None):
     """
     Async worker function that processes watch check jobs from the queue.
-    
+
     Args:
         worker_id: Unique identifier for this worker
         q: AsyncSignalPriorityQueue containing jobs to process
         notification_q: Standard queue for notifications
         app: Flask application instance
         datastore: Application datastore
+        executor: ThreadPoolExecutor for queue operations (optional)
     """
     # Set a descriptive name for this task
     task = asyncio.current_task()
     if task:
         task.set_name(f"async-worker-{worker_id}")
-    
+
     logger.info(f"Starting async worker {worker_id}")
-    
+
     while not app.config.exit.is_set():
         update_handler = None
         watch = None
 
         try:
-            # Use native janus async interface - no threads needed!
-            queued_item_data = await asyncio.wait_for(q.async_get(), timeout=1.0)
+            # Use sync interface via run_in_executor since each worker has its own event loop
+            loop = asyncio.get_event_loop()
+            queued_item_data = await asyncio.wait_for(
+                loop.run_in_executor(executor, q.get, True, 1.0),  # block=True, timeout=1.0
+                timeout=1.5
+            )
 
         except asyncio.TimeoutError:
             # No jobs available, continue loop
             continue
         except Exception as e:
+            # Handle expected Empty exception from queue timeout
+            import queue
+            if isinstance(e, queue.Empty):
+                # Queue is empty, normal behavior - just continue
+                continue
+
+            # Unexpected exception - log as critical
             logger.critical(f"CRITICAL: Worker {worker_id} failed to get queue item: {type(e).__name__}: {e}")
 
             # Log queue health for debugging
@@ -414,14 +424,13 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                 datastore.update_watch(uuid=uuid, update_obj={'last_error': f"Worker error: {str(e)}"})
         
         finally:
-
-            try:
-                await update_handler.fetcher.quit(watch=watch)
-            except Exception as e:
-                logger.error(f"Exception while cleaning/quit after calling browser: {e}")
-
             # Always cleanup - this runs whether there was an exception or not
             if uuid:
+                try:
+                    if update_handler and hasattr(update_handler, 'fetcher') and update_handler.fetcher:
+                        await update_handler.fetcher.quit(watch=watch)
+                except Exception as e:
+                    logger.error(f"Exception while cleaning/quit after calling browser: {e}")
                 try:
                     # Mark UUID as no longer being processed by this worker
                     worker_handler.set_uuid_processing(uuid, worker_id=worker_id, processing=False)
@@ -460,7 +469,9 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                     logger.debug(f"Worker {worker_id} completed watch {uuid} in {time.time()-fetch_start_time:.2f}s")
                 except Exception as cleanup_error:
                     logger.error(f"Worker {worker_id} error during cleanup: {cleanup_error}")
-            
+
+            del(uuid)
+
             # Brief pause before continuing to avoid tight error loops (only on error)
             if 'e' in locals():
                 await asyncio.sleep(1.0)

changedetectionio/blueprint/backups/__init__.py

@@ -92,7 +92,12 @@ def construct_blueprint(datastore: ChangeDetectionStore):
 
         # Be sure we're written fresh
         datastore.sync_to_json()
-        zip_thread = threading.Thread(target=create_backup, args=(datastore.datastore_path, datastore.data.get("watching")))
+        zip_thread = threading.Thread(
+            target=create_backup,
+            args=(datastore.datastore_path, datastore.data.get("watching")),
+            daemon=True,
+            name="BackupCreator"
+        )
         zip_thread.start()
         backup_threads.append(zip_thread)
         flash(gettext("Backup building in background, check back in a few minutes."))

changedetectionio/blueprint/browser_steps/__init__.py

@@ -21,31 +21,154 @@ from changedetectionio.flask_app import login_optionally_required
 from loguru import logger
 
 browsersteps_sessions = {}
+browsersteps_watch_to_session = {}  # Maps watch_uuid -> browsersteps_session_id
 io_interface_context = None
 import json
 import hashlib
 from flask import Response
 import asyncio
 import threading
+import time
 
-def run_async_in_browser_loop(coro):
-    """Run async coroutine using the existing async worker event loop"""
-    from changedetectionio import worker_handler
-    
-    # Use the existing async worker event loop instead of creating a new one
-    if worker_handler.USE_ASYNC_WORKERS and worker_handler.async_loop and not worker_handler.async_loop.is_closed():
-        logger.debug("Browser steps using existing async worker event loop")
-        future = asyncio.run_coroutine_threadsafe(coro, worker_handler.async_loop)
-        return future.result()
-    else:
-        # Fallback: create a new event loop (for sync workers or if async loop not available)
-        logger.debug("Browser steps creating temporary event loop")
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
+# Dedicated event loop for ALL browser steps sessions
+_browser_steps_loop = None
+_browser_steps_thread = None
+_browser_steps_loop_lock = threading.Lock()
+
+def _start_browser_steps_loop():
+    """Start a dedicated event loop for browser steps in its own thread"""
+    global _browser_steps_loop
+
+    # Create and set the event loop for this thread
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    _browser_steps_loop = loop
+
+    logger.debug("Browser steps event loop started")
+
+    try:
+        # Run the loop forever - handles all browsersteps sessions
+        loop.run_forever()
+    except Exception as e:
+        logger.error(f"Browser steps event loop error: {e}")
+    finally:
         try:
-            return loop.run_until_complete(coro)
+            # Cancel all remaining tasks
+            pending = asyncio.all_tasks(loop)
+            for task in pending:
+                task.cancel()
+
+            # Wait for tasks to finish cancellation
+            if pending:
+                loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
+        except Exception as e:
+            logger.debug(f"Error during browser steps loop cleanup: {e}")
         finally:
             loop.close()
+            logger.debug("Browser steps event loop closed")
+
+def _ensure_browser_steps_loop():
+    """Ensure the browser steps event loop is running"""
+    global _browser_steps_loop, _browser_steps_thread
+
+    with _browser_steps_loop_lock:
+        if _browser_steps_thread is None or not _browser_steps_thread.is_alive():
+            logger.debug("Starting browser steps event loop thread")
+            _browser_steps_thread = threading.Thread(
+                target=_start_browser_steps_loop,
+                daemon=True,
+                name="BrowserStepsEventLoop"
+            )
+            _browser_steps_thread.start()
+
+            # Wait for the loop to be ready
+            timeout = 5.0
+            start_time = time.time()
+            while _browser_steps_loop is None:
+                if time.time() - start_time > timeout:
+                    raise RuntimeError("Browser steps event loop failed to start")
+                time.sleep(0.01)
+
+            logger.debug("Browser steps event loop thread started and ready")
+
+def run_async_in_browser_loop(coro):
+    """Run async coroutine using the dedicated browser steps event loop"""
+    _ensure_browser_steps_loop()
+
+    if _browser_steps_loop and not _browser_steps_loop.is_closed():
+        logger.debug("Browser steps using dedicated event loop")
+        future = asyncio.run_coroutine_threadsafe(coro, _browser_steps_loop)
+        return future.result()
+    else:
+        raise RuntimeError("Browser steps event loop is not available")
+
+def cleanup_expired_sessions():
+    """Remove expired browsersteps sessions and cleanup their resources"""
+    global browsersteps_sessions, browsersteps_watch_to_session
+
+    expired_session_ids = []
+
+    # Find expired sessions
+    for session_id, session_data in browsersteps_sessions.items():
+        browserstepper = session_data.get('browserstepper')
+        if browserstepper and browserstepper.has_expired:
+            expired_session_ids.append(session_id)
+
+    # Cleanup expired sessions
+    for session_id in expired_session_ids:
+        logger.debug(f"Cleaning up expired browsersteps session {session_id}")
+        session_data = browsersteps_sessions[session_id]
+
+        # Cleanup playwright resources asynchronously
+        browserstepper = session_data.get('browserstepper')
+        if browserstepper:
+            try:
+                run_async_in_browser_loop(browserstepper.cleanup())
+            except Exception as e:
+                logger.error(f"Error cleaning up session {session_id}: {e}")
+
+        # Remove from sessions dict
+        del browsersteps_sessions[session_id]
+
+        # Remove from watch mapping
+        for watch_uuid, mapped_session_id in list(browsersteps_watch_to_session.items()):
+            if mapped_session_id == session_id:
+                del browsersteps_watch_to_session[watch_uuid]
+                break
+
+    if expired_session_ids:
+        logger.info(f"Cleaned up {len(expired_session_ids)} expired browsersteps session(s)")
+
+def cleanup_session_for_watch(watch_uuid):
+    """Cleanup a specific browsersteps session for a watch UUID"""
+    global browsersteps_sessions, browsersteps_watch_to_session
+
+    session_id = browsersteps_watch_to_session.get(watch_uuid)
+    if not session_id:
+        logger.debug(f"No browsersteps session found for watch {watch_uuid}")
+        return
+
+    logger.debug(f"Cleaning up browsersteps session {session_id} for watch {watch_uuid}")
+
+    session_data = browsersteps_sessions.get(session_id)
+    if session_data:
+        browserstepper = session_data.get('browserstepper')
+        if browserstepper:
+            try:
+                run_async_in_browser_loop(browserstepper.cleanup())
+            except Exception as e:
+                logger.error(f"Error cleaning up session {session_id} for watch {watch_uuid}: {e}")
+
+        # Remove from sessions dict
+        del browsersteps_sessions[session_id]
+
+    # Remove from watch mapping
+    del browsersteps_watch_to_session[watch_uuid]
+
+    logger.debug(f"Cleaned up session for watch {watch_uuid}")
+
+    # Opportunistically cleanup any other expired sessions
+    cleanup_expired_sessions()
 
 def construct_blueprint(datastore: ChangeDetectionStore):
     browser_steps_blueprint = Blueprint('browser_steps', __name__, template_folder="templates")
@@ -123,6 +246,9 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         if not watch_uuid:
             return make_response('No Watch UUID specified', 500)
 
+        # Cleanup any existing session for this watch
+        cleanup_session_for_watch(watch_uuid)
+
         logger.debug("Starting connection with playwright")
         logger.debug("browser_steps.py connecting")
 
@@ -131,6 +257,10 @@ def construct_blueprint(datastore: ChangeDetectionStore):
             browsersteps_sessions[browsersteps_session_id] = run_async_in_browser_loop(
                 start_browsersteps_session(watch_uuid)
             )
+
+            # Store the mapping of watch_uuid -> browsersteps_session_id
+            browsersteps_watch_to_session[watch_uuid] = browsersteps_session_id
+
         except Exception as e:
             if 'ECONNREFUSED' in str(e):
                 return make_response('Unable to start the Playwright Browser session, is sockpuppetbrowser running? Network configuration is OK?', 401)

changedetectionio/blueprint/rss/single_watch.py

@@ -47,9 +47,6 @@ def construct_single_watch_routes(rss_blueprint, datastore):
         if len(dates) < 2:
             return f"Watch {uuid} does not have enough history snapshots to show changes (need at least 2)", 400
 
-        # Add uuid to watch for proper functioning
-        watch['uuid'] = uuid
-
         # Get the number of diffs to include (default: 5)
         rss_diff_length = datastore.data['settings']['application'].get('rss_diff_length', 5)
 
@@ -101,7 +98,7 @@ def construct_single_watch_routes(rss_blueprint, datastore):
                                      date_index_from, date_index_to)
 
             # Create and populate feed entry
-            guid = f"{watch['uuid']}/{timestamp_to}"
+            guid = f"{uuid}/{timestamp_to}"
             fe = fg.add_entry()
             title_suffix = f"Change @ {res['original_context']['change_datetime']}"
             populate_feed_entry(fe, watch, res.get('body', ''), guid, timestamp_to,

changedetectionio/blueprint/rss/tag.py

@@ -63,11 +63,8 @@ def construct_tag_routes(rss_blueprint, datastore):
 
             # Only include unviewed watches
             if not watch.viewed:
-                # Add uuid to watch for proper functioning
-                watch['uuid'] = uuid
-
-                # Include a link to the diff page
-                diff_link = {'href': url_for('ui.ui_diff.diff_history_page', uuid=watch['uuid'], _external=True)}
+                # Include a link to the diff page (use uuid from loop, don't modify watch dict)
+                diff_link = {'href': url_for('ui.ui_diff.diff_history_page', uuid=uuid, _external=True)}
 
                 # Get watch label
                 watch_label = get_watch_label(datastore, watch)

changedetectionio/blueprint/settings/templates/settings.html

@@ -85,9 +85,11 @@
 
             <div class="tab-pane-inner" id="notifications">
                 <fieldset>
-                    <div class="field-group">
-                        {{ render_common_settings_form(form.application.form, emailprefix, settings_application, extra_notification_token_placeholder_info) }}
-                    </div>
+                    {{ 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") }}
@@ -128,7 +130,7 @@
                 </div>
                 <div class="pure-control-group">
                     {{ render_field(form.requests.form.timeout) }}
-                    <span class="pure-form-message-inline">For regular plain requests (not chrome based), maximum number of seconds until timeout, 1-999.<br>
+                    <span class="pure-form-message-inline">For regular plain requests (not chrome based), maximum number of seconds until timeout, 1-999.</span><br>
                 </div>
                 <div class="pure-control-group inline-radio">
                     {{ render_field(form.requests.form.default_ua) }}
@@ -219,7 +221,7 @@ nav
                         <a id="chrome-extension-link"
                            title="Try our new Chrome Extension!"
                            href="https://chromewebstore.google.com/detail/changedetectionio-website/kefcfmgmlhmankjmnbijimhofdjekbop">
-                            <img alt="Chrome store icon" src="{{ url_for('static_content', group='images', filename='google-chrome-icon.png') }}" alt="Chrome">
+                            <img alt="Chrome store icon" src="{{ url_for('static_content', group='images', filename='google-chrome-icon.png') }}" >
                             Chrome Webstore
                         </a>
                     </p>
@@ -260,14 +262,14 @@ nav
                     Ensure the settings below are correct, they are used to manage the time schedule for checking your web page watches.
                 </div>
                 <div class="pure-control-group">
-                    <p><strong>UTC Time &amp Date from Server:</strong> <span id="utc-time" >{{ utc_time }}</span></p>
-                    <p><strong>Local Time &amp Date in Browser:</strong> <span class="local-time" data-utc="{{ utc_time }}"></span></p>
-                    <p>
+                    <p><strong>UTC Time &amp; Date from Server:</strong> <span id="utc-time" >{{ utc_time }}</span></p>
+                    <p><strong>Local Time &amp; Date in Browser:</strong> <span class="local-time" data-utc="{{ utc_time }}"></span></p>
+                    <div>
                        {{ render_field(form.application.form.scheduler_timezone_default) }}
                         <datalist id="timezones" style="display: none;">
                             {%- for timezone in available_timezones -%}<option value="{{ timezone }}">{{ timezone }}</option>{%- endfor -%}
                         </datalist>
-                    </p>
+                    </div>
                 </div>
             </div>
             <div class="tab-pane-inner" id="ui-options">
@@ -336,7 +338,7 @@ nav
                     </div>
                 </div>
 
-               <p><strong>Tip</strong>: "Residential" and "Mobile" proxy type can be more successfull than "Data Center" for blocked websites.
+                <p><strong>Tip</strong>: "Residential" and "Mobile" proxy type can be more successfull than "Data Center" for blocked websites.</p>
 
                 <div class="pure-control-group" id="extra-proxies-setting">
                 {{ render_fieldlist_with_inline_errors(form.requests.form.extra_proxies) }}

changedetectionio/blueprint/tags/templates/groups-overview.html

@@ -50,7 +50,8 @@
                 <td>{{ "{:,}".format(tag_count[uuid]) if uuid in tag_count else 0 }}</td>
                 <td class="title-col inline"> <a href="{{url_for('watchlist.index', tag=uuid) }}">{{ tag.title }}</a></td>
                 <td>
-                    <a class="pure-button pure-button-primary" href="{{ url_for('tags.form_tag_edit', uuid=uuid) }}">{{ _('Edit') }}</a>&nbsp;
+                    <a class="pure-button pure-button-primary" href="{{ url_for('tags.form_tag_edit', uuid=uuid) }}">{{ _('Edit') }}</a>
+                    <a href="{{ url_for('ui.form_watch_checknow', tag=uuid) }}" class="pure-button pure-button-primary" >{{ _('Recheck') }}</a>
                     <a class="pure-button button-error"
                        href="{{ url_for('tags.delete', uuid=uuid) }}"
                        data-requires-confirm

changedetectionio/blueprint/ui/edit.py

@@ -238,6 +238,13 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             datastore.data['watching'][uuid] = watch_class(datastore_path=datastore.datastore_path, default=datastore.data['watching'][uuid])
             flash(gettext("Updated watch - unpaused!") if request.args.get('unpause_on_save') else gettext("Updated watch."))
 
+            # Cleanup any browsersteps session for this watch
+            try:
+                from changedetectionio.blueprint.browser_steps import cleanup_session_for_watch
+                cleanup_session_for_watch(uuid)
+            except Exception as e:
+                logger.debug(f"Error cleaning up browsersteps session: {e}")
+
             # Re #286 - We wait for syncing new data to disk in another thread every 60 seconds
             # But in the case something is added we should save straight away
             datastore.needs_write_urgent = True
@@ -325,8 +332,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                     'url': url_for('rss.rss_single_watch', uuid=watch['uuid'], token=app_rss_token)
                 },
                 'settings_application': datastore.data['settings']['application'],
-                'system_has_playwright_configured': os.getenv('PLAYWRIGHT_DRIVER_URL'),
-                'system_has_webdriver_configured': os.getenv('WEBDRIVER_URL'),
                 'ui_edit_stats_extras': collect_ui_edit_stats_extras(watch),
                 'visual_selector_data_ready': datastore.visualselector_data_is_ready(watch_uuid=uuid),
                 'timezone_default_config': datastore.data['settings']['application'].get('scheduler_timezone_default'),

changedetectionio/blueprint/ui/notification.py

@@ -118,6 +118,7 @@ def construct_blueprint(datastore: ChangeDetectionStore):
             sent_obj = process_notification(n_object, datastore)
 
         except Exception as e:
+            logger.error(e)
             e_str = str(e)
             # Remove this text which is not important and floods the container
             e_str = e_str.replace(

changedetectionio/blueprint/ui/templates/diff.html

@@ -87,7 +87,7 @@
     </form>
 </div>
 
-<div id="diff-jump">
+<div id="diff-jump" style="display:none;"><!-- disabled for now -->
     <a id="jump-next-diff" title="{{ _('Jump to next difference') }}">{{ _('Jump') }}</a>
 </div>
 

changedetectionio/blueprint/ui/templates/edit.html

@@ -206,7 +206,7 @@ Math: {{ 1 + 1 }}") }}
 
             <div class="tab-pane-inner" id="browser-steps">
             {% if capabilities.supports_browser_steps %}
-               {% if visual_selector_data_ready %}
+               {% if true %}
                 <img class="beta-logo" src="{{url_for('static_content', group='images', filename='beta-logo.png')}}" alt="New beta functionality">
                 <fieldset>
                     <div class="pure-control-group">

changedetectionio/blueprint/watchlist/__init__.py

@@ -86,6 +86,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             datastore=datastore,
             errored_count=errored_count,
             form=form,
+            generate_tag_colors=processors.generate_processor_badge_colors,
             guid=datastore.data['app_guid'],
             has_proxies=datastore.proxy_list,
             hosted_sticky=os.getenv("SALTED_PASS", False) == False,

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

@@ -22,6 +22,33 @@ document.addEventListener('DOMContentLoaded', function() {
 
 /* Auto-generated processor badge colors */
 {{ processor_badge_css|safe }}
+
+/* Auto-generated tag colors */
+{%- for uuid, tag in tags -%}
+{%- if tag and tag.title -%}
+{%- set class_name = tag.title|sanitize_tag_class -%}
+{%- set colors = generate_tag_colors(tag.title) -%}
+.button-tag.tag-{{ class_name }} {
+  background-color: {{ colors['light']['bg'] }};
+  color: {{ colors['light']['color'] }};
+}
+
+.watch-tag-list.tag-{{ class_name }} {
+  background-color: {{ colors['light']['bg'] }};
+  color: {{ colors['light']['color'] }};
+}
+
+html[data-darkmode="true"] .button-tag.tag-{{ class_name }} {
+  background-color: {{ colors['dark']['bg'] }};
+  color: {{ colors['dark']['color'] }};
+}
+
+html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
+  background-color: {{ colors['dark']['bg'] }};
+  color: {{ colors['dark']['color'] }};
+}
+{%- endif -%}
+{%- endfor -%}
 </style>
 <div class="box" id="form-quick-watch-add">
 
@@ -82,7 +109,7 @@ document.addEventListener('DOMContentLoaded', function() {
     <!-- tag list -->
     {%- for uuid, tag in tags -%}
         {%- if tag != "" -%}
-            <a href="{{url_for('watchlist.index', tag=uuid) }}" class="pure-button button-tag {{'active' if active_tag_uuid == uuid }}">{{ tag.title }}</a>
+            <a href="{{url_for('watchlist.index', tag=uuid) }}" class="pure-button button-tag tag-{{ tag.title|sanitize_tag_class }} {{'active' if active_tag_uuid == uuid }}">{{ tag.title }}</a>
         {%- endif -%}
     {%- endfor -%}
     </div>
@@ -169,7 +196,7 @@ document.addEventListener('DOMContentLoaded', function() {
                     <div class="flex-wrapper">
                     {% if 'favicons_enabled' not in ui_settings or ui_settings['favicons_enabled'] %}
                         <div>{# A page might have hundreds of these images, set IMG options for lazy loading, don't set SRC if we dont have it so it doesnt fetch the placeholder'  #}
-                            <img alt="Favicon thumbnail" class="favicon" loading="lazy" decoding="async" fetchpriority="low" {% if favicon %} src="{{url_for('static_content', group='favicon', filename=watch.uuid)}}" {% else %} src='data:image/svg+xml;utf8,%3Csvg xmlns="http://www.w3.org/2000/svg" width="7.087" height="7.087" viewBox="0 0 7.087 7.087"%3E%3Ccircle cx="3.543" cy="3.543" r="3.279" stroke="%23e1e1e1" stroke-width="0.45" fill="none" opacity="0.74"/%3E%3C/svg%3E' {%  endif %} />
+                            <img alt="Favicon thumbnail" class="favicon" loading="lazy" decoding="async" fetchpriority="low" {% if favicon %} src="{{url_for('static_content', group='favicon', filename=watch.uuid)}}" {% else %} src='data:image/svg+xml;utf8,%3Csvg xmlns="http://www.w3.org/2000/svg" width="7.087" height="7.087" viewBox="0 0 7.087 7.087"%3E%3Ccircle cx="3.543" cy="3.543" r="3.279" stroke="%23e1e1e1" stroke-width="0.45" fill="none" opacity="0.74"/%3E%3C/svg%3E' {%  endif %} >
                         </div>
                     {%  endif %}
                         <div>
@@ -191,7 +218,7 @@ document.addEventListener('DOMContentLoaded', function() {
                                 <span class="processor-badge processor-badge-{{ watch['processor'] }}" title="{{ processor_descriptions.get(watch['processor'], watch['processor']) }}">{{ processor_badge_texts[watch['processor']] }}</span>
                             {%- endif -%}
                             {%- for watch_tag_uuid, watch_tag in datastore.get_all_tags_for_watch(watch['uuid']).items() -%}
-                              <span class="watch-tag-list">{{ watch_tag.title }}</span>
+                              <span class="watch-tag-list tag-{{ watch_tag.title|sanitize_tag_class }}">{{ watch_tag.title }}</span>
                             {%- endfor -%}
                         </div>
                     <div class="status-icons">

changedetectionio/content_fetchers/playwright.py

@@ -1,3 +1,4 @@
+import gc
 import json
 import os
 from urllib.parse import urlparse
@@ -185,20 +186,33 @@ class fetcher(Fetcher):
         super().screenshot_step(step_n=step_n)
         screenshot = await capture_full_page_async(page=self.page, screenshot_format=self.screenshot_format)
 
+        # Request GC immediately after screenshot to free memory
+        # Screenshots can be large and browser steps take many of them
+        await self.page.request_gc()
 
         if self.browser_steps_screenshot_path is not None:
             destination = os.path.join(self.browser_steps_screenshot_path, 'step_{}.jpeg'.format(step_n))
             logger.debug(f"Saving step screenshot to {destination}")
             with open(destination, 'wb') as f:
                 f.write(screenshot)
+            # Clear local reference to allow screenshot bytes to be collected
+            del screenshot
+            gc.collect()
 
     async def save_step_html(self, step_n):
         super().save_step_html(step_n=step_n)
         content = await self.page.content()
+
+        # Request GC after getting page content
+        await self.page.request_gc()
+
         destination = os.path.join(self.browser_steps_screenshot_path, 'step_{}.html'.format(step_n))
         logger.debug(f"Saving step HTML to {destination}")
         with open(destination, 'w', encoding='utf-8') as f:
             f.write(content)
+        # Clear local reference
+        del content
+        gc.collect()
 
     async def run(self,
                   fetch_favicon=True,
@@ -305,6 +319,12 @@ class fetcher(Fetcher):
 
             if self.status_code != 200 and not ignore_status_codes:
                 screenshot = await capture_full_page_async(self.page, screenshot_format=self.screenshot_format)
+                # Cleanup before raising to prevent memory leak
+                await self.page.close()
+                await context.close()
+                await browser.close()
+                # Force garbage collection to release Playwright resources immediately
+                gc.collect()
                 raise Non200ErrorCodeReceived(url=url, status_code=self.status_code, screenshot=screenshot)
 
             if not empty_pages_are_a_change and len((await self.page.content()).strip()) == 0:
@@ -313,48 +333,52 @@ class fetcher(Fetcher):
                 await browser.close()
                 raise EmptyReply(url=url, status_code=response.status)
 
-            # Run Browser Steps here
-            if self.browser_steps_get_valid_steps():
-                await self.iterate_browser_steps(start_url=url)
-
-            await self.page.wait_for_timeout(extra_wait * 1000)
-
-            now = time.time()
-            # So we can find an element on the page where its selector was entered manually (maybe not xPath etc)
-            if current_include_filters is not None:
-                await self.page.evaluate("var include_filters={}".format(json.dumps(current_include_filters)))
-            else:
-                await self.page.evaluate("var include_filters=''")
-            await self.page.request_gc()
-
-            # request_gc before and after evaluate to free up memory
-            # @todo browsersteps etc
-            MAX_TOTAL_HEIGHT = int(os.getenv("SCREENSHOT_MAX_HEIGHT", SCREENSHOT_MAX_HEIGHT_DEFAULT))
-            self.xpath_data = await self.page.evaluate(XPATH_ELEMENT_JS, {
-                "visualselector_xpath_selectors": visualselector_xpath_selectors,
-                "max_height": MAX_TOTAL_HEIGHT
-            })
-            await self.page.request_gc()
-
-            self.instock_data = await self.page.evaluate(INSTOCK_DATA_JS)
-            await self.page.request_gc()
-
-            self.content = await self.page.content()
-            await self.page.request_gc()
-            logger.debug(f"Scrape xPath element data in browser done in {time.time() - now:.2f}s")
-
-
-            # Bug 3 in Playwright screenshot handling
-            # Some bug where it gives the wrong screenshot size, but making a request with the clip set first seems to solve it
-            # JPEG is better here because the screenshots can be very very large
-
-            # Screenshots also travel via the ws:// (websocket) meaning that the binary data is base64 encoded
-            # which will significantly increase the IO size between the server and client, it's recommended to use the lowest
-            # acceptable screenshot quality here
+            # Wrap remaining operations in try/finally to ensure cleanup
             try:
+                # Run Browser Steps here
+                if self.browser_steps_get_valid_steps():
+                    await self.iterate_browser_steps(start_url=url)
+
+                    await self.page.wait_for_timeout(extra_wait * 1000)
+
+                now = time.time()
+                # So we can find an element on the page where its selector was entered manually (maybe not xPath etc)
+                if current_include_filters is not None:
+                    await self.page.evaluate("var include_filters={}".format(json.dumps(current_include_filters)))
+                else:
+                    await self.page.evaluate("var include_filters=''")
+                await self.page.request_gc()
+
+                # request_gc before and after evaluate to free up memory
+                # @todo browsersteps etc
+                MAX_TOTAL_HEIGHT = int(os.getenv("SCREENSHOT_MAX_HEIGHT", SCREENSHOT_MAX_HEIGHT_DEFAULT))
+                self.xpath_data = await self.page.evaluate(XPATH_ELEMENT_JS, {
+                    "visualselector_xpath_selectors": visualselector_xpath_selectors,
+                    "max_height": MAX_TOTAL_HEIGHT
+                })
+                await self.page.request_gc()
+
+                self.instock_data = await self.page.evaluate(INSTOCK_DATA_JS)
+                await self.page.request_gc()
+
+                self.content = await self.page.content()
+                await self.page.request_gc()
+                logger.debug(f"Scrape xPath element data in browser done in {time.time() - now:.2f}s")
+
+
+                # Bug 3 in Playwright screenshot handling
+                # Some bug where it gives the wrong screenshot size, but making a request with the clip set first seems to solve it
+                # JPEG is better here because the screenshots can be very very large
+
+                # Screenshots also travel via the ws:// (websocket) meaning that the binary data is base64 encoded
+                # which will significantly increase the IO size between the server and client, it's recommended to use the lowest
+                # acceptable screenshot quality here
                 # The actual screenshot - this always base64 and needs decoding! horrible! huge CPU usage
                 self.screenshot = await capture_full_page_async(page=self.page, screenshot_format=self.screenshot_format)
 
+            except ScreenshotUnavailable:
+                # Re-raise screenshot unavailable exceptions
+                raise
             except Exception as e:
                 # It's likely the screenshot was too long/big and something crashed
                 raise ScreenshotUnavailable(url=url, status_code=self.status_code)
@@ -389,6 +413,10 @@ class fetcher(Fetcher):
                     pass
                 browser = None
 
+                # Force Python GC to release Playwright resources immediately
+                # Playwright objects can have circular references that delay cleanup
+                gc.collect()
+
 
 # Plugin registration for built-in fetcher
 class PlaywrightFetcherPlugin:

changedetectionio/content_fetchers/webdriver_selenium.py

@@ -15,7 +15,7 @@ class fetcher(Fetcher):
     proxy_url = None
 
     # Capability flags
-    supports_browser_steps = True
+    supports_browser_steps = False
     supports_screenshots = True
     supports_xpath_element_data = True
 

changedetectionio/custom_queue.py

@@ -57,14 +57,15 @@ class SignalPriorityQueue(queue.PriorityQueue):
     def put(self, item, block=True, timeout=None):
         # Call the parent's put method first
         super().put(item, block, timeout)
-        
+
         # After putting the item in the queue, check if it has a UUID and emit signal
         if hasattr(item, 'item') and isinstance(item.item, dict) and 'uuid' in item.item:
             uuid = item.item['uuid']
             # Get the signal and send it if it exists
             watch_check_update = signal('watch_check_update')
             if watch_check_update:
-                # Send the watch_uuid parameter
+                # NOTE: This would block other workers from .put/.get while this signal sends
+                # Signal handlers may iterate the queue/datastore while holding locks
                 watch_check_update.send(watch_uuid=uuid)
         
         # Send queue_length signal with current queue size
@@ -312,14 +313,15 @@ class AsyncSignalPriorityQueue(asyncio.PriorityQueue):
     async def put(self, item):
         # Call the parent's put method first
         await super().put(item)
-        
+
         # After putting the item in the queue, check if it has a UUID and emit signal
         if hasattr(item, 'item') and isinstance(item.item, dict) and 'uuid' in item.item:
             uuid = item.item['uuid']
             # Get the signal and send it if it exists
             watch_check_update = signal('watch_check_update')
             if watch_check_update:
-                # Send the watch_uuid parameter
+                # NOTE: This would block other workers from .put/.get while this signal sends
+                # Signal handlers may iterate the queue/datastore while holding locks
                 watch_check_update.send(watch_uuid=uuid)
         
         # Send queue_length signal with current queue size

changedetectionio/flask_app.py

@@ -297,6 +297,25 @@ def _jinja2_filter_fetcher_status_icons(fetcher_name):
 
     return ''
 
+@app.template_filter('sanitize_tag_class')
+def _jinja2_filter_sanitize_tag_class(tag_title):
+    """Sanitize a tag title to create a valid CSS class name.
+    Removes all non-alphanumeric characters and converts to lowercase.
+
+    Args:
+        tag_title: The tag title string
+
+    Returns:
+        str: A sanitized string suitable for use as a CSS class name
+    """
+    import re
+    # Remove all non-alphanumeric characters and convert to lowercase
+    sanitized = re.sub(r'[^a-zA-Z0-9]', '', tag_title).lower()
+    # Ensure it starts with a letter (CSS requirement)
+    if sanitized and not sanitized[0].isalpha():
+        sanitized = 'tag' + sanitized
+    return sanitized if sanitized else 'tag'
+
 # Import login_optionally_required from auth_decorator
 from changedetectionio.auth_decorator import login_optionally_required
 
@@ -844,13 +863,13 @@ def changedetection_app(config=None, datastore_o=None):
     worker_handler.start_workers(n_workers, update_q, notification_q, app, datastore)
 
     # @todo handle ctrl break
-    ticker_thread = threading.Thread(target=ticker_thread_check_time_launch_checks).start()
-    threading.Thread(target=notification_runner).start()
+    ticker_thread = threading.Thread(target=ticker_thread_check_time_launch_checks, daemon=True, name="TickerThread-ScheduleChecker").start()
+    threading.Thread(target=notification_runner, daemon=True, name="NotificationRunner").start()
 
     in_pytest = "pytest" in sys.modules or "PYTEST_CURRENT_TEST" in os.environ
     # Check for new release version, but not when running in test/build or pytest
     if not os.getenv("GITHUB_REF", False) and not strtobool(os.getenv('DISABLE_VERSION_CHECK', 'no')) and not in_pytest:
-        threading.Thread(target=check_for_new_version).start()
+        threading.Thread(target=check_for_new_version, daemon=True, name="VersionChecker").start()
 
     # Return the Flask app - the Socket.IO will be attached to it but initialized separately
     # This avoids circular dependencies
@@ -895,7 +914,7 @@ def notification_runner():
                 # At the moment only one thread runs (single runner)
                 n_object = notification_q.get(block=False)
             except queue.Empty:
-                time.sleep(1)
+                app.config.exit.wait(1)
 
             else:
 
@@ -932,7 +951,7 @@ def notification_runner():
                         app.config['watch_check_update_SIGNAL'].send(app_context=app, watch_uuid=n_object.get('uuid'))
 
                 # Process notifications
-                notification_debug_log+= ["{} - SENDING - {}".format(now.strftime("%Y/%m/%d %H:%M:%S,000"), json.dumps(sent_obj))]
+                notification_debug_log+= ["{} - SENDING - {}".format(now.strftime("%c"), json.dumps(sent_obj))]
                 # Trim the log length
                 notification_debug_log = notification_debug_log[-100:]
 
@@ -990,7 +1009,7 @@ def ticker_thread_check_time_launch_checks():
         # Re #438 - Don't place more watches in the queue to be checked if the queue is already large
         while update_q.qsize() >= 2000:
             logger.warning(f"Recheck watches queue size limit reached ({MAX_QUEUE_SIZE}), skipping adding more items")
-            time.sleep(3)
+            app.config.exit.wait(10.0)
 
 
         recheck_time_system_seconds = int(datastore.threshold_seconds)
@@ -1088,8 +1107,5 @@ def ticker_thread_check_time_launch_checks():
                     # Reset for next time
                     watch.jitter_seconds = 0
 
-        # Wait before checking the list again - saves CPU
-        time.sleep(1)
-
         # Should be low so we can break this out in testing
         app.config.exit.wait(1)

changedetectionio/forms.py

@@ -781,8 +781,8 @@ class SingleBrowserStep(Form):
 
 class processor_text_json_diff_form(commonSettingsForm):
 
-    url = fields.URLField('URL', validators=[validateURL()])
-    tags = StringTagUUID('Group tag', [validators.Optional()], default='')
+    url = fields.URLField('Web Page URL', validators=[validateURL()])
+    tags = StringTagUUID('Group Tag', [validators.Optional()], default='')
 
     time_between_check = EnhancedFormField(
         TimeBetweenCheckForm,
@@ -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,18 +29,22 @@ def get_timeago_locale(flask_locale):
     """
     locale_map = {
         'zh': 'zh_CN',      # Chinese Simplified
+        '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
         'hi': 'in_HI',      # Hindi
         'cs': 'en',         # Czech not supported by timeago, fallback to English
+        'en_GB': 'en',      # British English - timeago uses 'en'
+        'en_US': 'en',      # American English - timeago uses 'en'
     }
     return locale_map.get(flask_locale, flask_locale)
 
 # Language metadata: flag icon CSS class and native name
 # Using flag-icons library: https://flagicons.lipis.dev/
 LANGUAGE_DATA = {
-    'en': {'flag': 'fi fi-gb fis', 'name': 'English'},
+    'en_GB': {'flag': 'fi fi-gb fis', 'name': 'English (UK)'},
+    'en_US': {'flag': 'fi fi-us fis', 'name': 'English (US)'},
     'de': {'flag': 'fi fi-de fis', 'name': 'Deutsch'},
     'fr': {'flag': 'fi fi-fr fis', 'name': 'Français'},
     'ko': {'flag': 'fi fi-kr fis', 'name': '한국어'},
@@ -71,10 +75,7 @@ def get_available_languages():
     """
     translations_dir = Path(__file__).parent / 'translations'
 
-    # Always include English as base language
-    available = {
-        'en': LANGUAGE_DATA['en']
-    }
+    available = {}
 
     # Scan for translation directories
     if translations_dir.exists():
@@ -85,6 +86,10 @@ def get_available_languages():
                 if po_file.exists():
                     available[lang_dir.name] = LANGUAGE_DATA[lang_dir.name]
 
+    # If no English variants found, fall back to adding en_GB as default
+    if 'en_GB' not in available and 'en_US' not in available:
+        available['en_GB'] = LANGUAGE_DATA['en_GB']
+
     return available
 
 

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

@@ -10,9 +10,13 @@ from pathlib import Path
 from loguru import logger
 
 from .. import jinja2_custom as safe_jinja
-from ..diff import ADDED_PLACEMARKER_OPEN
 from ..html_tools import TRANSLATE_WHITESPACE_TABLE
 
+FAVICON_RESAVE_THRESHOLD_SECONDS=86400
+BROTLI_COMPRESS_SIZE_THRESHOLD = int(os.getenv('SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD', 1024))
+
+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_compress_worker(conn, filepath, mode=None):
     """
@@ -29,6 +33,7 @@ def _brotli_compress_worker(conn, filepath, mode=None):
     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:
             compressed_data = brotli.compress(contents, mode=mode)
@@ -40,9 +45,10 @@ def _brotli_compress_worker(conn, filepath, mode=None):
 
         # 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.error(f"Brotli compression worker failed: {e}")
+        logger.critical(f"Brotli compression worker failed: {e}")
         conn.send(False)
     finally:
         conn.close()
@@ -66,7 +72,6 @@ def _brotli_subprocess_save(contents, filepath, mode=None, timeout=30, fallback_
     Raises:
         Exception: if compression fails and fallback_uncompressed is False
     """
-    import brotli
     import multiprocessing
     import sys
 
@@ -144,11 +149,6 @@ def _brotli_subprocess_save(contents, filepath, mode=None, timeout=30, fallback_
     else:
         raise Exception(f"Brotli compression subprocess failed for {filepath}")
 
-FAVICON_RESAVE_THRESHOLD_SECONDS=86400
-
-
-minimum_seconds_recheck_time = int(os.getenv('MINIMUM_SECONDS_RECHECK_TIME', 3))
-mtable = {'seconds': 1, 'minutes': 60, 'hours': 3600, 'days': 86400, 'weeks': 86400 * 7}
 
 class model(watch_base):
     __newest_history_key = None
@@ -492,7 +492,6 @@ class model(watch_base):
 
         self.ensure_data_dir_exists()
 
-        threshold = int(os.getenv('SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD', 1024))
         skip_brotli = strtobool(os.getenv('DISABLE_BROTLI_TEXT_SNAPSHOT', 'False'))
 
         # Binary data - detect file type and save without compression
@@ -516,7 +515,7 @@ class model(watch_base):
 
         # Text data - use brotli compression if enabled and above threshold
         else:
-            if not skip_brotli and len(contents) > threshold:
+            if not skip_brotli and len(contents) > BROTLI_COMPRESS_SIZE_THRESHOLD:
                 # Compressed text
                 import brotli
                 snapshot_fname = f"{snapshot_id}.txt.br"

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/queue_handlers.py

@@ -86,6 +86,7 @@ class RecheckPriorityQueue:
     
     def get(self, block: bool = True, timeout: Optional[float] = None):
         """Thread-safe sync get with priority ordering"""
+        import queue
         try:
             # Wait for notification
             self.sync_q.get(block=block, timeout=timeout)
@@ -103,8 +104,11 @@ class RecheckPriorityQueue:
             logger.debug(f"Successfully retrieved item: {self._get_item_uuid(item)}")
             return item
 
+        except queue.Empty:
+            # Queue is empty with timeout - expected behavior, re-raise without logging
+            raise
         except Exception as e:
-            logger.critical(f"CRITICAL: Failed to get item from queue: {str(e)}")
+            # Re-raise without logging - caller (worker) will handle and log appropriately
             raise
     
     # ASYNC INTERFACE (for workers)

changedetectionio/run_basic_tests.sh

@@ -98,11 +98,12 @@ pytest -vv -s --maxfail=1 tests/test_rss.py
 pytest -vv -s --maxfail=1 tests/test_unique_lines.py
 
 # Try high concurrency
-FETCH_WORKERS=130 pytest  tests/test_history_consistency.py -v -l
+FETCH_WORKERS=50 pytest  tests/test_history_consistency.py -vv -l -s
 
 # Check file:// will pickup a file when enabled
 echo "Hello world" > /tmp/test-file.txt
 ALLOW_FILE_URI=yes pytest -vv -s  tests/test_security.py
 
 
-
+# Run it again so that brotli kicks in
+TEST_WITH_BROTLI=1 SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD=100 FETCH_WORKERS=20 pytest tests/test_history_consistency.py -vv -l -s

changedetectionio/static/js/language-selector.js

@@ -3,17 +3,17 @@
  * Allows users to select their preferred language
  */
 
-document.addEventListener('DOMContentLoaded', function() {
-  const languageButton = document.getElementById('language-selector');
-  const languageModal = document.getElementById('language-modal');
-  const closeButton = document.getElementById('close-language-modal');
+$(document).ready(function() {
+  const $languageButton = $('.language-selector');
+  const $languageModal = $('#language-modal');
+  const $closeButton = $('#close-language-modal');
 
-  if (!languageButton || !languageModal) {
+  if (!$languageButton.length || !$languageModal.length) {
     return;
   }
 
   // Open modal when language button is clicked
-  languageButton.addEventListener('click', function(e) {
+  $languageButton.on('click', function(e) {
     e.preventDefault();
 
     // Update all language links to include current hash in the redirect parameter
@@ -21,51 +21,53 @@ document.addEventListener('DOMContentLoaded', function() {
     const currentHash = window.location.hash;
 
     if (currentHash) {
-      const languageOptions = languageModal.querySelectorAll('.language-option');
-      languageOptions.forEach(function(option) {
-        const url = new URL(option.href, window.location.origin);
+      const $languageOptions = $languageModal.find('.language-option');
+      $languageOptions.each(function() {
+        const $option = $(this);
+        const url = new URL($option.attr('href'), window.location.origin);
         // Update the redirect parameter to include the hash
         const redirectPath = currentPath + currentHash;
         url.searchParams.set('redirect', redirectPath);
-        option.setAttribute('href', url.pathname + url.search + url.hash);
+        $option.attr('href', url.pathname + url.search + url.hash);
       });
     }
 
-    languageModal.showModal();
+    $languageModal[0].showModal();
   });
 
   // Close modal when cancel button is clicked
-  if (closeButton) {
-    closeButton.addEventListener('click', function() {
-      languageModal.close();
+  if ($closeButton.length) {
+    $closeButton.on('click', function() {
+      $languageModal[0].close();
     });
   }
 
   // Close modal when clicking outside (on backdrop)
-  languageModal.addEventListener('click', function(e) {
-    const rect = languageModal.getBoundingClientRect();
+  $languageModal.on('click', function(e) {
+    const rect = this.getBoundingClientRect();
     if (
       e.clientY < rect.top ||
       e.clientY > rect.bottom ||
       e.clientX < rect.left ||
       e.clientX > rect.right
     ) {
-      languageModal.close();
+      $languageModal[0].close();
     }
   });
 
   // Close modal on Escape key
-  languageModal.addEventListener('cancel', function(e) {
+  $languageModal.on('cancel', function(e) {
     e.preventDefault();
-    languageModal.close();
+    $languageModal[0].close();
   });
 
   // Highlight current language
-  const currentLocale = document.documentElement.lang || 'en';
-  const languageOptions = languageModal.querySelectorAll('.language-option');
-  languageOptions.forEach(function(option) {
-    if (option.dataset.locale === currentLocale) {
-      option.classList.add('active');
+  const currentLocale = $('html').attr('lang') || 'en';
+  const $languageOptions = $languageModal.find('.language-option');
+  $languageOptions.each(function() {
+    const $option = $(this);
+    if ($option.attr('data-locale') === currentLocale) {
+      $option.addClass('active');
     }
   });
 });

changedetectionio/static/js/realtime.js

@@ -120,7 +120,8 @@ $(document).ready(function () {
                 console.log(`${data.event_timestamp} - Queue size update: ${data.q_length}`);
 
                 // Update queue bubble in action sidebar
-                if (queueBubble) {
+                //if (queueBubble) {
+                if (0) {
                     const count = parseInt(data.q_length) || 0;
                     const oldCount = parseInt(queueBubble.getAttribute('data-count')) || 0;
 

changedetectionio/static/js/toggle-theme.js

@@ -3,14 +3,12 @@
  * Toggles theme between light and dark mode.
  */
 $(document).ready(function () {
-    const button = document.getElementById("toggle-light-mode");
 
-    button.onclick = () => {
-        const htmlElement = document.getElementsByTagName("html");
-        const isDarkMode = htmlElement[0].dataset.darkmode === "true";
-        htmlElement[0].dataset.darkmode = !isDarkMode;
-        setCookieValue(!isDarkMode);
-    };
+    $(".toggle-light-mode").on("click", function () {
+        const isDark = $("html").attr("data-darkmode") === "true";
+        $("html").attr("data-darkmode", !isDark);
+        setCookieValue(!isDark);
+    });
 
     const setCookieValue = (value) => {
         document.cookie = `css_dark_mode=${value};max-age=31536000;path=/`

changedetectionio/static/styles/scss/_settings.scss

@@ -0,0 +1,7 @@
+/**
+ * SCSS variables (compile-time)
+ * These can be used in media queries and other places where CSS custom properties don't work
+ */
+
+// Breakpoints
+$desktop-wide-breakpoint: 980px;

changedetectionio/static/styles/scss/parts/_action_sidebar.scss

@@ -24,7 +24,7 @@
   flex-direction: column;
   gap: 0.5rem;
   align-items: center;
-  z-index: 10;
+  z-index: 0;
 
   @media only screen and (max-width: 900px) {
     position: relative;
@@ -32,7 +32,7 @@
     width: 100%;
     flex-direction: row;
     justify-content: space-around;
-    padding: 1rem 0.5rem;
+    padding: 0;
     overflow-x: auto;
   }
 }

changedetectionio/static/styles/scss/parts/_darkmode.scss

@@ -1,15 +1,13 @@
 
-#toggle-light-mode {
-/*  width: 3rem;*/
+.toggle-light-mode {
   /* default */
   .icon-dark {
     display: none;
   }
-
 }
 
 html[data-darkmode="true"] {
-  #toggle-light-mode {
+  .toggle-light-mode {
     .icon-light {
       display: none;
     }

changedetectionio/static/styles/scss/parts/_hamburger_menu.scss

@@ -1,4 +1,5 @@
 // Hamburger Menu for Mobile Navigation
+@use "../settings" as *;
 
 .hamburger-menu {
   display: none;
@@ -9,7 +10,7 @@
   z-index: 10001;
   position: relative;
 
-  @media only screen and (max-width: 768px) {
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -97,7 +98,7 @@
     li {
       border-bottom: 1px solid var(--color-border-table-cell);
 
-      a {
+      >* {
         display: block;
         padding: 1rem 1.5rem;
         color: var(--color-text);
@@ -135,9 +136,9 @@
   margin-left: auto;
 }
 
-// Hide regular menu items on mobile
-@media only screen and (max-width: 768px) {
-  .menu-collapsible {
+// Hide regular menu items on mobile (but not in mobile drawer)
+@media only screen and (max-width: $desktop-wide-breakpoint) {
+  #top-right-menu .menu-collapsible {
     display: none !important;
   }
 
@@ -151,7 +152,7 @@
 }
 
 // Desktop - hide mobile menu elements
-@media only screen and (min-width: 769px) {
+@media only screen and (min-width: 1025px) {
   .hamburger-menu,
   .mobile-menu-drawer,
   .mobile-menu-overlay {

changedetectionio/static/styles/scss/parts/_language.scss

@@ -0,0 +1,69 @@
+#language-selector-flag {
+  display: inline-block;
+  width: 1.2em;
+  height: 1.2em;
+  vertical-align: middle;
+  border-radius: 50%;
+  overflow: hidden;
+  opacity: 0.6;
+  &:hover {
+    opacity: 1.0;
+  }
+}
+
+
+// Language Selector Modal Styles
+.language-list {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding: 0.5rem 0;
+}
+
+.language-option {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  padding: 0.25rem;
+  border-radius: 4px;
+  transition: background-color 0.2s ease;
+  text-decoration: none;
+  color: var(--color-text);
+  border: 1px solid transparent;
+
+  &:hover {
+    background-color: var(--color-background-menu-link-hover);
+    border-color: var(--color-border-table-cell);
+  }
+
+  &.active {
+    background-color: var(--color-link);
+    color: var(--color-text-button);
+    font-weight: 600;
+  }
+
+  .flag {
+    font-size: 1.5rem;
+    flex-shrink: 0;
+  }
+
+  .language-name {
+    flex-grow: 1;
+    font-size: 1rem;
+  }
+}
+
+#language-modal {
+  .language-list {
+    .lang-option {
+      display: inline-block;
+      width: 1.5em;
+      height: 1.5em;
+      vertical-align: middle;
+      margin-right: 0.5em;
+      border-radius: 50%;
+      overflow: hidden;
+    }
+  }
+}
+

changedetectionio/static/styles/scss/parts/_login_form.scss

@@ -20,23 +20,8 @@
     overflow: hidden;
     transition: transform 0.3s ease, box-shadow 0.3s ease;
 
-    // Subtle accent line at top
-    &::before {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      height: 4px;
-      background: linear-gradient(
-        90deg,
-        var(--color-link) 0%,
-        var(--color-menu-accent) 100%
-      );
-    }
-
     &:hover {
-      transform: translateY(-2px);
+
       box-shadow:
         0 15px 50px rgba(0, 0, 0, 0.12),
         0 5px 15px rgba(0, 0, 0, 0.06);
@@ -108,7 +93,6 @@
     box-shadow: 0 2px 8px rgba(27, 152, 248, 0.2);
 
     &:hover {
-      transform: translateY(-2px);
       box-shadow: 0 4px 12px rgba(27, 152, 248, 0.3);
       background: #0066cc;
     }

changedetectionio/static/styles/scss/parts/_menu.scss

@@ -31,3 +31,13 @@
     }
   }
 }
+
+#cdio-logo {
+  padding-left: 0.5em;
+}
+
+#inline-menu-extras-group {
+  >* {
+    display: inline-block;
+  }
+}

changedetectionio/static/styles/scss/parts/_tabs.scss

@@ -0,0 +1,57 @@
+body.wrapped-tabs {
+  .tabs {
+    ul {
+      grid-template-columns: repeat(auto-fill, minmax(var(--tab-width, 180px), 1fr));
+      grid-auto-flow: row;
+      grid-auto-columns: unset;
+      gap: 0;
+      column-gap: 5px;
+    }
+
+    ul li {
+      border-radius: 0;
+    }
+  }
+}
+
+.tabs {
+  ul {
+    margin: 0px;
+    padding: 0px;
+    display: grid;
+    grid-auto-flow: column;
+    grid-auto-columns: max-content;
+    gap: 5px;
+    list-style: none;
+
+    li {
+      white-space: nowrap;
+      color: var(--color-text-tab);
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+      background-color: var(--color-background-tab);
+
+      &:not(.active) {
+        &:hover {
+          background-color: var(--color-background-tab-hover);
+        }
+      }
+
+      &.active,
+      :target {
+        background-color: var(--color-background);
+
+        a {
+          color: var(--color-text-tab-active);
+          font-weight: bold;
+        }
+      }
+
+      a {
+        display: block;
+        padding: 0.7em;
+        color: var(--color-text-tab);
+      }
+    }
+  }
+}

changedetectionio/static/styles/scss/styles.scss

@@ -2,6 +2,7 @@
  * -- BASE STYLES --
  */
 
+@use "settings" as *;
 @use "parts/variables";
 @use "parts/arrows";
 @use "parts/browser-steps";
@@ -23,12 +24,14 @@
 @use "parts/widgets";
 @use "parts/diff_image";
 @use "parts/modal";
+@use "parts/language";
 @use "parts/action_sidebar";
 @use "parts/hamburger_menu";
 @use "parts/search_modal";
 @use "parts/notification_bubble";
 @use "parts/toast";
 @use "parts/login_form";
+@use "parts/tabs";
 
 
 body {
@@ -157,7 +160,13 @@ body.spinner-active {
 }
 
 section.content {
-  padding-top: 100px;
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
+    padding-top: 80px;
+  }
+  @media only screen and (min-width: $desktop-wide-breakpoint) {
+    padding-top: 100px;
+  }
+
   padding-bottom: 1em;
   flex-direction: column;
   display: flex;
@@ -175,13 +184,13 @@ code {
   border-radius: 5px;
   padding: 2px 5px;
   margin-right: 4px;
+  line-height: 1.2rem;
 }
 
 /* Processor type badges - colors auto-generated from processor names */
 .processor-badge {
   @extend .inline-tag;
-  font-size: 0.85em;
-  font-weight: 500;
+  font-weight: 900;
 }
 
 .watch-tag-list {
@@ -514,6 +523,9 @@ footer {
 }
 
 .sticky-tab {
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
+    display: none;
+  }
   position: absolute;
   top: 60px;
   font-size: 65%;
@@ -658,7 +670,7 @@ footer {
 
 
 @media only screen and (max-width: 760px),
-(min-device-width: 768px) and (max-device-width: 1024px) {
+(min-device-width: 768px) and (max-device-width: $desktop-wide-breakpoint) {
   .edit-form {
     padding: 0.5em;
     margin: 0;
@@ -670,30 +682,10 @@ footer {
 }
 
 
-@media only screen and (max-width: 760px),
-(min-device-width: 768px) and (max-device-width: 800px) {
-
-  div.sticky-tab#hosted-sticky {
-    top: 60px;
-    left: 0px;
-    right: auto;
-  }
-
-  section.content {
-    padding-top: 110px;
-  }
-
-  // Make the tabs easier to hit, they will be all nice and horizontal
-  div.tabs.collapsable ul li {
-    display: block;
-    border-radius: 0px;
-    margin-right: 0px;
-  }
-
+@media only screen and (max-width: 760px), (min-device-width: 768px) and (max-device-width: $desktop-wide-breakpoint) {
   input[type='text'] {
     width: 100%;
   }
-
 }
 
 .pure-table {
@@ -769,45 +761,6 @@ textarea::placeholder {
 }
 
 
-.tabs {
-  ul {
-    margin: 0px;
-    padding: 0px;
-    display: block;
-
-    li {
-      margin-right: 1px;
-      display: inline-block;
-      color: var(--color-text-tab);
-      border-top-left-radius: 5px;
-      border-top-right-radius: 5px;
-      background-color: var(--color-background-tab);
-
-      &:not(.active) {
-        &:hover {
-          background-color: var(--color-background-tab-hover);
-        }
-      }
-
-      &.active,
-      :target {
-        background-color: var(--color-background);
-
-        a {
-          color: var(--color-text-tab-active);
-          font-weight: bold;
-        }
-      }
-
-      a {
-        display: block;
-        padding: 0.7em;
-        color: var(--color-text-tab);
-      }
-    }
-  }
-}
-
 $form-edge-padding: 20px;
 
 .pure-form-stacked {
@@ -1144,44 +1097,4 @@ ul#highlightSnippetActions {
   }
 }
 
-// Language Selector Modal Styles
-.language-list {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  padding: 0.5rem 0;
-}
-
-.language-option {
-  display: flex;
-  align-items: center;
-  gap: 1rem;
-  padding: 0.25rem;
-  border-radius: 4px;
-  transition: background-color 0.2s ease;
-  text-decoration: none;
-  color: var(--color-text);
-  border: 1px solid transparent;
-
-  &:hover {
-    background-color: var(--color-background-menu-link-hover);
-    border-color: var(--color-border-table-cell);
-  }
-
-  &.active {
-    background-color: var(--color-link);
-    color: var(--color-text-button);
-    font-weight: 600;
-  }
-
-  .flag {
-    font-size: 1.5rem;
-    flex-shrink: 0;
-  }
-
-  .language-name {
-    flex-grow: 1;
-    font-size: 1rem;
-  }
-}
 

changedetectionio/store.py

@@ -186,7 +186,7 @@ class ChangeDetectionStore:
         # Finally start the thread that will manage periodic data saves to JSON
         # Only start if thread is not already running (reload_state might be called multiple times)
         if not self.save_data_thread or not self.save_data_thread.is_alive():
-            self.save_data_thread = threading.Thread(target=self.save_datastore)
+            self.save_data_thread = threading.Thread(target=self.save_datastore, daemon=True, name="DatastoreSaver")
             self.save_data_thread.start()
 
     def rehydrate_entity(self, uuid, entity, processor_override=None):

changedetectionio/strtobool.py

@@ -17,6 +17,8 @@ _MAP = {
 
 
 def strtobool(value):
+    if not value:
+        return False
     try:
         return _MAP[str(value).lower()]
     except KeyError:

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 %}
 
@@ -145,32 +162,17 @@
                                 <div id="notification-test-log" style="display: none;"><span class="pure-form-message-inline">Processing..</span></div>
                             </div>
                         </div>
+
                         <div class="pure-control-group grey-form-border">
                             <div class="pure-control-group">
                                 {{ 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 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

@@ -53,10 +53,10 @@
       <div class="home-menu pure-menu pure-menu-horizontal" id="nav-menu">
 
         {% if has_password and not current_user.is_authenticated %}
-          <a class="pure-menu-heading" href="https://changedetection.io" rel="noopener">
+          <a id="cdio-logo" class="pure-menu-heading" href="https://changedetection.io" rel="noopener">
             <strong>Change</strong>Detection.io</a>
         {% else %}
-          <a class="pure-menu-heading" href="{{url_for('watchlist.index')}}">
+          <a  id="cdio-logo" class="pure-menu-heading" href="{{url_for('watchlist.index')}}">
             <strong>Change</strong>Detection.io</a>
         {% endif %}
         {% if current_diff_url and is_safe_valid_url(current_diff_url) %}
@@ -72,61 +72,19 @@
 
         <ul class="pure-menu-list" id="top-right-menu">
           <!-- Collapsible menu items (hidden on mobile, shown in drawer) -->
+          {% include "menu.html" %}
+
           {% if current_user.is_authenticated or not has_password %}
             {% if not current_diff_url %}
-              <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('tags.') %}active{% endif %}">
-                <a href="{{ url_for('tags.tags_overview_page')}}" class="pure-menu-link">{{ _('GROUPS') }}</a>
-              </li>
-              <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('settings.') %}active{% endif %}">
-                <a href="{{ url_for('settings.settings_page')}}" class="pure-menu-link">{{ _('SETTINGS') }}</a>
-              </li>
-              <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('imports.') %}active{% endif %}">
-                <a href="{{ url_for('imports.import_page')}}" class="pure-menu-link">{{ _('IMPORT') }}</a>
-              </li>
-              <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('backups.') %}active{% endif %}">
-                <a href="{{ url_for('backups.index')}}" class="pure-menu-link">{{ _('BACKUPS') }}</a>
-              </li>
-            {% else %}
-              <li class="pure-menu-item menu-collapsible">
-                <a href="{{ url_for('ui.ui_edit.edit_page', uuid=uuid, next='diff') }}" class="pure-menu-link">{{ _('EDIT') }}</a>
+              <li class="pure-menu-item  menu-collapsible">
+                <button class="toggle-button" id="open-search-modal" type="button" title="{{ _('Search, or Use Alt+S Key') }}">
+                  {% include "svgs/search-icon.svg" %}
+                </button>
               </li>
+
             {% endif %}
-          {% else %}
-            <li class="pure-menu-item menu-collapsible">
-              <a class="pure-menu-link" href="https://changedetection.io">Website Change Detection and Notification.</a>
-            </li>
-          {% endif %}
-          {% if current_user.is_authenticated %}
-            <li class="pure-menu-item menu-collapsible">
-              <a href="{{url_for('logout', redirect=request.path)}}" class="pure-menu-link">{{ _('LOG OUT') }}</a>
-            </li>
           {% endif %}
 
-          <!-- Always visible items -->
-          {% if current_user.is_authenticated or not has_password %}
-          <li class="pure-menu-item">
-            <button class="toggle-button" id="open-search-modal" type="button" title="{{ _('Search, or Use Alt+S Key') }}">
-              {% include "svgs/search-icon.svg" %}
-            </button>
-          </li>
-          {% endif %}
-          <li class="pure-menu-item">
-            <button class="toggle-button" id ="toggle-light-mode" type="button" title="{{ _('Toggle Light/Dark Mode') }}">
-              <span class="visually-hidden">{{ _('Toggle light/dark mode') }}</span>
-              <span class="icon-light">
-                {% include "svgs/light-mode-toggle-icon.svg" %}
-              </span>
-              <span class="icon-dark">
-                {% include "svgs/dark-mode-toggle-icon.svg" %}
-              </span>
-            </button>
-          </li>
-          <li class="pure-menu-item">
-            <button class="toggle-button" id="language-selector" type="button" title="{{ _('Change Language') }}">
-              <span class="visually-hidden">{{ _('Change language') }}</span>
-              <span class="{{ get_flag_for_locale(get_locale()) }}" style="display: inline-block; width: 1.2em; height: 1.2em; vertical-align: middle; border-radius: 50%; overflow: hidden;"></span>
-            </button>
-          </li>
           <li class="pure-menu-item" id="heart-us">
                 <svg
                    fill="#ff0000"
@@ -136,16 +94,9 @@
                    id="svg-heart"
                    xmlns="http://www.w3.org/2000/svg"
                    >
-                  <path id="heartpath" d="M 5.338316,0.50302766 C 0.71136983,0.50647126 -3.9576371,7.2707777 8.5004254,15.503028 23.833425,5.3700277 13.220206,-2.5384409 8.6762066,1.6475589 c -0.060791,0.054322 -0.11943,0.1110064 -0.1757812,0.1699219 -0.057,-0.059 -0.1157813,-0.116875 -0.1757812,-0.171875 C 7.4724566,0.86129334 6.4060729,0.50223298 5.338316,0.50302766 Z"
-                     style="fill:var(--color-background);fill-opacity:1;stroke:#ff0000;stroke-opacity:1" />
+                  <path id="heartpath" d="M 5.338316,0.50302766 C 0.71136983,0.50647126 -3.9576371,7.2707777 8.5004254,15.503028 23.833425,5.3700277 13.220206,-2.5384409 8.6762066,1.6475589 c -0.060791,0.054322 -0.11943,0.1110064 -0.1757812,0.1699219 -0.057,-0.059 -0.1157813,-0.116875 -0.1757812,-0.171875 C 7.4724566,0.86129334 6.4060729,0.50223298 5.338316,0.50302766 Z" style="fill:var(--color-background);fill-opacity:1;stroke:#ff0000;stroke-opacity:1" />
                 </svg>
           </li>
-          <li class="pure-menu-item">
-            <a class="github-link" href="https://github.com/dgtlmoon/changedetection.io">
-              {% include "svgs/github.svg" %}
-            </a>
-          </li>
-
           <!-- Hamburger menu button (mobile only) -->
           <li class="pure-menu-item">
             <button class="hamburger-menu" id="hamburger-toggle" aria-label="Toggle menu">
@@ -163,27 +114,17 @@
       <div class="mobile-menu-overlay" id="mobile-menu-overlay"></div>
       <div class="mobile-menu-drawer" id="mobile-menu-drawer">
         <ul class="mobile-menu-items">
-          {% if current_user.is_authenticated or not has_password %}
-            {% if not current_diff_url %}
-              <li><a href="{{ url_for('tags.tags_overview_page')}}">{{ _('GROUPS') }}</a></li>
-              <li><a href="{{ url_for('settings.settings_page')}}">{{ _('SETTINGS') }}</a></li>
-              <li><a href="{{ url_for('imports.import_page')}}">{{ _('IMPORT') }}</a></li>
-              <li><a href="{{ url_for('backups.index')}}">{{ _('BACKUPS') }}</a></li>
-            {% else %}
-              <li><a href="{{ url_for('ui.ui_edit.edit_page', uuid=uuid, next='diff') }}">{{ _('EDIT') }}</a></li>
-            {% endif %}
-          {% endif %}
-          {% if current_user.is_authenticated %}
-            <li><a href="{{url_for('logout', redirect=request.path)}}">{{ _('LOG OUT') }}</a></li>
-          {% endif %}
+          {% include "menu.html" %}
+            <li class="pure-menu-item menu-collapsible">
+                {%- if right_sticky -%}<div>{{ right_sticky }}</div>{%- endif -%}
+                <a href="https://changedetection.io/?ref={{ guid }}">Let us host your instance!</a><br>
+            </li>
         </ul>
       </div>
       <div id="pure-menu-horizontal-spinner"></div>
       </div>
 
     </div>
-
-
     {% if hosted_sticky %}
       <div class="sticky-tab" id="hosted-sticky">
         <a href="https://changedetection.io/?ref={{guid}}">Let us host your instance!</a>
@@ -248,6 +189,7 @@
         </div>
 
         <div class="content-wrapper">
+{#
           {% if current_user.is_authenticated or not has_password %}
           <aside class="action-sidebar">
             <a href="{{ url_for('watchlist.index') }}" class="action-sidebar-item {% if request.endpoint.startswith('watchlist.') or request.endpoint.startswith('ui.') %}active{% endif %}" title="{{ _('Watch List') }}">
@@ -257,7 +199,6 @@
               </svg>
               <span class="action-label">{{ _('Watches') }}</span>
             </a>
-
             <a href="{{ url_for('queue_status') }}" class="action-sidebar-item {% if request.endpoint == 'queue_status' %}active{% endif %}" id="queue-action-item" title="{{ _('Queue Status') }}">
               <svg class="action-icon" viewBox="0 0 24 24">
                 <line x1="8" y1="6" x2="21" y2="6"/>
@@ -270,56 +211,9 @@
               <span class="action-label">{{ _('Queue') }}</span>
               <span class="notification-bubble blue-bubble" id="queue-bubble" data-count="0"></span>
             </a>
-
-            <a href="{{ url_for('settings.settings_page') }}" class="action-sidebar-item {% if request.endpoint.startswith('settings.') %}active{% endif %}" title="{{ _('Settings') }}">
-              <svg class="action-icon" viewBox="0 0 24 24">
-                <circle cx="12" cy="12" r="3"/>
-                <path d="M12 1v6m0 6v10M3.5 3.5l4.2 4.2m5.6 5.6l4.2 4.2M1 12h6m6 0h10M3.5 20.5l4.2-4.2m5.6-5.6l4.2-4.2"/>
-              </svg>
-              <span class="action-label">{{ _('Settings') }}</span>
-            </a>
-
-            <a href="{{ url_for('backups.index') }}" class="action-sidebar-item {% if request.endpoint.startswith('backups.') %}active{% endif %}" title="{{ _('Backups') }}">
-              <svg class="action-icon" viewBox="0 0 24 24">
-                <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
-                <polyline points="14 2 14 8 20 8"/>
-                <line x1="16" y1="13" x2="8" y2="13"/>
-                <line x1="16" y1="17" x2="8" y2="17"/>
-                <polyline points="10 9 9 9 8 9"/>
-              </svg>
-              <span class="action-label">{{ _('Backups') }}</span>
-            </a>
-
-            <a href="#" class="action-sidebar-item" title="{{ _('Sitemap Crawler') }}">
-              <svg class="action-icon" viewBox="0 0 24 24">
-                <!-- Spider web with map nodes -->
-                <circle cx="12" cy="12" r="2"/>
-                <!-- Radial web lines -->
-                <line x1="12" y1="12" x2="12" y2="4"/>
-                <line x1="12" y1="12" x2="19" y2="7"/>
-                <line x1="12" y1="12" x2="20" y2="12"/>
-                <line x1="12" y1="12" x2="19" y2="17"/>
-                <line x1="12" y1="12" x2="12" y2="20"/>
-                <line x1="12" y1="12" x2="5" y2="17"/>
-                <line x1="12" y1="12" x2="4" y2="12"/>
-                <line x1="12" y1="12" x2="5" y2="7"/>
-                <!-- Outer web ring -->
-                <circle cx="12" cy="12" r="8" fill="none"/>
-                <!-- Map nodes on web -->
-                <circle cx="12" cy="4" r="1.5"/>
-                <circle cx="19" cy="7" r="1.5"/>
-                <circle cx="20" cy="12" r="1.5"/>
-                <circle cx="19" cy="17" r="1.5"/>
-                <circle cx="12" cy="20" r="1.5"/>
-                <circle cx="5" cy="17" r="1.5"/>
-                <circle cx="4" cy="12" r="1.5"/>
-                <circle cx="5" cy="7" r="1.5"/>
-              </svg>
-              <span class="action-label">{{ _('Sitemap') }}</span>
-            </a>
           </aside>
           {% endif %}
-
+#}
           <div class="content-main">
             <header>
               {% block header %}{% endblock %}
@@ -367,7 +261,7 @@
         <div class="language-list">
           {% for locale, lang_data in available_languages.items()|sort %}
           <a href="{{ url_for('set_language', locale=locale, redirect=request.path) }}" class="language-option" data-locale="{{ locale }}">
-            <span class="{{ lang_data.flag }}" style="display: inline-block; width: 1.5em; height: 1.5em; vertical-align: middle; margin-right: 0.5em; border-radius: 50%; overflow: hidden;"></span> <span class="language-name">{{ lang_data.name }}</span>
+            <span class="lang-option {{ lang_data.flag }}"></span> <span class="language-name">{{ lang_data.name }}</span>
           </a>
           {% endfor %}
         </div>
@@ -402,6 +296,77 @@
     </dialog>
     {% endif %}
 
+
+  <script>
+  (function() {
+      /* AUTOMATIC TAB COLUMN-IZER FOR WHEN TABS WRAP */
+    // Exit early if no tabs on page
+    if (!document.querySelector('.tab')) return;
+
+    const cache = new Map();
+
+    function checkWrapping(ul) {
+      const tabs = ul.querySelectorAll('.tab');
+      if (tabs.length < 2) return false;
+
+      // Init cache on first run
+      if (!cache.has(ul)) {
+        ul.style.setProperty('--tab-width', '');
+        void ul.offsetHeight;
+        let max = 0;
+        tabs.forEach(t => max = Math.max(max, t.offsetWidth));
+        cache.set(ul, max);
+      }
+
+      // Temporarily use flex wrap to check if wrapping occurs
+      ul.style.display = 'flex';
+      ul.style.flexWrap = 'wrap';
+      void ul.offsetHeight;
+
+      const top = tabs[0].offsetTop;
+      const wrapped = Array.from(tabs).some((t, i) => i > 0 && t.offsetTop !== top);
+
+      // Reset display to use CSS grid
+      ul.style.display = '';
+      ul.style.flexWrap = '';
+
+      // Set CSS variable for wrapped mode
+      if (wrapped) {
+        ul.style.setProperty('--tab-width', `${cache.get(ul) + 10}px`);
+      } else {
+        ul.style.setProperty('--tab-width', '');
+      }
+
+      return wrapped;
+    }
+
+    function check() {
+      let any = false;
+      document.querySelectorAll('ul').forEach(ul => {
+        if (ul.querySelector('.tab') && checkWrapping(ul)) any = true;
+      });
+      document.body.classList.toggle('wrapped-tabs', any);
+    }
+
+    check();
+    let timer;
+    window.addEventListener('resize', () => {
+      clearTimeout(timer);
+      timer = setTimeout(check, 100);
+    });
+
+    // Re-check wrapping when tabs are switched via anchors
+    window.addEventListener('hashchange', () => {
+      clearTimeout(timer);
+      // Use requestAnimationFrame + setTimeout to ensure DOM has settled
+      requestAnimationFrame(() => {
+        timer = setTimeout(check, 0);
+      });
+    });
+  })();
+  </script>
+
+
     <script src="{{url_for('static_content', group='js', filename='language-selector.js')}}" defer></script>
     <script src="{{url_for('static_content', group='js', filename='search-modal.js')}}" defer></script>
     <script src="{{url_for('static_content', group='js', filename='toast.js')}}"></script>

changedetectionio/templates/menu.html

@@ -0,0 +1,54 @@
+{# Menu items template - used for both desktop and mobile menus #}
+{# CSS media queries handle which version displays - no need for conditional classes #}
+
+
+{% if current_user.is_authenticated or not has_password %}
+{% if not current_diff_url %}
+    <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('tags.') %}active{% endif %}">
+        <a href="{{ url_for('tags.tags_overview_page') }}" class="pure-menu-link">{{ _('GROUPS') }}</a>
+    </li>
+    <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('settings.') %}active{% endif %}">
+        <a href="{{ url_for('settings.settings_page') }}" class="pure-menu-link">{{ _('SETTINGS') }}</a>
+    </li>
+    <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('imports.') %}active{% endif %}">
+        <a href="{{ url_for('imports.import_page') }}" class="pure-menu-link">{{ _('IMPORT') }}</a>
+    </li>
+    <li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('backups.') %}active{% endif %}">
+        <a href="{{ url_for('backups.index') }}" class="pure-menu-link">{{ _('BACKUPS') }}</a>
+    </li>
+{% else %}
+    <li class="pure-menu-item menu-collapsible">
+        <a href="{{ url_for('ui.ui_edit.edit_page', uuid=uuid, next='diff') }}"
+           class="pure-menu-link">{{ _('EDIT') }}</a>
+    </li>
+{% endif %}
+{%- if current_user.is_authenticated -%}
+    <li class="pure-menu-item menu-collapsible">
+        <a href="{{ url_for('logout', redirect=request.path) }}" class="pure-menu-link">{{ _('LOG OUT') }}</a>
+    </li>
+{%- endif -%}
+
+{% else %}
+    <li class="pure-menu-item menu-collapsible">
+        <a class="pure-menu-link" href="https://changedetection.io">Website Change Detection and Notification.</a>
+    </li>
+{% endif %}
+    <li class="pure-menu-item menu-collapsible" id="inline-menu-extras-group">
+        <button class="toggle-button toggle-light-mode " type="button" title="{{ _('Toggle Light/Dark Mode') }}">
+            <span class="visually-hidden">{{ _('Toggle light/dark mode') }}</span>
+            <span class="icon-light">
+            {% include "svgs/light-mode-toggle-icon.svg" %}
+          </span>
+            <span class="icon-dark">
+            {% include "svgs/dark-mode-toggle-icon.svg" %}
+          </span>
+        </button>
+        <button class="toggle-button language-selector" type="button" title="{{ _('Change Language') }}">
+            <span class="visually-hidden">{{ _('Change language') }}</span>
+            <span class="{{ get_flag_for_locale(get_locale()) }}" id="language-selector-flag"></span>
+        </button>
+        <a class="github-link" href="https://github.com/dgtlmoon/changedetection.io">
+            {% include "svgs/github.svg" %}
+        </a>
+    </li>
+

changedetectionio/tests/conftest.py

@@ -270,3 +270,6 @@ def app(request, datastore_path):
        
     request.addfinalizer(teardown)
     yield app
+
+
+

changedetectionio/tests/test_api.py

@@ -165,18 +165,83 @@ def test_api_simple(client, live_server, measure_memory_usage, datastore_path):
     assert b'<div id' in res.data
 
 
-    # Fetch the difference between two versions
+    # Fetch the difference between two versions (default text format)
     res = client.get(
         url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest'),
         headers={'x-api-key': api_key},
     )
     assert b'(changed) Which is across' in res.data
+
+    # Test htmlcolor format
     res = client.get(
         url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?format=htmlcolor',
         headers={'x-api-key': api_key},
     )
     assert b'aria-label="Changed text" title="Changed text">Which is across multiple lines' in res.data
 
+    # Test html format
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?format=html',
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 200
+    assert b'<br>' in res.data
+
+    # Test markdown format
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?format=markdown',
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 200
+
+    # Test new diff preference parameters
+    # Test removed=false (should hide removed content)
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?removed=false',
+        headers={'x-api-key': api_key},
+    )
+    # Should not contain removed content indicator
+    assert b'(removed)' not in res.data
+    # Should still contain added content
+    assert b'(added)' in res.data or b'which has this one new line' in res.data
+
+    # Test added=false (should hide added content)
+    # Note: The test data has replacements, not pure additions, so we test differently
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?added=false&replaced=false',
+        headers={'x-api-key': api_key},
+    )
+    # With both added and replaced disabled, should have minimal content
+    # Should not contain added indicators
+    assert b'(added)' not in res.data
+
+    # Test replaced=false (should hide replaced/changed content)
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?replaced=false',
+        headers={'x-api-key': api_key},
+    )
+    # Should not contain changed content indicator
+    assert b'(changed)' not in res.data
+
+    # Test type=diffWords for word-level diff
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?type=diffWords&format=htmlcolor',
+        headers={'x-api-key': api_key},
+    )
+    # Should contain HTML formatted diff
+    assert res.status_code == 200
+    assert len(res.data) > 0
+
+    # Test combined parameters: show only additions with word diff
+    res = client.get(
+        url_for("watchhistorydiff", uuid=watch_uuid, from_timestamp='previous', to_timestamp='latest')+'?removed=false&replaced=false&type=diffWords',
+        headers={'x-api-key': api_key},
+    )
+    assert res.status_code == 200
+    # Should not contain removed or changed markers
+    assert b'(removed)' not in res.data
+    assert b'(changed)' not in res.data
+
 
     # Fetch the whole watch
     res = client.get(

changedetectionio/tests/test_extract_regex.py

@@ -206,11 +206,10 @@ def test_regex_error_handling(client, live_server, measure_memory_usage, datasto
     # Add our URL to the import page
     test_url = url_for('test_endpoint', _external=True)
     uuid = client.application.config.get('DATASTORE').add_watch(url=test_url)
-    client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
-
+    time.sleep(0.2)
     ### test regex error handling
     res = client.post(
-        url_for("ui.ui_edit.edit_page", uuid="first"),
+        url_for("ui.ui_edit.edit_page", uuid=uuid),
         data={"extract_text": '/something bad\d{3/XYZ',
               "url": test_url,
               "fetch_backend": "html_requests",

changedetectionio/tests/test_history_consistency.py

@@ -4,25 +4,47 @@ import time
 import os
 import json
 from flask import url_for
+from loguru import logger
+from .. import strtobool
 from .util import wait_for_all_checks, delete_all_watches
-from urllib.parse import urlparse, parse_qs
+import brotli
+
 
 def test_consistent_history(client, live_server, measure_memory_usage, datastore_path):
-   #  live_server_setup(live_server) # Setup on conftest per function
-    workers = int(os.getenv("FETCH_WORKERS", 10))
-    r = range(1, 10+workers)
 
-    for one in r:
-        test_url = url_for('test_endpoint', content_type="text/html", content=str(one), _external=True)
-        res = client.post(
-            url_for("imports.import_page"),
-            data={"urls": test_url},
-            follow_redirects=True
-        )
+    uuids = set()
+    sys_fetch_workers = int(os.getenv("FETCH_WORKERS", 10))
+    workers = range(1, sys_fetch_workers)
+    now = time.time()
 
-        assert b"1 Imported" in res.data
+    for one in workers:
+        if strtobool(os.getenv("TEST_WITH_BROTLI")):
+            # A very long string that WILL trigger Brotli compression of the snapshot
+            # BROTLI_COMPRESS_SIZE_THRESHOLD should be set to say 200
+            from ..model.Watch import BROTLI_COMPRESS_SIZE_THRESHOLD
+            content = str(one) + "x" + str(one) * (BROTLI_COMPRESS_SIZE_THRESHOLD + 10)
+        else:
+            # Just enough to test datastore
+            content = str(one)+'x'
+
+        test_url = url_for('test_endpoint', content_type="text/html", content=content, _external=True)
+        uuids.add(client.application.config.get('DATASTORE').add_watch(url=test_url, extras={'title': str(one)}))
+
+    client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
 
     wait_for_all_checks(client)
+    duration = time.time() - now
+    per_worker = duration/sys_fetch_workers
+    if sys_fetch_workers < 20:
+        per_worker_threshold=0.6
+    elif sys_fetch_workers < 50:
+        per_worker_threshold = 0.8
+    else:
+        per_worker_threshold = 1.5
+
+    logger.debug(f"All fetched in {duration:.2f}s, {per_worker}s per worker")
+    # Problematic on github
+    #assert per_worker < per_worker_threshold, f"If concurrency is working good, no blocking async problems, each worker ({sys_fetch_workers} workers) should have done his job in under {per_worker_threshold}s, got {per_worker:.2f}s per worker, total duration was {duration:.2f}s"
 
     # Essentially just triggers the DB write/update
     res = client.post(
@@ -34,7 +56,7 @@ def test_consistent_history(client, live_server, measure_memory_usage, datastore
     )
     assert b"Settings updated." in res.data
 
-
+    # Wait for the sync DB save to happen
     time.sleep(2)
 
     json_db_file = os.path.join(live_server.app.config['DATASTORE'].datastore_path, 'url-watches.json')
@@ -44,14 +66,18 @@ def test_consistent_history(client, live_server, measure_memory_usage, datastore
         json_obj = json.load(f)
 
     # assert the right amount of watches was found in the JSON
-    assert len(json_obj['watching']) == len(r), "Correct number of watches was found in the JSON"
-    i=0
+    assert len(json_obj['watching']) == len(workers), "Correct number of watches was found in the JSON"
+
+    i = 0
     # each one should have a history.txt containing just one line
     for w in json_obj['watching'].keys():
-        i+=1
+        i += 1
         history_txt_index_file = os.path.join(live_server.app.config['DATASTORE'].datastore_path, w, 'history.txt')
         assert os.path.isfile(history_txt_index_file), f"History.txt should exist where I expect it at {history_txt_index_file}"
 
+        # Should be no errors (could be from brotli etc)
+        assert not live_server.app.config['DATASTORE'].data['watching'][w].get('last_error')
+
         # Same like in model.Watch
         with open(history_txt_index_file, "r") as f:
             tmp_history = dict(i.strip().split(',', 2) for i in f.readlines())
@@ -63,15 +89,21 @@ def test_consistent_history(client, live_server, measure_memory_usage, datastore
         # Find the snapshot one
         for fname in files_in_watch_dir:
             if fname != 'history.txt' and 'html' not in fname:
+                if strtobool(os.getenv("TEST_WITH_BROTLI")):
+                    assert fname.endswith('.br'), "Forced TEST_WITH_BROTLI then it should be a .br filename"
+
+                full_snapshot_history_path = os.path.join(live_server.app.config['DATASTORE'].datastore_path, w, fname)
                 # contents should match what we requested as content returned from the test url
-                with open(os.path.join(live_server.app.config['DATASTORE'].datastore_path, w, fname), 'r') as snapshot_f:
-                    contents = snapshot_f.read()
-                    watch_url = json_obj['watching'][w]['url']
-                    u = urlparse(watch_url)
-                    q = parse_qs(u[4])
-                    assert q['content'][0] == contents.strip(), f"Snapshot file {fname} should contain {q['content'][0]}"
-
+                if fname.endswith('.br'):
+                    with open(full_snapshot_history_path, 'rb') as f:
+                        contents = brotli.decompress(f.read()).decode('utf-8')
+                else:
+                    with open(full_snapshot_history_path, 'r') as snapshot_f:
+                        contents = snapshot_f.read()
 
+                watch_title = json_obj['watching'][w]['title']
+                assert json_obj['watching'][w]['title'], "Watch should have a title set"
+                assert contents.startswith(watch_title + "x"), f"Snapshot contents in file {fname} should start with '{watch_title}x', got '{contents}'"
 
         assert len(files_in_watch_dir) == 3, "Should be just three files in the dir, html.br snapshot, history.txt and the extracted text snapshot"
 

changedetectionio/tests/test_live_preview.py

@@ -25,12 +25,13 @@ def test_content_filter_live_preview(client, live_server, measure_memory_usage,
 
     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": ''},
-        follow_redirects=True
-    )
-    uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
+
+    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)
+
     res = client.post(
         url_for("ui.ui_edit.edit_page", uuid=uuid),
         data={

changedetectionio/tests/test_notification.py

@@ -5,7 +5,7 @@ import re
 from flask import url_for
 from loguru import logger
 
-from .util import set_original_response, set_modified_response, set_more_modified_response, live_server_setup, wait_for_all_checks
+from .util import set_original_response, set_modified_response, set_more_modified_response, live_server_setup, wait_for_all_checks, wait_for_notification_endpoint_output
 from . util import  extract_UUID_from_client
 import logging
 import base64
@@ -83,7 +83,9 @@ def test_check_notification(client, live_server, measure_memory_usage, datastore
 
 
     uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
-    with open(os.path.join(datastore_path, str(uuid), 'last-screenshot.png'), 'wb') as f:
+    screenshot_dir = os.path.join(datastore_path, str(uuid))
+    os.makedirs(screenshot_dir, exist_ok=True)
+    with open(os.path.join(screenshot_dir, 'last-screenshot.png'), 'wb') as f:
         f.write(base64.b64decode(testimage_png))
 
     # Goto the edit page, add our ignore text
@@ -142,7 +144,7 @@ def test_check_notification(client, live_server, measure_memory_usage, datastore
     # Trigger a check
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
-    time.sleep(6)
+    wait_for_notification_endpoint_output(datastore_path=datastore_path)
 
     # Check no errors were recorded
     res = client.get(url_for("watchlist.index"))
@@ -199,7 +201,7 @@ def test_check_notification(client, live_server, measure_memory_usage, datastore
     set_more_modified_response(datastore_path=datastore_path)
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
-    time.sleep(6)
+    wait_for_notification_endpoint_output(datastore_path=datastore_path)
     # Verify what was sent as a notification, this file should exist
     with open(os.path.join(datastore_path, "notification.txt"), "r") as f:
         notification_submission = f.read()
@@ -240,7 +242,8 @@ def test_check_notification(client, live_server, measure_memory_usage, datastore
     )
     assert b"Updated watch." in res.data
 
-    time.sleep(2)
+    wait_for_all_checks(client)
+    wait_for_notification_endpoint_output(datastore_path=datastore_path)
 
     # Verify what was sent as a notification, this file should exist
     with open(os.path.join(datastore_path, "notification.txt"), "r") as f:
@@ -325,7 +328,7 @@ def test_notification_custom_endpoint_and_jinja2(client, live_server, measure_me
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
 
-    time.sleep(2) # plus extra delay for notifications to fire
+    wait_for_notification_endpoint_output(datastore_path=datastore_path)
 
 
     # Check no errors were recorded, because we asked for 204 which is slightly uncommon but is still OK
@@ -443,7 +446,7 @@ def test_global_send_test_notification(client, live_server, measure_memory_usage
     assert res.status_code != 500
 
     # Give apprise time to fire
-    time.sleep(4)
+    wait_for_notification_endpoint_output(datastore_path=datastore_path)
 
     with open(os.path.join(datastore_path, "notification.txt"), 'r') as f:
         x = f.read()
@@ -500,7 +503,7 @@ def test_single_send_test_notification_on_watch(client, live_server, measure_mem
 
     test_notification_url = url_for('test_notification_endpoint', _external=True).replace('http://', 'post://')+"?xxx={{ watch_url }}&+custom-header=123"
     # 1995 UTF-8 content should be encoded
-    test_body = 'change detection is cool 网站监测 内容更新了 - {{diff_full}}'
+    test_body = 'change detection is cool 网站监测 内容更新了 - {{diff_full}}\n\nCurrent snapshot: {{current_snapshot}}'
     ######### Test global/system settings
     res = client.post(
         url_for("ui.ui_notification.ajax_callback_send_notification_test")+f"/{uuid}",
@@ -525,10 +528,11 @@ def test_single_send_test_notification_on_watch(client, live_server, measure_mem
             assert 'title="Changed into">Example text:' not in x
             assert 'span' not in x
             assert 'Example text:' in x
-
+        #3720 current_snapshot check, was working but lets test it exactly.
+        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)
 
@@ -547,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 }}",
         },
@@ -555,29 +560,29 @@ 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)
     assert b'Queued 1 watch for rechecking.' in res.data
 
     wait_for_all_checks(client)
-    time.sleep(2)
+    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"),
@@ -586,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/test_rss_group.py

@@ -2,7 +2,7 @@
 
 import time
 from flask import url_for
-from .util import live_server_setup, wait_for_all_checks, extract_rss_token_from_UI, get_UUID_for_tag_name, delete_all_watches
+from .util import live_server_setup, wait_for_all_checks, wait_for_watch_history, extract_rss_token_from_UI, get_UUID_for_tag_name, delete_all_watches
 import os
 
 
@@ -87,6 +87,9 @@ def test_rss_group(client, live_server, measure_memory_usage, datastore_path):
     # Wait for initial checks to complete
     wait_for_all_checks(client)
 
+    # Ensure initial snapshots are saved
+    assert wait_for_watch_history(client, min_history_count=1, timeout=10), "Watches did not save initial snapshots"
+
     # Trigger a change
     set_modified_response(datastore_path=datastore_path)
 
@@ -94,6 +97,9 @@ def test_rss_group(client, live_server, measure_memory_usage, datastore_path):
     res = client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
 
+    # Ensure all watches have sufficient history for RSS generation
+    assert wait_for_watch_history(client, min_history_count=2, timeout=10), "Watches did not accumulate sufficient history"
+
     # Get RSS token
     rss_token = extract_rss_token_from_UI(client)
     assert rss_token is not None
@@ -216,11 +222,13 @@ def test_rss_group_only_unviewed(client, live_server, measure_memory_usage, data
     assert b"Watch added" in res.data
 
     wait_for_all_checks(client)
+    assert wait_for_watch_history(client, min_history_count=1, timeout=10), "Initial snapshots not saved"
 
     # Trigger changes
     set_modified_response(datastore_path=datastore_path)
     res = client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
+    assert wait_for_watch_history(client, min_history_count=2, timeout=10), "History not accumulated"
 
     # Get RSS token
     rss_token = extract_rss_token_from_UI(client)

changedetectionio/tests/test_xpath_selector_unit.py

@@ -1,8 +1,10 @@
 import sys
 import os
 import pytest
+
+from changedetectionio import html_tools
+
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import html_tools
 
 # test generation guide.
 # 1. Do not include encoding in the xml declaration if the test object is a str type.

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
 
@@ -164,14 +170,45 @@ def wait_for_all_checks(client=None):
         if q_length == 0 and not any_workers_busy:
             if empty_since is None:
                 empty_since = time.time()
-            elif time.time() - empty_since >= 0.15:  # Shorter wait
+            # Brief stabilization period for async workers
+            elif time.time() - empty_since >= 0.3:
                 break
         else:
             empty_since = None
-        
+
         attempt += 1
         time.sleep(0.3)
 
+def wait_for_watch_history(client, min_history_count=2, timeout=10):
+    """
+    Wait for watches to have sufficient history entries.
+    Useful after wait_for_all_checks() when you need to ensure history is populated.
+
+    Args:
+        client: Test client with access to datastore
+        min_history_count: Minimum number of history entries required
+        timeout: Maximum time to wait in seconds
+    """
+    datastore = client.application.config.get('DATASTORE')
+    start_time = time.time()
+
+    while time.time() - start_time < timeout:
+        all_have_history = True
+        for uuid, watch in datastore.data['watching'].items():
+            history_count = len(watch.history.keys())
+            if history_count < min_history_count:
+                all_have_history = False
+                break
+
+        if all_have_history:
+            return True
+
+        time.sleep(0.2)
+
+    # Timeout - return False
+    return False
+
+
 # Replaced by new_live_server_setup and calling per function scope in conftest.py
 def  live_server_setup(live_server):
     return True
@@ -189,6 +226,8 @@ def new_live_server_setup(live_server):
 
     @live_server.app.route('/test-endpoint')
     def test_endpoint():
+        from loguru import logger
+        logger.debug(f"/test-endpoint hit {request}")
         ctype = request.args.get('content_type')
         status_code = request.args.get('status_code')
         content = request.args.get('content') or None

changedetectionio/tests/visualselector/test_fetch_data.py

@@ -144,7 +144,6 @@ def test_basic_browserstep(client, live_server, measure_memory_usage, datastore_
 
 def test_non_200_errors_report_browsersteps(client, live_server, measure_memory_usage, datastore_path):
 
-
     four_o_four_url =  url_for('test_endpoint', status_code=404, _external=True)
     four_o_four_url = four_o_four_url.replace('localhost.localdomain', 'cdio')
     four_o_four_url = four_o_four_url.replace('localhost', 'cdio')
@@ -186,3 +185,65 @@ def test_non_200_errors_report_browsersteps(client, live_server, measure_memory_
         url_for("ui.form_delete", uuid="all"),
         follow_redirects=True
     )
+
+def test_browsersteps_edit_UI_startsession(client, live_server, measure_memory_usage, datastore_path):
+
+    assert os.getenv('PLAYWRIGHT_DRIVER_URL'), "Needs PLAYWRIGHT_DRIVER_URL set for this test"
+
+    # Add a watch first
+    test_url = url_for('test_interactive_html_endpoint', _external=True)
+    test_url = test_url.replace('localhost.localdomain', 'cdio')
+    test_url = test_url.replace('localhost', 'cdio')
+
+    uuid = client.application.config.get('DATASTORE').add_watch(url=test_url, extras={'fetch_backend': 'html_webdriver', 'paused': True})
+
+    # Test starting a browsersteps session
+    res = client.get(
+        url_for("browser_steps.browsersteps_start_session", uuid=uuid),
+        follow_redirects=True
+    )
+
+    assert res.status_code == 200
+    assert res.is_json
+    json_data = res.get_json()
+    assert 'browsersteps_session_id' in json_data
+    assert json_data['browsersteps_session_id']  # Not empty
+
+    browsersteps_session_id = json_data['browsersteps_session_id']
+
+    # Verify the session exists in browsersteps_sessions
+    from changedetectionio.blueprint.browser_steps import browsersteps_sessions, browsersteps_watch_to_session
+    assert browsersteps_session_id in browsersteps_sessions
+    assert uuid in browsersteps_watch_to_session
+    assert browsersteps_watch_to_session[uuid] == browsersteps_session_id
+
+    # Verify browsersteps UI shows up on edit page
+    res = client.get(url_for("ui.ui_edit.edit_page", uuid=uuid))
+    assert b'browsersteps-click-start' in res.data, "Browsersteps manual UI shows up"
+
+    # Session should still exist after GET (not cleaned up yet)
+    assert browsersteps_session_id in browsersteps_sessions
+    assert uuid in browsersteps_watch_to_session
+
+    # Test cleanup happens on save (POST)
+    res = client.post(
+        url_for("ui.ui_edit.edit_page", uuid=uuid),
+        data={
+            "url": test_url,
+            "tags": "",
+            'fetch_backend': "html_webdriver",
+            "time_between_check_use_default": "y",
+        },
+        follow_redirects=True
+    )
+    assert b"Updated watch" in res.data
+
+    # NOW verify the session was cleaned up after save
+    assert browsersteps_session_id not in browsersteps_sessions
+    assert uuid not in browsersteps_watch_to_session
+
+    # Cleanup
+    client.get(
+        url_for("ui.form_delete", uuid="all"),
+        follow_redirects=True
+    )

changedetectionio/translations/cs/LC_MESSAGES/messages.po

@@ -170,7 +170,7 @@ msgstr "Neplatná hodnota."
 
 #: changedetectionio/forms.py:732
 msgid "Watch"
-msgstr "# monitory"
+msgstr "Monitorovat"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
@@ -178,7 +178,7 @@ msgstr "Procesor"
 
 #: changedetectionio/forms.py:734
 msgid "Edit > Watch"
-msgstr "Nejprve upravte a poté sledujte"
+msgstr "Upravit > Monitorovat"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 msgid "Fetch Method"
@@ -344,7 +344,7 @@ msgstr "Odeslat upozornění, když filtr již na stránce nelze najít"
 #: changedetectionio/blueprint/ui/templates/edit.html:59
 #: changedetectionio/forms.py:832
 msgid "Notifications"
-msgstr "Žádné informace"
+msgstr "Oznámení"
 
 #: changedetectionio/forms.py:832
 msgid "Muted"
@@ -396,7 +396,7 @@ msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
 msgid "Name"
-msgstr "Zrušit ztlumení"
+msgstr "Název"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -420,7 +420,7 @@ msgstr "Požadavky na prostý text"
 
 #: changedetectionio/forms.py:946
 msgid "Chrome requests"
-msgstr "Žádost"
+msgstr "Chrome požadavky"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -476,7 +476,7 @@ msgstr "Kontrola zabezpečení přístupového tokenu API povolena"
 
 #: changedetectionio/forms.py:989
 msgid "Notification base URL override"
-msgstr "Počet upozornění na upozornění"
+msgstr "Základní URL pro upozornění"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -608,11 +608,11 @@ msgstr "No backups found."
 
 #: changedetectionio/blueprint/backups/templates/overview.html:28
 msgid "Create backup"
-msgstr "Create backup"
+msgstr "Vytvořit zálohu"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:30
 msgid "Remove backups"
-msgstr "Remove backups"
+msgstr "Odstranit zálohy"
 
 #: changedetectionio/blueprint/imports/importer.py:45
 msgid ""
@@ -823,7 +823,7 @@ msgstr "Generál"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:23
 msgid "Fetching"
-msgstr "Hledání"
+msgstr "Načítání"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:24
 msgid "Global Filters"
@@ -851,7 +851,7 @@ msgstr "CAPTCHA a proxy"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:35
 msgid "Info"
-msgstr "Více informací"
+msgstr "Info"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:46
 msgid "Default recheck time for all watches, current system minimum is"
@@ -1004,7 +1004,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:31
 msgid "# Watches"
-msgstr "# monitory"
+msgstr "# monitorů"
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:32
 msgid "Tag / Label name"
@@ -1251,7 +1251,7 @@ msgstr "nejprve odkaz."
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr "Žádné informace"
+msgstr "Potvrzovací text"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1456,7 +1456,7 @@ msgstr "Podmínky"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:60
 msgid "Stats"
-msgstr "NASTAVENÍ"
+msgstr "Statistiky"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:73
 #: changedetectionio/blueprint/ui/templates/edit.html:313
@@ -1895,11 +1895,11 @@ msgstr "Přidejte nové monitory zjišťování změn webové stránky"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:34
 msgid "Watch this URL!"
-msgstr "Sledujte tuto adresu URL!"
+msgstr "Monitorovat tuto URL!"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "Nejprve upravte a poté sledujte"
+msgstr "Upravit a monitorovat"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2011,9 +2011,7 @@ msgstr "Změněno"
 msgid "No website watches configured, please add a URL in the box above, or"
 msgstr ""
 "Nejsou nakonfigurována žádná sledování webových stránek, do výše "
-"uvedeného pole přidejte adresu URL neboNejsou nakonfigurována žádná "
-"sledování webových stránek, do výše uvedeného pole přidejte adresu URL "
-"nebo"
+"uvedeného pole přidejte adresu URL nebo"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
 msgid "import a list"
@@ -2050,7 +2048,7 @@ msgstr "Ve frontě"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:250
 msgid "History"
-msgstr "Dějiny"
+msgstr "Historie"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:251
 msgid "Preview"
@@ -2401,11 +2399,11 @@ msgstr "Změnit jazyk"
 
 #: changedetectionio/templates/base.html:253
 msgid "Watch List"
-msgstr "# monitory"
+msgstr "Seznam monitorů"
 
 #: changedetectionio/templates/base.html:258
 msgid "Watches"
-msgstr "# monitory"
+msgstr "Monitory"
 
 #: changedetectionio/templates/base.html:261
 msgid "Queue Status"

changedetectionio/translations/de/LC_MESSAGES/messages.po

@@ -172,7 +172,7 @@ msgstr "Ungültiger Wert."
 
 #: changedetectionio/forms.py:732
 msgid "Watch"
-msgstr "Watch"
+msgstr "Monitor"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
@@ -180,7 +180,7 @@ msgstr "Prozessor"
 
 #: changedetectionio/forms.py:734
 msgid "Edit > Watch"
-msgstr "Edit > Watch"
+msgstr "Bearbeiten > Monitor"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 msgid "Fetch Method"
@@ -337,7 +337,7 @@ msgstr "Speichern"
 
 #: changedetectionio/forms.py:829
 msgid "Proxy"
-msgstr "Stellvertreter"
+msgstr "Proxy"
 
 #: changedetectionio/forms.py:831
 msgid "Send a notification when the filter can no longer be found on the page"
@@ -350,7 +350,7 @@ msgstr ""
 #: changedetectionio/blueprint/ui/templates/edit.html:59
 #: changedetectionio/forms.py:832
 msgid "Notifications"
-msgstr "Keine Informationen"
+msgstr "Benachrichtigungen"
 
 #: changedetectionio/forms.py:832
 msgid "Muted"
@@ -404,7 +404,7 @@ msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
 msgid "Name"
-msgstr "Stummschaltung aufheben"
+msgstr "Name"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -428,7 +428,7 @@ msgstr "Klartextanfragen"
 
 #: changedetectionio/forms.py:946
 msgid "Chrome requests"
-msgstr "Anfrage"
+msgstr "Chrome Requests"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -484,7 +484,7 @@ msgstr "Sicherheitsüberprüfung des API-Zugriffstokens aktiviert"
 
 #: changedetectionio/forms.py:989
 msgid "Notification base URL override"
-msgstr "Anzahl der Benachrichtigungsalarme"
+msgstr "Basis-URL für Benachrichtigungen"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -620,11 +620,11 @@ msgstr "Keine Backups gefunden."
 
 #: changedetectionio/blueprint/backups/templates/overview.html:28
 msgid "Create backup"
-msgstr "BACKUPS"
+msgstr "Backup erstellen"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:30
 msgid "Remove backups"
-msgstr "BACKUPS"
+msgstr "Backups entfernen"
 
 #: changedetectionio/blueprint/imports/importer.py:45
 msgid ""
@@ -815,7 +815,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/settings/__init__.py:126
 msgid "Settings updated."
-msgstr "EINSTELLUNGEN"
+msgstr "Einstellungen aktualisiert."
 
 #: changedetectionio/blueprint/settings/__init__.py:129
 #: changedetectionio/blueprint/ui/edit.py:283
@@ -839,7 +839,7 @@ msgstr "Allgemein"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:23
 msgid "Fetching"
-msgstr "Suchen"
+msgstr "Abrufen"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:24
 msgid "Global Filters"
@@ -867,7 +867,7 @@ msgstr "CAPTCHA & Proxys"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:35
 msgid "Info"
-msgstr "Weitere Informationen"
+msgstr "Info"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:46
 msgid "Default recheck time for all watches, current system minimum is"
@@ -897,7 +897,7 @@ msgstr "Keine Plugins aktiv"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:405
 msgid "Back"
-msgstr "BACKUPS"
+msgstr "Zurück"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:406
 msgid "Clear Snapshot History"
@@ -942,7 +942,7 @@ msgstr "Filter und Trigger"
 
 #: changedetectionio/blueprint/tags/templates/edit-tag.html:50
 msgid "These settings are"
-msgstr "EINSTELLUNGEN"
+msgstr "Diese Einstellungen sind"
 
 #: changedetectionio/blueprint/tags/templates/edit-tag.html:50
 msgid "added"
@@ -1271,7 +1271,7 @@ msgstr "Link zuerst."
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr "Keine Informationen"
+msgstr "Bestätigungstext"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1420,7 +1420,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/diff.html:127
 msgid "from settings."
-msgstr "EINSTELLUNGEN"
+msgstr "aus den Einstellungen."
 
 #: changedetectionio/blueprint/ui/templates/diff.html:133
 msgid "Goto single snapshot"
@@ -1478,7 +1478,7 @@ msgstr "Bedingungen"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:60
 msgid "Stats"
-msgstr "EINSTELLUNGEN"
+msgstr "Statistiken"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:73
 #: changedetectionio/blueprint/ui/templates/edit.html:313
@@ -1931,11 +1931,11 @@ msgstr ""
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:34
 msgid "Watch this URL!"
-msgstr "Sehen Sie sich diese URL an!"
+msgstr "Diese URL überwachen!"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "Zuerst bearbeiten, dann ansehen"
+msgstr "Bearbeiten > Überwachen"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2396,7 +2396,7 @@ msgstr "EINSTELLUNGEN"
 #: changedetectionio/templates/base.html:84
 #: changedetectionio/templates/base.html:170
 msgid "IMPORT"
-msgstr "IMPORT"
+msgstr "IMPORTIEREN"
 
 #: changedetectionio/templates/base.html:87
 #: changedetectionio/templates/base.html:171

changedetectionio/translations/fr/LC_MESSAGES/messages.po

@@ -181,7 +181,7 @@ msgstr "Processeur"
 
 #: changedetectionio/forms.py:734
 msgid "Edit > Watch"
-msgstr "Modifiez d'abord, puis regardez"
+msgstr "Modifier > Surveiller"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 msgid "Fetch Method"
@@ -342,7 +342,7 @@ msgstr "Sauvegarder"
 
 #: changedetectionio/forms.py:829
 msgid "Proxy"
-msgstr "Procuration"
+msgstr "Proxy"
 
 #: changedetectionio/forms.py:831
 msgid "Send a notification when the filter can no longer be found on the page"
@@ -353,7 +353,7 @@ msgstr "Envoyer une notification lorsque le filtre n'est plus trouvé sur la pag
 #: changedetectionio/blueprint/ui/templates/edit.html:59
 #: changedetectionio/forms.py:832
 msgid "Notifications"
-msgstr "Aucune information"
+msgstr "Notifications"
 
 #: changedetectionio/forms.py:832
 msgid "Muted"
@@ -405,7 +405,7 @@ msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
 msgid "Name"
-msgstr "Réactiver le son"
+msgstr "Nom"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -429,7 +429,7 @@ msgstr "Requêtes en texte brut"
 
 #: changedetectionio/forms.py:946
 msgid "Chrome requests"
-msgstr "Demande"
+msgstr "Requêtes Chrome"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -485,7 +485,7 @@ msgstr "Contrôle de sécurité du jeton d'accès à l'API activé"
 
 #: changedetectionio/forms.py:989
 msgid "Notification base URL override"
-msgstr "Nombre d'alertes de notification"
+msgstr "URL de base pour les notifications"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -621,11 +621,11 @@ msgstr "Aucune sauvegarde trouvée."
 
 #: changedetectionio/blueprint/backups/templates/overview.html:28
 msgid "Create backup"
-msgstr "SAUVEGARDES"
+msgstr "Créer sauvegarde"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:30
 msgid "Remove backups"
-msgstr "SAUVEGARDES"
+msgstr "Supprimer sauvegardes"
 
 #: changedetectionio/blueprint/imports/importer.py:45
 msgid ""
@@ -844,7 +844,7 @@ msgstr "Général"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:23
 msgid "Fetching"
-msgstr "Recherche"
+msgstr "Récupération"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:24
 msgid "Global Filters"
@@ -872,7 +872,7 @@ msgstr "CAPTCHA et procurations"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:35
 msgid "Info"
-msgstr "Plus d'informations"
+msgstr "Info"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:46
 msgid "Default recheck time for all watches, current system minimum is"
@@ -902,7 +902,7 @@ msgstr "Aucun plugin actif"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:405
 msgid "Back"
-msgstr "SAUVEGARDES"
+msgstr "Retour"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:406
 msgid "Clear Snapshot History"
@@ -1276,7 +1276,7 @@ msgstr "lien d'abord."
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr "Aucune information"
+msgstr "Texte de confirmation"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1483,7 +1483,7 @@ msgstr "Conditions"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:60
 msgid "Stats"
-msgstr "PARAMÈTRES"
+msgstr "Statistiques"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:73
 #: changedetectionio/blueprint/ui/templates/edit.html:313
@@ -1942,7 +1942,7 @@ msgstr "Surveillez cette URL !"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "Modifiez d'abord, puis regardez"
+msgstr "Modifier > Surveiller"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2054,8 +2054,7 @@ msgstr "Modifié"
 msgid "No website watches configured, please add a URL in the box above, or"
 msgstr ""
 "Aucune surveillance de site Web configurée, veuillez ajouter une URL dans"
-" la case ci-dessus, ouAucune surveillance de site Web configurée, "
-"veuillez ajouter une URL dans la case ci-dessus, ou"
+" la case ci-dessus, ou"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
 msgid "import a list"
@@ -2092,7 +2091,7 @@ msgstr "En file d'attente"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:250
 msgid "History"
-msgstr "Histoire"
+msgstr "Historique"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:251
 msgid "Preview"

changedetectionio/translations/it/LC_MESSAGES/messages.po

@@ -175,16 +175,15 @@ msgstr "Valore non valido."
 
 #: changedetectionio/forms.py:732
 msgid "Watch"
-msgstr "Osserva"
+msgstr "Monitora"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
 msgstr "Processore"
 
 #: changedetectionio/forms.py:734
-#, fuzzy
 msgid "Edit > Watch"
-msgstr "Modifica prima poi Monitora"
+msgstr "Modifica > Monitora"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 msgid "Fetch Method"
@@ -415,9 +414,8 @@ msgid "Invalid template syntax in \"%(header)s\" header: %(error)s"
 msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
-#, fuzzy
 msgid "Name"
-msgstr "Riattiva audio"
+msgstr "Nome"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -440,9 +438,8 @@ msgid "Plaintext requests"
 msgstr "Richieste in chiaro"
 
 #: changedetectionio/forms.py:946
-#, fuzzy
 msgid "Chrome requests"
-msgstr "Richiesta"
+msgstr "Richieste Chrome"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -497,9 +494,8 @@ msgid "API access token security check enabled"
 msgstr "Controllo sicurezza token API attivo"
 
 #: changedetectionio/forms.py:989
-#, fuzzy
 msgid "Notification base URL override"
-msgstr "Notifiche"
+msgstr "URL base notifiche"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -1026,7 +1022,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:31
 msgid "# Watches"
-msgstr ""
+msgstr "# Monitoraggi"
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:32
 msgid "Tag / Label name"
@@ -1273,7 +1269,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr ""
+msgstr "Testo di conferma"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1915,7 +1911,7 @@ msgstr "Monitora questo URL!"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "Modifica prima poi Monitora"
+msgstr "Modifica > Monitora"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2025,7 +2021,7 @@ msgstr "Modifica"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
 msgid "No website watches configured, please add a URL in the box above, or"
-msgstr ""
+msgstr "Nessun monitoraggio configurato, aggiungi un URL nella casella sopra, oppure"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
 msgid "import a list"
@@ -2428,12 +2424,12 @@ msgstr "Cambia lingua"
 #: changedetectionio/templates/base.html:253
 #, fuzzy
 msgid "Watch List"
-msgstr "Osserva"
+msgstr "Lista Monitoraggi"
 
 #: changedetectionio/templates/base.html:258
 #, fuzzy
 msgid "Watches"
-msgstr "Osserva"
+msgstr "Monitoraggi"
 
 #: changedetectionio/templates/base.html:261
 msgid "Queue Status"

changedetectionio/translations/ko/LC_MESSAGES/messages.po

@@ -176,18 +176,16 @@ msgid "Invalid value."
 msgstr "값이 잘못되었습니다."
 
 #: changedetectionio/forms.py:732
-#, fuzzy
 msgid "Watch"
-msgstr "# 시계"
+msgstr "모니터"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
 msgstr "프로세서"
 
 #: changedetectionio/forms.py:734
-#, fuzzy
 msgid "Edit > Watch"
-msgstr "먼저 편집한 다음 보기"
+msgstr "편집 > 모니터"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 #, fuzzy
@@ -363,7 +361,7 @@ msgstr "구하다"
 
 #: changedetectionio/forms.py:829
 msgid "Proxy"
-msgstr "대리"
+msgstr "프록시"
 
 #: changedetectionio/forms.py:831
 msgid "Send a notification when the filter can no longer be found on the page"
@@ -374,7 +372,7 @@ msgstr "페이지에서 필터를 더 이상 찾을 수 없으면 알림 보내
 #: changedetectionio/blueprint/ui/templates/edit.html:59
 #: changedetectionio/forms.py:832
 msgid "Notifications"
-msgstr "정보 없음"
+msgstr "알림"
 
 #: changedetectionio/forms.py:832
 #, fuzzy
@@ -427,9 +425,8 @@ msgid "Invalid template syntax in \"%(header)s\" header: %(error)s"
 msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
-#, fuzzy
 msgid "Name"
-msgstr "음소거 해제"
+msgstr "이름"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -452,9 +449,8 @@ msgid "Plaintext requests"
 msgstr "일반 텍스트 요청"
 
 #: changedetectionio/forms.py:946
-#, fuzzy
 msgid "Chrome requests"
-msgstr "요구"
+msgstr "Chrome 요청"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -511,9 +507,8 @@ msgid "API access token security check enabled"
 msgstr "API 액세스 토큰 보안 확인이 활성화되었습니다."
 
 #: changedetectionio/forms.py:989
-#, fuzzy
 msgid "Notification base URL override"
-msgstr "알림 경고 수"
+msgstr "알림 기본 URL"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -647,11 +642,11 @@ msgstr "백업을 찾을 수 없습니다."
 
 #: changedetectionio/blueprint/backups/templates/overview.html:28
 msgid "Create backup"
-msgstr "백업"
+msgstr "백업 생성"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:30
 msgid "Remove backups"
-msgstr "백업"
+msgstr "백업 삭제"
 
 #: changedetectionio/blueprint/imports/importer.py:45
 msgid ""
@@ -859,7 +854,7 @@ msgstr "일반적인"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:23
 msgid "Fetching"
-msgstr "수색"
+msgstr "가져오기"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:24
 msgid "Global Filters"
@@ -887,7 +882,7 @@ msgstr "보안 문자 및 프록시"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:35
 msgid "Info"
-msgstr "추가 정보"
+msgstr "정보"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:46
 msgid "Default recheck time for all watches, current system minimum is"
@@ -915,7 +910,7 @@ msgstr "활성화된 플러그인이 없습니다."
 
 #: changedetectionio/blueprint/settings/templates/settings.html:405
 msgid "Back"
-msgstr "백업"
+msgstr "뒤로"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:406
 msgid "Clear Snapshot History"
@@ -1038,7 +1033,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:31
 msgid "# Watches"
-msgstr "# 시계"
+msgstr "# 모니터"
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:32
 msgid "Tag / Label name"
@@ -1290,7 +1285,7 @@ msgstr "먼저 링크하세요."
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr "정보 없음"
+msgstr "확인 텍스트"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1493,7 +1488,7 @@ msgstr "정황"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:60
 msgid "Stats"
-msgstr "설정"
+msgstr "통계"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:73
 #: changedetectionio/blueprint/ui/templates/edit.html:313
@@ -1928,11 +1923,11 @@ msgstr "새로운 웹 페이지 변경 감지 감시 추가"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:34
 msgid "Watch this URL!"
-msgstr "이 URL을 시청하세요!"
+msgstr "이 URL 모니터!"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "먼저 편집한 다음 보기"
+msgstr "편집 후 모니터"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2079,7 +2074,7 @@ msgstr "대기 중"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:250
 msgid "History"
-msgstr "역사"
+msgstr "기록"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:251
 msgid "Preview"
@@ -2405,7 +2400,7 @@ msgstr "설정"
 #: changedetectionio/templates/base.html:84
 #: changedetectionio/templates/base.html:170
 msgid "IMPORT"
-msgstr "수입"
+msgstr "가져오기"
 
 #: changedetectionio/templates/base.html:87
 #: changedetectionio/templates/base.html:171
@@ -2445,12 +2440,12 @@ msgstr "언어 변경"
 #: changedetectionio/templates/base.html:253
 #, fuzzy
 msgid "Watch List"
-msgstr "# 시계"
+msgstr "모니터 목록"
 
 #: changedetectionio/templates/base.html:258
 #, fuzzy
 msgid "Watches"
-msgstr "# 시계"
+msgstr "모니터"
 
 #: changedetectionio/templates/base.html:261
 msgid "Queue Status"

changedetectionio/translations/zh/LC_MESSAGES/messages.po

@@ -176,9 +176,8 @@ msgid "Invalid value."
 msgstr "无效值。"
 
 #: changedetectionio/forms.py:732
-#, fuzzy
 msgid "Watch"
-msgstr "# 手表"
+msgstr "监控"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
@@ -187,7 +186,7 @@ msgstr "处理器"
 #: changedetectionio/forms.py:734
 #, fuzzy
 msgid "Edit > Watch"
-msgstr "先编辑后观看"
+msgstr "编辑 > 监控"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 #, fuzzy
@@ -363,7 +362,7 @@ msgstr "节省"
 
 #: changedetectionio/forms.py:829
 msgid "Proxy"
-msgstr "代理人"
+msgstr "代理"
 
 #: changedetectionio/forms.py:831
 msgid "Send a notification when the filter can no longer be found on the page"
@@ -374,7 +373,7 @@ msgstr "当页面上找不到过滤器时发送通知"
 #: changedetectionio/blueprint/ui/templates/edit.html:59
 #: changedetectionio/forms.py:832
 msgid "Notifications"
-msgstr "暂无信息"
+msgstr "通知"
 
 #: changedetectionio/forms.py:832
 #, fuzzy
@@ -427,9 +426,8 @@ msgid "Invalid template syntax in \"%(header)s\" header: %(error)s"
 msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
-#, fuzzy
 msgid "Name"
-msgstr "取消静音"
+msgstr "名称"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -452,9 +450,8 @@ msgid "Plaintext requests"
 msgstr "明文请求"
 
 #: changedetectionio/forms.py:946
-#, fuzzy
 msgid "Chrome requests"
-msgstr "要求"
+msgstr "Chrome请求"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -511,9 +508,8 @@ msgid "API access token security check enabled"
 msgstr "已启用 API 访问令牌安全检查"
 
 #: changedetectionio/forms.py:989
-#, fuzzy
 msgid "Notification base URL override"
-msgstr "通知警报计数"
+msgstr "通知基础URL"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -647,11 +643,11 @@ msgstr "未找到备份。"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:28
 msgid "Create backup"
-msgstr "备份"
+msgstr "创建备份"
 
 #: changedetectionio/blueprint/backups/templates/overview.html:30
 msgid "Remove backups"
-msgstr "备份"
+msgstr "删除备份"
 
 #: changedetectionio/blueprint/imports/importer.py:45
 msgid ""
@@ -859,7 +855,7 @@ msgstr "一般的"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:23
 msgid "Fetching"
-msgstr "搜寻中"
+msgstr "获取"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:24
 msgid "Global Filters"
@@ -887,7 +883,7 @@ msgstr "验证码和代理"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:35
 msgid "Info"
-msgstr "更多信息"
+msgstr "信息"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:46
 msgid "Default recheck time for all watches, current system minimum is"
@@ -915,7 +911,7 @@ msgstr "没有激活的插件"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:405
 msgid "Back"
-msgstr "备份"
+msgstr "返回"
 
 #: changedetectionio/blueprint/settings/templates/settings.html:406
 msgid "Clear Snapshot History"
@@ -1038,7 +1034,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:31
 msgid "# Watches"
-msgstr "# 手表"
+msgstr "# 监控项"
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:32
 msgid "Tag / Label name"
@@ -1290,7 +1286,7 @@ msgstr "先链接。"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:17
 msgid "Confirmation text"
-msgstr "暂无信息"
+msgstr "确认文本"
 
 #: changedetectionio/blueprint/ui/templates/clear_all_history.html:27
 msgid "Type in the word"
@@ -1493,7 +1489,7 @@ msgstr "状况"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:60
 msgid "Stats"
-msgstr "设置"
+msgstr "统计"
 
 #: changedetectionio/blueprint/ui/templates/edit.html:73
 #: changedetectionio/blueprint/ui/templates/edit.html:313
@@ -1928,11 +1924,11 @@ msgstr "添加新的网页更改检测监视"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:34
 msgid "Watch this URL!"
-msgstr "关注这个网址！"
+msgstr "监控此URL！"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "先编辑后观看"
+msgstr "编辑后监控"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2405,7 +2401,7 @@ msgstr "设置"
 #: changedetectionio/templates/base.html:84
 #: changedetectionio/templates/base.html:170
 msgid "IMPORT"
-msgstr "进口"
+msgstr "导入"
 
 #: changedetectionio/templates/base.html:87
 #: changedetectionio/templates/base.html:171
@@ -2445,12 +2441,12 @@ msgstr "更改语言"
 #: changedetectionio/templates/base.html:253
 #, fuzzy
 msgid "Watch List"
-msgstr "# 手表"
+msgstr "监控列表"
 
 #: changedetectionio/templates/base.html:258
 #, fuzzy
 msgid "Watches"
-msgstr "# 手表"
+msgstr "监控项"
 
 #: changedetectionio/templates/base.html:261
 msgid "Queue Status"

changedetectionio/translations/zh_TW/LC_MESSAGES/messages.po

@@ -176,18 +176,16 @@ msgid "Invalid value."
 msgstr "無效值。"
 
 #: changedetectionio/forms.py:732
-#, fuzzy
 msgid "Watch"
-msgstr "# 手錶"
+msgstr "監控"
 
 #: changedetectionio/forms.py:733 changedetectionio/forms.py:766
 msgid "Processor"
 msgstr "處理器"
 
 #: changedetectionio/forms.py:734
-#, fuzzy
 msgid "Edit > Watch"
-msgstr "先編輯後觀看"
+msgstr "編輯 > 監控"
 
 #: changedetectionio/forms.py:747 changedetectionio/forms.py:994
 #, fuzzy
@@ -363,7 +361,7 @@ msgstr "節省"
 
 #: changedetectionio/forms.py:829
 msgid "Proxy"
-msgstr "代理人"
+msgstr "代理"
 
 #: changedetectionio/forms.py:831
 msgid "Send a notification when the filter can no longer be found on the page"
@@ -427,9 +425,8 @@ msgid "Invalid template syntax in \"%(header)s\" header: %(error)s"
 msgstr ""
 
 #: changedetectionio/forms.py:920 changedetectionio/forms.py:932
-#, fuzzy
 msgid "Name"
-msgstr "取消靜音"
+msgstr "名稱"
 
 #: changedetectionio/forms.py:921
 msgid "Proxy URL"
@@ -452,9 +449,8 @@ msgid "Plaintext requests"
 msgstr "明文請求"
 
 #: changedetectionio/forms.py:946
-#, fuzzy
 msgid "Chrome requests"
-msgstr "要求"
+msgstr "Chrome請求"
 
 #: changedetectionio/forms.py:952
 msgid "Default proxy"
@@ -511,9 +507,8 @@ msgid "API access token security check enabled"
 msgstr "已啟用 API 訪問令牌安全檢查"
 
 #: changedetectionio/forms.py:989
-#, fuzzy
 msgid "Notification base URL override"
-msgstr "通知警報計數"
+msgstr "通知基礎URL"
 
 #: changedetectionio/forms.py:993
 msgid "Treat empty pages as a change?"
@@ -1038,7 +1033,7 @@ msgstr ""
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:31
 msgid "# Watches"
-msgstr "# 手錶"
+msgstr "# 監控項"
 
 #: changedetectionio/blueprint/tags/templates/groups-overview.html:32
 msgid "Tag / Label name"
@@ -1928,11 +1923,11 @@ msgstr "添加新的網頁更改檢測監視"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:34
 msgid "Watch this URL!"
-msgstr "關注這個網址！"
+msgstr "監控此URL！"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:35
 msgid "Edit first then Watch"
-msgstr "先編輯後觀看"
+msgstr "編輯後監控"
 
 #: changedetectionio/blueprint/watchlist/templates/watch-overview.html:45
 msgid "Create a shareable link"
@@ -2405,7 +2400,7 @@ msgstr "設定"
 #: changedetectionio/templates/base.html:84
 #: changedetectionio/templates/base.html:170
 msgid "IMPORT"
-msgstr "進口"
+msgstr "導入"
 
 #: changedetectionio/templates/base.html:87
 #: changedetectionio/templates/base.html:171
@@ -2445,12 +2440,12 @@ msgstr "更改語言"
 #: changedetectionio/templates/base.html:253
 #, fuzzy
 msgid "Watch List"
-msgstr "# 手錶"
+msgstr "監控列表"
 
 #: changedetectionio/templates/base.html:258
 #, fuzzy
 msgid "Watches"
-msgstr "# 手錶"
+msgstr "監控項"
 
 #: changedetectionio/templates/base.html:261
 msgid "Queue Status"

changedetectionio/worker_handler.py

@@ -2,19 +2,18 @@
 Worker management module for changedetection.io
 
 Handles asynchronous workers for dynamic worker scaling.
-Sync worker support has been removed in favor of async-only architecture.
+Each worker runs in its own thread with its own event loop for isolation.
 """
 
 import asyncio
 import os
 import threading
 import time
+from concurrent.futures import ThreadPoolExecutor
 from loguru import logger
 
-# Global worker state
-running_async_tasks = []
-async_loop = None
-async_loop_thread = None
+# Global worker state - each worker has its own thread and event loop
+worker_threads = []  # List of WorkerThread objects
 
 # Track currently processing UUIDs for async workers - maps {uuid: worker_id}
 currently_processing_uuids = {}
@@ -22,89 +21,118 @@ currently_processing_uuids = {}
 # Configuration - async workers only
 USE_ASYNC_WORKERS = True
 
+# Custom ThreadPoolExecutor for queue operations with named threads
+# Scale executor threads with FETCH_WORKERS to avoid bottleneck at high concurrency
+_max_executor_workers = max(50, int(os.getenv("FETCH_WORKERS", "10")))
+queue_executor = ThreadPoolExecutor(
+    max_workers=_max_executor_workers,
+    thread_name_prefix="QueueGetter-"
+)
 
-def start_async_event_loop():
-    """Start a dedicated event loop for async workers in a separate thread"""
-    global async_loop
-    logger.info("Starting async event loop for workers")
-    
-    try:
-        # Create a new event loop for this thread
-        async_loop = asyncio.new_event_loop()
-        # Set it as the event loop for this thread
-        asyncio.set_event_loop(async_loop)
-        
-        logger.debug(f"Event loop created and set: {async_loop}")
-        
-        # Run the event loop forever
-        async_loop.run_forever()
-    except Exception as e:
-        logger.error(f"Async event loop error: {e}")
-    finally:
-        # Clean up
-        if async_loop and not async_loop.is_closed():
-            async_loop.close()
-        async_loop = None
-        logger.info("Async event loop stopped")
+
+class WorkerThread:
+    """Container for a worker thread with its own event loop"""
+    def __init__(self, worker_id, update_q, notification_q, app, datastore):
+        self.worker_id = worker_id
+        self.update_q = update_q
+        self.notification_q = notification_q
+        self.app = app
+        self.datastore = datastore
+        self.thread = None
+        self.loop = None
+        self.running = False
+
+    def run(self):
+        """Run the worker in its own event loop"""
+        try:
+            # Create a new event loop for this thread
+            self.loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(self.loop)
+            self.running = True
+
+            # Run the worker coroutine
+            self.loop.run_until_complete(
+                start_single_async_worker(
+                    self.worker_id,
+                    self.update_q,
+                    self.notification_q,
+                    self.app,
+                    self.datastore,
+                    queue_executor
+                )
+            )
+        except asyncio.CancelledError:
+            # Normal shutdown - worker was cancelled
+            import os
+            in_pytest = "pytest" in os.sys.modules or "PYTEST_CURRENT_TEST" in os.environ
+            if not in_pytest:
+                logger.info(f"Worker {self.worker_id} shutting down gracefully")
+        except RuntimeError as e:
+            # Ignore expected shutdown errors
+            if "Event loop stopped" not in str(e) and "Event loop is closed" not in str(e):
+                logger.error(f"Worker {self.worker_id} runtime error: {e}")
+        except Exception as e:
+            logger.error(f"Worker {self.worker_id} thread error: {e}")
+        finally:
+            # Clean up
+            if self.loop and not self.loop.is_closed():
+                self.loop.close()
+            self.running = False
+            self.loop = None
+
+    def start(self):
+        """Start the worker thread"""
+        self.thread = threading.Thread(
+            target=self.run,
+            daemon=True,
+            name=f"PageFetchAsyncUpdateWorker-{self.worker_id}"
+        )
+        self.thread.start()
+
+    def stop(self):
+        """Stop the worker thread"""
+        if self.loop and self.running:
+            try:
+                # Signal the loop to stop
+                self.loop.call_soon_threadsafe(self.loop.stop)
+            except RuntimeError:
+                pass
+
+        if self.thread and self.thread.is_alive():
+            self.thread.join(timeout=2.0)
 
 
 def start_async_workers(n_workers, update_q, notification_q, app, datastore):
-    """Start the async worker management system"""
-    global async_loop_thread, async_loop, running_async_tasks, currently_processing_uuids
-    
-    # Clear any stale UUID tracking state
+    """Start async workers, each with its own thread and event loop for isolation"""
+    global worker_threads, currently_processing_uuids
+
+    # Clear any stale state
     currently_processing_uuids.clear()
-    
-    # Start the event loop in a separate thread
-    async_loop_thread = threading.Thread(target=start_async_event_loop, daemon=True)
-    async_loop_thread.start()
-    
-    # Wait for the loop to be available (with timeout for safety)
-    max_wait_time = 5.0
-    wait_start = time.time()
-    while async_loop is None and (time.time() - wait_start) < max_wait_time:
-        time.sleep(0.1)
-    
-    if async_loop is None:
-        logger.error("Failed to start async event loop within timeout")
-        return
-    
-    # Additional brief wait to ensure loop is running
-    time.sleep(0.2)
-    
-    # Start async workers
-    logger.info(f"Starting {n_workers} async workers")
+
+    # Start each worker in its own thread with its own event loop
+    logger.info(f"Starting {n_workers} async workers (isolated threads)")
     for i in range(n_workers):
         try:
-            # Use a factory function to create named worker coroutines
-            def create_named_worker(worker_id):
-                async def named_worker():
-                    task = asyncio.current_task()
-                    if task:
-                        task.set_name(f"async-worker-{worker_id}")
-                    return await start_single_async_worker(worker_id, update_q, notification_q, app, datastore)
-                return named_worker()
-            
-            task_future = asyncio.run_coroutine_threadsafe(create_named_worker(i), async_loop)
-            running_async_tasks.append(task_future)
-        except RuntimeError as e:
+            worker = WorkerThread(i, update_q, notification_q, app, datastore)
+            worker.start()
+            worker_threads.append(worker)
+            # No sleep needed - threads start independently and asynchronously
+        except Exception as e:
             logger.error(f"Failed to start async worker {i}: {e}")
             continue
 
 
-async def start_single_async_worker(worker_id, update_q, notification_q, app, datastore):
+async def start_single_async_worker(worker_id, update_q, notification_q, app, datastore, executor=None):
     """Start a single async worker with auto-restart capability"""
     from changedetectionio.async_update_worker import async_update_worker
-    
+
     # Check if we're in pytest environment - if so, be more gentle with logging
     import os
     in_pytest = "pytest" in os.sys.modules or "PYTEST_CURRENT_TEST" in os.environ
-    
+
     while not app.config.exit.is_set():
         try:
-            if not in_pytest:
-                logger.info(f"Starting async worker {worker_id}")
-            await async_update_worker(worker_id, update_q, notification_q, app, datastore)
+            await async_update_worker(worker_id, update_q, notification_q, app, datastore, executor)
             # If we reach here, worker exited cleanly
             if not in_pytest:
                 logger.info(f"Async worker {worker_id} exited cleanly")
@@ -131,39 +159,38 @@ def start_workers(n_workers, update_q, notification_q, app, datastore):
 
 def add_worker(update_q, notification_q, app, datastore):
     """Add a new async worker (for dynamic scaling)"""
-    global running_async_tasks
-    
-    if not async_loop:
-        logger.error("Async loop not running, cannot add worker")
-        return False
-        
-    worker_id = len(running_async_tasks)
+    global worker_threads
+
+    worker_id = len(worker_threads)
     logger.info(f"Adding async worker {worker_id}")
-    
-    task_future = asyncio.run_coroutine_threadsafe(
-        start_single_async_worker(worker_id, update_q, notification_q, app, datastore), async_loop
-    )
-    running_async_tasks.append(task_future)
-    return True
+
+    try:
+        worker = WorkerThread(worker_id, update_q, notification_q, app, datastore)
+        worker.start()
+        worker_threads.append(worker)
+        return True
+    except Exception as e:
+        logger.error(f"Failed to add worker {worker_id}: {e}")
+        return False
 
 
 def remove_worker():
     """Remove an async worker (for dynamic scaling)"""
-    global running_async_tasks
-    
-    if not running_async_tasks:
+    global worker_threads
+
+    if not worker_threads:
         return False
-        
-    # Cancel the last worker
-    task_future = running_async_tasks.pop()
-    task_future.cancel()
-    logger.info(f"Removed async worker, {len(running_async_tasks)} workers remaining")
+
+    # Stop the last worker
+    worker = worker_threads.pop()
+    worker.stop()
+    logger.info(f"Removed async worker, {len(worker_threads)} workers remaining")
     return True
 
 
 def get_worker_count():
     """Get current number of async workers"""
-    return len(running_async_tasks)
+    return len(worker_threads)
 
 
 def get_running_uuids():
@@ -249,38 +276,21 @@ def queue_item_async_safe(update_q, item, silent=False):
 
 def shutdown_workers():
     """Shutdown all async workers fast and aggressively"""
-    global async_loop, async_loop_thread, running_async_tasks
-    
+    global worker_threads
+
     # Check if we're in pytest environment - if so, be more gentle with logging
     import os
     in_pytest = "pytest" in os.sys.modules or "PYTEST_CURRENT_TEST" in os.environ
-    
+
     if not in_pytest:
         logger.info("Fast shutdown of async workers initiated...")
-    
-    # Cancel all async tasks immediately
-    for task_future in running_async_tasks:
-        if not task_future.done():
-            task_future.cancel()
-    
-    # Stop the async event loop immediately
-    if async_loop and not async_loop.is_closed():
-        try:
-            async_loop.call_soon_threadsafe(async_loop.stop)
-        except RuntimeError:
-            # Loop might already be stopped
-            pass
-        
-    running_async_tasks.clear()
-    async_loop = None
-        
-    # Give async thread minimal time to finish, then continue
-    if async_loop_thread and async_loop_thread.is_alive():
-        async_loop_thread.join(timeout=1.0)  # Only 1 second timeout
-        if async_loop_thread.is_alive() and not in_pytest:
-            logger.info("Async thread still running after timeout - continuing with shutdown")
-        async_loop_thread = None
-    
+
+    # Stop all worker threads
+    for worker in worker_threads:
+        worker.stop()
+
+    worker_threads.clear()
+
     if not in_pytest:
         logger.info("Async workers fast shutdown complete")
 
@@ -290,69 +300,57 @@ def shutdown_workers():
 def adjust_async_worker_count(new_count, update_q=None, notification_q=None, app=None, datastore=None):
     """
     Dynamically adjust the number of async workers.
-    
+
     Args:
         new_count: Target number of workers
         update_q, notification_q, app, datastore: Required for adding new workers
-    
+
     Returns:
         dict: Status of the adjustment operation
     """
-    global running_async_tasks
-    
+    global worker_threads
+
     current_count = get_worker_count()
-    
+
     if new_count == current_count:
         return {
             'status': 'no_change',
             'message': f'Worker count already at {current_count}',
             'current_count': current_count
         }
-    
+
     if new_count > current_count:
         # Add workers
         workers_to_add = new_count - current_count
         logger.info(f"Adding {workers_to_add} async workers (from {current_count} to {new_count})")
-        
+
         if not all([update_q, notification_q, app, datastore]):
             return {
                 'status': 'error',
                 'message': 'Missing required parameters to add workers',
                 'current_count': current_count
             }
-        
+
         for i in range(workers_to_add):
-            worker_id = len(running_async_tasks)
-            task_future = asyncio.run_coroutine_threadsafe(
-                start_single_async_worker(worker_id, update_q, notification_q, app, datastore), 
-                async_loop
-            )
-            running_async_tasks.append(task_future)
-        
+            add_worker(update_q, notification_q, app, datastore)
+
         return {
             'status': 'success',
             'message': f'Added {workers_to_add} workers',
             'previous_count': current_count,
-            'current_count': new_count
+            'current_count': len(worker_threads)
         }
-        
+
     else:
         # Remove workers
         workers_to_remove = current_count - new_count
         logger.info(f"Removing {workers_to_remove} async workers (from {current_count} to {new_count})")
-        
+
         removed_count = 0
         for _ in range(workers_to_remove):
-            if running_async_tasks:
-                task_future = running_async_tasks.pop()
-                task_future.cancel()
-                # Wait for the task to actually stop
-                try:
-                    task_future.result(timeout=5)  # 5 second timeout
-                except Exception:
-                    pass  # Task was cancelled, which is expected
+            if remove_worker():
                 removed_count += 1
-        
+
         return {
             'status': 'success',
             'message': f'Removed {removed_count} workers',
@@ -367,72 +365,58 @@ def get_worker_status():
         'worker_type': 'async',
         'worker_count': get_worker_count(),
         'running_uuids': get_running_uuids(),
-        'async_loop_running': async_loop is not None,
+        'active_threads': sum(1 for w in worker_threads if w.thread and w.thread.is_alive()),
     }
 
 
 def check_worker_health(expected_count, update_q=None, notification_q=None, app=None, datastore=None):
     """
     Check if the expected number of async workers are running and restart any missing ones.
-    
+
     Args:
         expected_count: Expected number of workers
         update_q, notification_q, app, datastore: Required for restarting workers
-    
+
     Returns:
         dict: Health check results
     """
-    global running_async_tasks
-    
+    global worker_threads
+
     current_count = get_worker_count()
-    
-    if current_count == expected_count:
+
+    # Check which workers are actually alive
+    alive_count = sum(1 for w in worker_threads if w.thread and w.thread.is_alive())
+
+    if alive_count == expected_count:
         return {
             'status': 'healthy',
             'expected_count': expected_count,
-            'actual_count': current_count,
+            'actual_count': alive_count,
             'message': f'All {expected_count} async workers running'
         }
-    
-    # Check for crashed async workers
+
+    # Find dead workers
     dead_workers = []
-    alive_count = 0
-    
-    for i, task_future in enumerate(running_async_tasks[:]):
-        if task_future.done():
-            try:
-                result = task_future.result()
-                dead_workers.append(i)
-                logger.warning(f"Async worker {i} completed unexpectedly")
-            except Exception as e:
-                dead_workers.append(i)
-                logger.error(f"Async worker {i} crashed: {e}")
-        else:
-            alive_count += 1
-    
+    for i, worker in enumerate(worker_threads[:]):
+        if not worker.thread or not worker.thread.is_alive():
+            dead_workers.append(i)
+            logger.warning(f"Async worker {worker.worker_id} thread is dead")
+
     # Remove dead workers from tracking
     for i in reversed(dead_workers):
-        if i < len(running_async_tasks):
-            running_async_tasks.pop(i)
-    
+        if i < len(worker_threads):
+            worker_threads.pop(i)
+
     missing_workers = expected_count - alive_count
     restarted_count = 0
-    
+
     if missing_workers > 0 and all([update_q, notification_q, app, datastore]):
         logger.info(f"Restarting {missing_workers} crashed async workers")
-        
+
         for i in range(missing_workers):
-            worker_id = alive_count + i
-            try:
-                task_future = asyncio.run_coroutine_threadsafe(
-                    start_single_async_worker(worker_id, update_q, notification_q, app, datastore), 
-                    async_loop
-                )
-                running_async_tasks.append(task_future)
+            if add_worker(update_q, notification_q, app, datastore):
                 restarted_count += 1
-            except Exception as e:
-                logger.error(f"Failed to restart worker {worker_id}: {e}")
-    
+
     return {
         'status': 'repaired' if restarted_count > 0 else 'degraded',
         'expected_count': expected_count,

docs/api-spec.yaml

@@ -28,7 +28,7 @@ info:
     
     For example: `x-api-key: YOUR_API_KEY`
     
-  version: 0.1.3
+  version: 0.1.4
   contact:
     name: ChangeDetection.io
     url: https://github.com/dgtlmoon/changedetection.io
@@ -761,9 +761,9 @@ paths:
     get:
       operationId: getWatchHistoryDiff
       tags: [Watch History]
-      summary: Get diff between two snapshots
+      summary: Get the difference between two snapshots
       description: |
-        Generate a formatted diff (comparison) between two historical snapshots of a web page change monitor (watch).
+        Generate a difference (comparison) between two historical snapshots of a web page change monitor (watch).
 
         This endpoint compares content between two points in time and returns the differences in your chosen format.
         Perfect for reviewing what changed between specific versions or comparing recent changes.
@@ -798,6 +798,10 @@ paths:
             # Compare two specific timestamps in plain text with word-level diff
             curl -X GET "http://localhost:5000/api/v1/watch/095be615-a8ad-4c33-8e9c-c7612fbf6c9f/difference/1640995200/1640998800?format=text&word_diff=true" \
               -H "x-api-key: YOUR_API_KEY"
+
+            # Show only additions (hide removed/replaced content), ignore whitespace
+            curl -X GET "http://localhost:5000/api/v1/watch/095be615-a8ad-4c33-8e9c-c7612fbf6c9f/difference/previous/latest?format=htmlcolor&removed=false&replaced=false&ignoreWhitespace=true" \
+              -H "x-api-key: YOUR_API_KEY"
         - lang: 'Python'
           source: |
             import requests
@@ -822,6 +826,20 @@ paths:
                 params={'format': 'text', 'word_diff': 'true'}
             )
             print(response.text)
+
+            # Show only additions, ignore whitespace and use word-level diff
+            response = requests.get(
+                f'http://localhost:5000/api/v1/watch/{uuid}/difference/previous/latest',
+                headers=headers,
+                params={
+                    'format': 'htmlcolor',
+                    'type': 'diffWords',
+                    'removed': 'false',
+                    'replaced': 'false',
+                    'ignoreWhitespace': 'true'
+                }
+            )
+            print(response.text)
       parameters:
         - name: uuid
           in: path
@@ -861,9 +879,10 @@ paths:
             - `text` (default): Plain text with (removed) and (added) prefixes
             - `html`: Basic HTML format
             - `htmlcolor`: Rich HTML with colored backgrounds (red for deletions, green for additions)
+            - `markdown`: Markdown format with HTML rendering
           schema:
             type: string
-            enum: [text, html, htmlcolor]
+            enum: [text, html, htmlcolor, markdown]
             default: text
         - name: word_diff
           in: query
@@ -888,6 +907,69 @@ paths:
             type: string
             enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
             default: "false"
+        - name: type
+          in: query
+          description: |
+            Diff granularity type:
+            - `diffLines` (default): Line-level comparison, showing which lines changed
+            - `diffWords`: Word-level comparison, showing which words changed within lines
+
+            This parameter is an alternative to `word_diff` for better alignment with the UI.
+            If both are specified, `type=diffWords` will enable word-level diffing.
+          schema:
+            type: string
+            enum: [diffLines, diffWords]
+            default: diffLines
+        - name: changesOnly
+          in: query
+          description: |
+            When enabled, only show lines/content that changed (no surrounding context).
+            When disabled, include unchanged lines for context around changes.
+            Accepts: true, false, 1, 0, yes, no, on, off
+          schema:
+            type: string
+            enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
+            default: "true"
+        - name: ignoreWhitespace
+          in: query
+          description: |
+            When enabled, ignore whitespace-only changes (spaces, tabs, newlines).
+            Useful for focusing on content changes and ignoring formatting differences.
+            Accepts: true, false, 1, 0, yes, no, on, off
+          schema:
+            type: string
+            enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
+            default: "false"
+        - name: removed
+          in: query
+          description: |
+            Include removed/deleted content in the diff output.
+            When disabled, content that was deleted will not appear in the diff.
+            Accepts: true, false, 1, 0, yes, no, on, off
+          schema:
+            type: string
+            enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
+            default: "true"
+        - name: added
+          in: query
+          description: |
+            Include added/new content in the diff output.
+            When disabled, content that was added will not appear in the diff.
+            Accepts: true, false, 1, 0, yes, no, on, off
+          schema:
+            type: string
+            enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
+            default: "true"
+        - name: replaced
+          in: query
+          description: |
+            Include replaced/modified content in the diff output.
+            When disabled, content that was modified (changed from one value to another) will not appear in the diff.
+            Accepts: true, false, 1, 0, yes, no, on, off
+          schema:
+            type: string
+            enum: ["true", "false", "1", "0", "yes", "no", "on", "off"]
+            default: "true"
       responses:
         '200':
           description: Formatted diff between the two snapshots

requirements.txt

@@ -12,8 +12,8 @@ janus # Thread-safe async/sync queue bridge
 flask_wtf~=1.2
 flask~=3.1
 flask-socketio~=5.6.0
-python-socketio~=5.14.3
-python-engineio~=4.12.3
+python-socketio~=5.16.0
+python-engineio~=4.13.0
 inscriptis~=2.2
 pytz
 timeago~=1.0
@@ -60,7 +60,7 @@ cryptography==46.0.3
 paho-mqtt!=2.0.*
 
 # Used for CSS filtering, JSON extraction from HTML
-beautifulsoup4>=4.0.0,<=4.14.2
+beautifulsoup4>=4.0.0,<=4.14.3
 
 # XPath filtering, lxml is required by bs4 anyway, but put it here to be safe.
 # #2328 - 5.2.0 and 5.2.1 had extra CPU flag CFLAGS set which was not compatible on older hardware
@@ -148,7 +148,7 @@ tzdata
 pluggy ~= 1.6
 
 # Needed for testing, cross-platform for process and system monitoring
-psutil==7.1.0
+psutil==7.2.1
 
 ruff >= 0.11.2
 pre_commit >= 4.2.0