small test tweak

* Non blocking improvements

* Test fix

* Background thread re-queue

* Nonblockimg improvements, run tasks in background, add warning about CPU cores

* Misc fixes

.github/workflows/test-stack-reusable-workflow.yml

@@ -84,6 +84,7 @@ jobs:
           docker run test-changedetectionio bash -c 'python3 -m unittest changedetectionio.tests.unit.test_watch_model'
           docker run test-changedetectionio bash -c 'python3 -m unittest changedetectionio.tests.unit.test_jinja2_security'
           docker run test-changedetectionio bash -c 'python3 -m unittest changedetectionio.tests.unit.test_semver'
+          docker run test-changedetectionio bash -c 'python3 -m unittest changedetectionio.tests.unit.test_html_to_text'
 
   # Basic pytest tests with ancillary services
   basic-tests:

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
 

babel.cfg

@@ -0,0 +1,5 @@
+[python: **.py]
+keywords = _:1,_l:1,gettext:1
+
+[jinja2: **/templates/**.html]
+encoding = utf-8

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.6'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError
@@ -41,9 +41,10 @@ from loguru import logger
 #
 # IMPLEMENTATION:
 #   1. Explicit contexts everywhere (primary protection):
-#      - Watch.py: ctx = multiprocessing.get_context('spawn')
 #      - playwright.py: ctx = multiprocessing.get_context('spawn')
 #      - puppeteer.py: ctx = multiprocessing.get_context('spawn')
+#      - isolated_opencv.py: ctx = multiprocessing.get_context('spawn')
+#      - isolated_libvips.py: ctx = multiprocessing.get_context('spawn')
 #
 #   2. Global default (defense-in-depth, below):
 #      - Safety net if future code forgets explicit context
@@ -286,7 +287,9 @@ def main():
         return dict(right_sticky="v{}".format(datastore.data['version_tag']),
                     new_version_available=app.config['NEW_VERSION_AVAILABLE'],
                     has_password=datastore.data['settings']['application']['password'] != False,
-                    socket_io_enabled=datastore.data['settings']['application']['ui'].get('socket_io_enabled', True)
+                    socket_io_enabled=datastore.data['settings']['application']['ui'].get('socket_io_enabled', True),
+                    all_paused=datastore.data['settings']['application'].get('all_paused', False),
+                    all_muted=datastore.data['settings']['application'].get('all_muted', False)
                     )
 
     # Monitored websites will not receive a Referer header when a user clicks on an outgoing link.

changedetectionio/api/Tags.py

@@ -2,7 +2,9 @@ from changedetectionio import queuedWatchMetaData
 from changedetectionio import worker_handler
 from flask_expects_json import expects_json
 from flask_restful import abort, Resource
+from loguru import logger
 
+import threading
 from flask import request
 from . import auth
 
@@ -28,18 +30,36 @@ class Tag(Resource):
             abort(404, message=f'No tag exists with the UUID of {uuid}')
 
         if request.args.get('recheck'):
-            # Recheck all, including muted
-            # Get most overdue first
-            i=0
+            # Recheck all watches with this tag, including muted
+            # First collect watches to queue
+            watches_to_queue = []
             for k in sorted(self.datastore.data['watching'].items(), key=lambda item: item[1].get('last_checked', 0)):
                 watch_uuid = k[0]
                 watch = k[1]
-                if not watch['paused'] and tag['uuid'] not in watch['tags']:
-                    continue
-                worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
-                i+=1
+                if not watch['paused'] and tag['uuid'] in watch['tags']:
+                    watches_to_queue.append(watch_uuid)
 
-            return f"OK, {i} watches queued", 200
+            # If less than 20 watches, queue synchronously for immediate feedback
+            if len(watches_to_queue) < 20:
+                for watch_uuid in watches_to_queue:
+                    worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
+                return {'status': f'OK, queued {len(watches_to_queue)} watches for rechecking'}, 200
+            else:
+                # 20+ watches - queue in background thread to avoid blocking API response
+                def queue_watches_background():
+                    """Background thread to queue watches - discarded after completion."""
+                    try:
+                        for watch_uuid in watches_to_queue:
+                            worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
+                        logger.info(f"Background queueing complete for tag {tag['uuid']}: {len(watches_to_queue)} watches queued")
+                    except Exception as e:
+                        logger.error(f"Error in background queueing for tag {tag['uuid']}: {e}")
+
+                # Start background thread and return immediately
+                thread = threading.Thread(target=queue_watches_background, daemon=True, name=f"QueueTag-{tag['uuid'][:8]}")
+                thread.start()
+
+                return {'status': f'OK, queueing {len(watches_to_queue)} watches in background'}, 202
 
         if request.args.get('muted', '') == 'muted':
             self.datastore.data['settings']['application']['tags'][uuid]['notification_muted'] = True

changedetectionio/api/Watch.py

@@ -1,4 +1,5 @@
 import os
+import threading
 
 from changedetectionio.validate_url import is_safe_valid_url
 
@@ -64,8 +65,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 +312,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,
         )
 
@@ -419,7 +439,8 @@ class CreateWatch(Resource):
 
         new_uuid = self.datastore.add_watch(url=url, extras=extras, tag=tags)
         if new_uuid:
-            worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
+# Dont queue because the scheduler will check that it hasnt been checked before anyway
+#            worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
             return {'uuid': new_uuid}, 201
         else:
             return "Invalid or unsupported URL", 400
@@ -449,8 +470,58 @@ class CreateWatch(Resource):
             }
 
         if request.args.get('recheck_all'):
-            for uuid in self.datastore.data['watching'].keys():
-                worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
-            return {'status': "OK"}, 200
+            # Collect all watches to queue
+            watches_to_queue = self.datastore.data['watching'].keys()
+
+            # If less than 20 watches, queue synchronously for immediate feedback
+            if len(watches_to_queue) < 20:
+                # Get already queued/running UUIDs once (efficient)
+                queued_uuids = set(self.update_q.get_queued_uuids())
+                running_uuids = set(worker_handler.get_running_uuids())
+
+                # Filter out watches that are already queued or running
+                watches_to_queue_filtered = [
+                    uuid for uuid in watches_to_queue
+                    if uuid not in queued_uuids and uuid not in running_uuids
+                ]
+
+                # Queue only the filtered watches
+                for uuid in watches_to_queue_filtered:
+                    worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+
+                # Provide feedback about skipped watches
+                skipped_count = len(watches_to_queue) - len(watches_to_queue_filtered)
+                if skipped_count > 0:
+                    return {'status': f'OK, queued {len(watches_to_queue_filtered)} watches for rechecking ({skipped_count} already queued or running)'}, 200
+                else:
+                    return {'status': f'OK, queued {len(watches_to_queue_filtered)} watches for rechecking'}, 200
+            else:
+                # 20+ watches - queue in background thread to avoid blocking API response
+                # Capture queued/running state before background thread
+                queued_uuids = set(self.update_q.get_queued_uuids())
+                running_uuids = set(worker_handler.get_running_uuids())
+
+                def queue_all_watches_background():
+                    """Background thread to queue all watches - discarded after completion."""
+                    try:
+                        queued_count = 0
+                        skipped_count = 0
+                        for uuid in watches_to_queue:
+                            # Check if already queued or running (state captured at start)
+                            if uuid not in queued_uuids and uuid not in running_uuids:
+                                worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+                                queued_count += 1
+                            else:
+                                skipped_count += 1
+
+                        logger.info(f"Background queueing complete: {queued_count} watches queued, {skipped_count} skipped (already queued/running)")
+                    except Exception as e:
+                        logger.error(f"Error in background queueing all watches: {e}")
+
+                # Start background thread and return immediately
+                thread = threading.Thread(target=queue_all_watches_background, daemon=True, name="QueueAllWatches-Background")
+                thread.start()
+
+                return {'status': f'OK, queueing {len(watches_to_queue)} watches in background'}, 202
 
         return list, 200

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,7 @@ from changedetectionio.flask_app import watch_check_update
 import asyncio
 import importlib
 import os
-import queue
+import sys
 import time
 
 from loguru import logger
@@ -17,36 +16,51 @@ 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):
+IN_PYTEST = "pytest" in sys.modules or "PYTEST_CURRENT_TEST" in os.environ
+DEFER_SLEEP_TIME_ALREADY_QUEUED = 0.3 if IN_PYTEST else 10.0
+
+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
@@ -61,14 +75,13 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
             continue
 
         uuid = queued_item_data.item.get('uuid')
-
         # RACE CONDITION FIX: Check if this UUID is already being processed by another worker
         from changedetectionio import worker_handler
         from changedetectionio.queuedWatchMetaData import PrioritizedItem
         if worker_handler.is_watch_running_by_another_worker(uuid, worker_id):
             logger.trace(f"Worker {worker_id} detected UUID {uuid} already being processed by another worker - deferring")
             # Sleep to avoid tight loop and give the other worker time to finish
-            await asyncio.sleep(10.0)
+            await asyncio.sleep(DEFER_SLEEP_TIME_ALREADY_QUEUED)
 
             # Re-queue with lower priority so it gets checked again after current processing finishes
             deferred_priority = max(1000, queued_item_data.priority * 10)
@@ -119,8 +132,14 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                     # All fetchers are now async, so call directly
                     await update_handler.call_browser()
 
-                    # Run change detection (this is synchronous)
-                    changed_detected, update_obj, contents = update_handler.run_changedetection(watch=watch)
+                    # Run change detection in executor to avoid blocking event loop
+                    # This includes CPU-intensive operations like HTML parsing (lxml/inscriptis)
+                    # which can take 2-10ms and cause GIL contention across workers
+                    loop = asyncio.get_event_loop()
+                    changed_detected, update_obj, contents = await loop.run_in_executor(
+                        executor,
+                        lambda: update_handler.run_changedetection(watch=watch)
+                    )
 
                 except PermissionError as e:
                     logger.critical(f"File permission error updating file, watch: {uuid}")
@@ -414,14 +433,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 +478,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/imports/__init__.py

@@ -1,13 +1,8 @@
 from flask import Blueprint, request, redirect, url_for, flash, render_template
+from loguru import logger
+
 from changedetectionio.store import ChangeDetectionStore
 from changedetectionio.auth_decorator import login_optionally_required
-from changedetectionio import worker_handler
-from changedetectionio.blueprint.imports.importer import (
-    import_url_list, 
-    import_distill_io_json, 
-    import_xlsx_wachete, 
-    import_xlsx_custom
-)
 
 def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMetaData):
     import_blueprint = Blueprint('imports', __name__, template_folder="templates")
@@ -17,15 +12,26 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
     def import_page():
         remaining_urls = []
         from changedetectionio import forms
-
+#
         if request.method == 'POST':
+#            from changedetectionio import worker_handler
+
+            from changedetectionio.blueprint.imports.importer import (
+                import_url_list,
+                import_distill_io_json,
+                import_xlsx_wachete,
+                import_xlsx_custom
+            )
+
             # URL List import
             if request.values.get('urls') and len(request.values.get('urls').strip()):
                 # Import and push into the queue for immediate update check
                 importer_handler = import_url_list()
                 importer_handler.run(data=request.values.get('urls'), flash=flash, datastore=datastore, processor=request.values.get('processor', 'text_json_diff'))
-                for uuid in importer_handler.new_uuids:
-                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+                logger.debug(f"Imported {len(importer_handler.new_uuids)} new UUIDs")
+                # Dont' add to queue because scheduler can see that they haven't been checked and will add them to the queue
+#                for uuid in importer_handler.new_uuids:
+#                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
 
                 if len(importer_handler.remaining_data) == 0:
                     return redirect(url_for('watchlist.index'))
@@ -37,8 +43,10 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                 # Import and push into the queue for immediate update check
                 d_importer = import_distill_io_json()
                 d_importer.run(data=request.values.get('distill-io'), flash=flash, datastore=datastore)
-                for uuid in d_importer.new_uuids:
-                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+                # Dont' add to queue because scheduler can see that they haven't been checked and will add them to the queue
+#                for uuid in importer_handler.new_uuids:
+#                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+
 
             # XLSX importer
             if request.files and request.files.get('xlsx_file'):
@@ -60,8 +68,10 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                     w_importer.import_profile = map
                     w_importer.run(data=file, flash=flash, datastore=datastore)
 
-                for uuid in w_importer.new_uuids:
-                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+                # Dont' add to queue because scheduler can see that they haven't been checked and will add them to the queue
+#                for uuid in importer_handler.new_uuids:
+#                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
+
 
         # Could be some remaining, or we could be on GET
         form = forms.importForm(formdata=request.form if request.method == 'POST' else None)

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

@@ -78,14 +78,20 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                 # Handle dynamic worker count adjustment
                 old_worker_count = datastore.data['settings']['requests'].get('workers', 1)
                 new_worker_count = form.data['requests'].get('workers', 1)
-                
+
                 datastore.data['settings']['requests'].update(form.data['requests'])
-                
+
                 # Adjust worker count if it changed
                 if new_worker_count != old_worker_count:
                     from changedetectionio import worker_handler
                     from changedetectionio.flask_app import update_q, notification_q, app, datastore as ds
-                    
+
+                    # Check CPU core availability and warn if worker count is high
+                    cpu_count = os.cpu_count()
+                    if cpu_count and new_worker_count >= (cpu_count * 0.9):
+                        flash(gettext("Warning: Worker count ({}) is close to or exceeds available CPU cores ({})").format(
+                            new_worker_count, cpu_count), 'warning')
+
                     result = worker_handler.adjust_async_worker_count(
                         new_count=new_worker_count,
                         update_q=update_q,
@@ -93,7 +99,7 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                         app=app,
                         datastore=ds
                     )
-                    
+
                     if result['status'] == 'success':
                         flash(gettext("Worker count adjusted: {}").format(result['message']), 'notice')
                     elif result['status'] == 'not_supported':
@@ -187,4 +193,32 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                                logs=notification_debug_log if len(notification_debug_log) else ["Notification logs are empty - no notifications sent yet."])
         return output
 
+    @settings_blueprint.route("/toggle-all-paused", methods=['GET'])
+    @login_optionally_required
+    def toggle_all_paused():
+        current_state = datastore.data['settings']['application'].get('all_paused', False)
+        datastore.data['settings']['application']['all_paused'] = not current_state
+        datastore.needs_write_urgent = True
+
+        if datastore.data['settings']['application']['all_paused']:
+            flash(gettext("Automatic scheduling paused - checks will not be queued."), 'notice')
+        else:
+            flash(gettext("Automatic scheduling resumed - checks will be queued normally."), 'notice')
+
+        return redirect(url_for('watchlist.index'))
+
+    @settings_blueprint.route("/toggle-all-muted", methods=['GET'])
+    @login_optionally_required
+    def toggle_all_muted():
+        current_state = datastore.data['settings']['application'].get('all_muted', False)
+        datastore.data['settings']['application']['all_muted'] = not current_state
+        datastore.needs_write_urgent = True
+
+        if datastore.data['settings']['application']['all_muted']:
+            flash(gettext("All notifications muted."), 'notice')
+        else:
+            flash(gettext("All notifications unmuted."), 'notice')
+
+        return redirect(url_for('watchlist.index'))
+
     return settings_blueprint

changedetectionio/blueprint/settings/templates/settings.html

@@ -25,6 +25,7 @@
             <li class="tab"><a href="#ui-options">{{ _('UI Options') }}</a></li>
             <li class="tab"><a href="#api">{{ _('API') }}</a></li>
             <li class="tab"><a href="#rss">{{ _('RSS') }}</a></li>
+            <li class="tab"><a href="{{ url_for('backups.index') }}" class="pure-menu-link">{{ _('Backups') }}</a></li>
             <li class="tab"><a href="#timedate">{{ _('Time & Date') }}</a></li>
             <li class="tab"><a href="#proxies">{{ _('CAPTCHA & Proxies') }}</a></li>
             {% if plugin_tabs %}
@@ -53,9 +54,9 @@
                     </div>
                     <div class="pure-control-group">
                         {{ render_field(form.application.form.filter_failure_notification_threshold_attempts, class="filter_failure_notification_threshold_attempts") }}
-                        <span class="pure-form-message-inline">After this many consecutive times that the CSS/xPath filter is missing, send a notification
+                        <span class="pure-form-message-inline">{{ _('After this many consecutive times that the CSS/xPath filter is missing, send a notification') }}
                             <br>
-                        Set to <strong>0</strong> to disable
+                        {{ _('Set to') }} <strong>0</strong> {{ _('to disable') }}
                         </span>
                     </div>
                     <div class="pure-control-group">
@@ -64,36 +65,33 @@
                                 {{ render_button(form.application.form.removepassword_button) }}
                             {% else %}
                             {{ render_field(form.application.form.password) }}
-                            <span class="pure-form-message-inline">Password protection for your changedetection.io application.</span>
+                            <span class="pure-form-message-inline">{{ _('Password protection for your changedetection.io application.') }}</span>
                             {% endif %}
                         {% else %}
-                            <span class="pure-form-message-inline">Password is locked.</span>
+                            <span class="pure-form-message-inline">{{ _('Password is locked.') }}</span>
                         {% endif %}
                     </div>
 
                     <div class="pure-control-group">
                         {{ render_checkbox_field(form.application.form.shared_diff_access, class="shared_diff_access") }}
-                        <span class="pure-form-message-inline">Allow access to the watch change history page when password is enabled (Good for sharing the diff page)
-                        </span>
+                        <span class="pure-form-message-inline">{{ _('Allow access to the watch change history page when password is enabled (Good for sharing the diff page)') }}</span>
                     </div>
                     <div class="pure-control-group">
                         {{ render_checkbox_field(form.application.form.empty_pages_are_a_change) }}
-                        <span class="pure-form-message-inline">When a request returns no content, or the HTML does not contain any text, is this considered a change?</span>
+                        <span class="pure-form-message-inline">{{ _('When a request returns no content, or the HTML does not contain any text, is this considered a change?') }}</span>
                     </div>
                 </fieldset>
             </div>
 
             <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>
                 <div class="pure-control-group" id="notification-base-url">
                     {{ render_field(form.application.form.base_url, class="m-d") }}
                     <span class="pure-form-message-inline">
-                        Base URL used for the <code>{{ '{{ base_url }}' }}</code> token in notification links.<br>
-                        Default value is the system environment variable '<code>BASE_URL</code>' - <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Configurable-BASE_URL-setting">read more here</a>.
+                        {{ _('Base URL used for the') }} <code>{{ '{{ base_url }}' }}</code> {{ _('token in notification links.') }}<br>
+                        {{ _('Default value is the system environment variable') }} '<code>BASE_URL</code>' - <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Configurable-BASE_URL-setting">{{ _('read more here') }}</a>.
                     </span>
                 </div>
             </div>
@@ -102,15 +100,15 @@
                 <div class="pure-control-group inline-radio">
                     {{ render_field(form.application.form.fetch_backend, class="fetch-backend") }}
                     <span class="pure-form-message-inline">
-                        <p>Use the <strong>Basic</strong> method (default) where your watched sites don't need Javascript to render.</p>
-                        <p>The <strong>Chrome/Javascript</strong> method requires a network connection to a running WebDriver+Chrome server, set by the ENV var 'WEBDRIVER_URL'. </p>
+                        <p>{{ _('Use the') }} <strong>{{ _('Basic') }}</strong> {{ _('method (default) where your watched sites don\'t need Javascript to render.') }}</p>
+                        <p>{{ _('The') }} <strong>{{ _('Chrome/Javascript') }}</strong> {{ _('method requires a network connection to a running WebDriver+Chrome server, set by the ENV var') }} 'WEBDRIVER_URL'. </p>
                     </span>
                 </div>
                 <fieldset class="pure-group" id="webdriver-override-options" data-visible-for="application-fetch_backend=html_webdriver">
                     <div class="pure-form-message-inline">
-                        <strong>If you're having trouble waiting for the page to be fully rendered (text missing etc), try increasing the 'wait' time here.</strong>
+                        <strong>{{ _('If you\'re having trouble waiting for the page to be fully rendered (text missing etc), try increasing the \'wait\' time here.') }}</strong>
                         <br>
-                        This will wait <i>n</i> seconds before extracting the text.
+                        {{ _('This will wait') }} <i>n</i> {{ _('seconds before extracting the text.') }}
                     </div>
                     <div class="pure-control-group">
                         {{ render_field(form.application.form.webdriver_delay) }}
@@ -119,27 +117,27 @@
                 <div class="pure-control-group">
                     {{ render_field(form.requests.form.workers) }}
                     {% set worker_info = get_worker_status_info() %}
-                    <span class="pure-form-message-inline">Number of concurrent workers to process watches. More workers = faster processing but higher memory usage.<br>
-                    Currently running: <strong>{{ worker_info.count }}</strong> operational {{ worker_info.type }} workers{% if worker_info.active_workers > 0 %} ({{ worker_info.active_workers }} actively processing){% endif %}.</span>
+                    <span class="pure-form-message-inline">{{ _('Number of concurrent workers to process watches. More workers = faster processing but higher memory usage.') }}<br>
+                    {{ _('Currently running:') }} <strong>{{ worker_info.count }}</strong> {{ _('operational') }} {{ worker_info.type }} {{ _('workers') }}{% if worker_info.active_workers > 0 %} ({{ worker_info.active_workers }} {{ _('actively processing') }}){% endif %}.</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_field(form.requests.form.jitter_seconds, class="jitter_seconds") }}
-                    <span class="pure-form-message-inline">Example - 3 seconds random jitter could trigger up to 3 seconds earlier or up to 3 seconds later</span>
+                    <span class="pure-form-message-inline">{{ _('Example - 3 seconds random jitter could trigger up to 3 seconds earlier or up to 3 seconds later') }}</span>
                 </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) }}
                     <span class="pure-form-message-inline">
-                        Applied to all requests.<br><br>
-                        Note: Simply changing the User-Agent often does not defeat anti-robot technologies, it's important to consider <a href="https://changedetection.io/tutorial/what-are-main-types-anti-robot-mechanisms">all of the ways that the browser is detected</a>.
+                        {{ _('Applied to all requests.') }}<br><br>
+                        {{ _('Note: Simply changing the User-Agent often does not defeat anti-robot technologies, it\'s important to consider') }} <a href="https://changedetection.io/tutorial/what-are-main-types-anti-robot-mechanisms">{{ _('all of the ways that the browser is detected') }}</a>.
                     </span>
                 </div>
                 <div class="pure-control-group">
                                         <br>
-                    Tip: <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Proxy-configuration#brightdata-proxy-support">Connect using Bright Data and Oxylabs Proxies, find out more here.</a>
+                    {{ _('Tip:') }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Proxy-configuration#brightdata-proxy-support">{{ _('Connect using Bright Data and Oxylabs Proxies, find out more here.') }}</a>
 
                 </div>
             </div>
@@ -148,15 +146,15 @@
 
                     <fieldset class="pure-group">
                     {{ render_checkbox_field(form.application.form.ignore_whitespace) }}
-                    <span class="pure-form-message-inline">Ignore whitespace, tabs and new-lines/line-feeds when considering if a change was detected.<br>
-                    <i>Note:</i> Changing this will change the status of your existing watches, possibly trigger alerts etc.
+                    <span class="pure-form-message-inline">{{ _('Ignore whitespace, tabs and new-lines/line-feeds when considering if a change was detected.') }}<br>
+                    <i>{{ _('Note:') }}</i> {{ _('Changing this will change the status of your existing watches, possibly trigger alerts etc.') }}
                     </span>
                     </fieldset>
                 <fieldset class="pure-group">
                     {{ render_checkbox_field(form.application.form.render_anchor_tag_content) }}
-                    <span class="pure-form-message-inline">Render anchor tag content, default disabled, when enabled renders links as <code>(link text)[https://somesite.com]</code>
+                    <span class="pure-form-message-inline">{{ _('Render anchor tag content, default disabled, when enabled renders links as') }} <code>(link text)[https://somesite.com]</code>
                         <br>
-                    <i>Note:</i> Changing this could affect the content of your existing watches, possibly trigger alerts etc.
+                    <i>{{ _('Note:') }}</i> {{ _('Changing this could affect the content of your existing watches, possibly trigger alerts etc.') }}
                     </span>
                     </fieldset>
                     <fieldset class="pure-group">
@@ -167,9 +165,9 @@ nav
 //*[contains(text(), 'Advertisement')]") }}
                       <span class="pure-form-message-inline">
                         <ul>
-                          <li> Remove HTML element(s) by CSS and XPath selectors before text conversion. </li>
-                          <li> Don't paste HTML here, use only CSS and XPath selectors </li>
-                          <li> Add multiple elements, CSS or XPath selectors per line to ignore multiple parts of the HTML. </li>
+                          <li> {{ _('Remove HTML element(s) by CSS and XPath selectors before text conversion.') }} </li>
+                          <li> {{ _('Don\'t paste HTML here, use only CSS and XPath selectors') }} </li>
+                          <li> {{ _('Add multiple elements, CSS or XPath selectors per line to ignore multiple parts of the HTML.') }} </li>
                         </ul>
                       </span>
                     </fieldset>
@@ -177,50 +175,50 @@ nav
                     {{ render_field(form.application.form.global_ignore_text, rows=5, placeholder="Some text to ignore in a line
 /some.regex\d{2}/ for case-INsensitive regex
                     ") }}
-                    <span class="pure-form-message-inline">Note: This is applied globally in addition to the per-watch rules.</span><br>
+                    <span class="pure-form-message-inline">{{ _('Note: This is applied globally in addition to the per-watch rules.') }}</span><br>
                     <span class="pure-form-message-inline">
                         <ul>
-                            <li>Matching text will be <strong>ignored</strong> in the text snapshot (you can still see it but it wont trigger a change)</li>
-                            <li>Note: This is applied globally in addition to the per-watch rules.</li>
-                            <li>Each line processed separately, any line matching will be ignored (removed before creating the checksum)</li>
-                            <li>Regular Expression support, wrap the entire line in forward slash <code>/regex/</code></li>
-                            <li>Changing this will affect the comparison checksum which may trigger an alert</li>
+                            <li>{{ _('Matching text will be') }} <strong>{{ _('ignored') }}</strong> {{ _('in the text snapshot (you can still see it but it wont trigger a change)') }}</li>
+                            <li>{{ _('Note: This is applied globally in addition to the per-watch rules.') }}</li>
+                            <li>{{ _('Each line processed separately, any line matching will be ignored (removed before creating the checksum)') }}</li>
+                            <li>{{ _('Regular Expression support, wrap the entire line in forward slash') }} <code>/regex/</code></li>
+                            <li>{{ _('Changing this will affect the comparison checksum which may trigger an alert') }}</li>
                         </ul>
                      </span>
                     </fieldset>
                     <fieldset class="pure-group">
                         {{ render_checkbox_field(form.application.form.strip_ignored_lines) }}
-                        <span class="pure-form-message-inline">Remove any text that appears in the "Ignore text" from the output (otherwise its just ignored for change-detection)<br>
-                        <i>Note:</i> Changing this will change the status of your existing watches, possibly trigger alerts etc.
+                        <span class="pure-form-message-inline">{{ _('Remove any text that appears in the "Ignore text" from the output (otherwise its just ignored for change-detection)') }}<br>
+                        <i>{{ _('Note:') }}</i> {{ _('Changing this will change the status of your existing watches, possibly trigger alerts etc.') }}
                         </span>
                     </fieldset>
            </div>
 
             <div class="tab-pane-inner" id="api">
-                <h4>API Access</h4>
-                <p>Drive your changedetection.io via API, More about <a href="https://changedetection.io/docs/api_v1/index.html">API access and examples here</a>.</p>
+                <h4>{{ _('API Access') }}</h4>
+                <p>{{ _('Drive your changedetection.io via API, More about') }} <a href="https://changedetection.io/docs/api_v1/index.html">{{ _('API access and examples here') }}</a>.</p>
 
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.api_access_token_enabled) }}
-                    <div class="pure-form-message-inline">Restrict API access limit by using <code>x-api-key</code> header - required for the Chrome Extension to work</div><br>
-                    <div class="pure-form-message-inline"><br>API Key <span id="api-key">{{api_key}}</span>
-                        <span style="display:none;" id="api-key-copy" >copy</span>
+                    <div class="pure-form-message-inline">{{ _('Restrict API access limit by using') }} <code>x-api-key</code> {{ _('header - required for the Chrome Extension to work') }}</div><br>
+                    <div class="pure-form-message-inline"><br>{{ _('API Key') }} <span id="api-key">{{api_key}}</span>
+                        <span style="display:none;" id="api-key-copy" >{{ _('copy') }}</span>
                     </div>
                 </div>
                 <div class="pure-control-group">
-                    <a href="{{url_for('settings.settings_reset_api_key')}}" class="pure-button button-small button-cancel">Regenerate API key</a>
+                    <a href="{{url_for('settings.settings_reset_api_key')}}" class="pure-button button-small button-cancel">{{ _('Regenerate API key') }}</a>
                 </div>
                 <div class="pure-control-group">
-                    <h4>Chrome Extension</h4>
-                    <p>Easily add any web-page to your changedetection.io installation from within Chrome.</p>
-                    <strong>Step 1</strong> Install the extension, <strong>Step 2</strong> Navigate to this page,
-                    <strong>Step 3</strong> Open the extension from the toolbar and click "<i>Sync API Access</i>"
+                    <h4>{{ _('Chrome Extension') }}</h4>
+                    <p>{{ _('Easily add any web-page to your changedetection.io installation from within Chrome.') }}</p>
+                    <strong>{{ _('Step 1') }}</strong> {{ _('Install the extension,') }} <strong>{{ _('Step 2') }}</strong> {{ _('Navigate to this page,') }}
+                    <strong>{{ _('Step 3') }}</strong> {{ _('Open the extension from the toolbar and click') }} "<i>{{ _('Sync API Access') }}</i>"
                     <p>
                         <a id="chrome-extension-link"
-                           title="Try our new Chrome Extension!"
+                           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">
-                            Chrome Webstore
+                            <img alt="{{ _('Chrome store icon') }}" src="{{ url_for('static_content', group='images', filename='google-chrome-icon.png') }}" >
+                            {{ _('Chrome Webstore') }}
                         </a>
                     </p>
                 </div>
@@ -231,20 +229,20 @@ nav
                 </div>
                 <div class="pure-control-group">
                     {{ render_field(form.application.form.rss_diff_length) }}
-                    <span class="pure-form-message-inline">Maximum number of history snapshots to include in the watch specific RSS feed.</span>
+                    <span class="pure-form-message-inline">{{ _('Maximum number of history snapshots to include in the watch specific RSS feed.') }}</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.rss_reader_mode) }}
-                    <span class="pure-form-message-inline">For watching other RSS feeds - When watching RSS/Atom feeds, convert them into clean text for better change detection.</span>
+                    <span class="pure-form-message-inline">{{ _('For watching other RSS feeds - When watching RSS/Atom feeds, convert them into clean text for better change detection.') }}</span>
                 </div>
                 <div class="pure-control-group grey-form-border">
                     <div class="pure-control-group">
                         {{ render_field(form.application.form.rss_content_format) }}
-                        <span class="pure-form-message-inline">Does your reader support HTML? Set it here</span>
+                        <span class="pure-form-message-inline">{{ _('Does your reader support HTML? Set it here') }}</span>
                     </div>
                     <div class="pure-control-group">
                         {{ render_field(form.application.form.rss_template_type) }}
-                        <span class="pure-form-message-inline">'System default' for the same template for all items, or re-use your "Notification Body" as the template.</span>
+                        <span class="pure-form-message-inline">{{ _('\'System default\' for the same template for all items, or re-use your "Notification Body" as the template.') }}</span>
                     </div>
                     <div>
                        {{ render_field(form.application.form.rss_template_override) }}
@@ -257,38 +255,38 @@ nav
             </div>
                 <div class="tab-pane-inner" id="timedate">
                 <div class="pure-control-group">
-                    Ensure the settings below are correct, they are used to manage the time schedule for checking your web page watches.
+                    {{ _('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 & Date from Server:') }}</strong> <span id="utc-time" >{{ utc_time }}</span></p>
+                    <p><strong>{{ _('Local Time & 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">
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.form.open_diff_in_new_tab, class="open_diff_in_new_tab") }}
-                    <span class="pure-form-message-inline">Enable this setting to open the diff page in a new tab. If disabled, the diff page will open in the current tab.</span>
+                    <span class="pure-form-message-inline">{{ _('Enable this setting to open the diff page in a new tab. If disabled, the diff page will open in the current tab.') }}</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.form.socket_io_enabled, class="socket_io_enabled") }}
-                    <span class="pure-form-message-inline">Realtime UI Updates Enabled - (Restart required if this is changed)</span>
+                    <span class="pure-form-message-inline">{{ _('Realtime UI Updates Enabled - (Restart required if this is changed)') }}</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.form.favicons_enabled, class="") }}
-                    <span class="pure-form-message-inline">Enable or Disable Favicons next to the watch list</span>
+                    <span class="pure-form-message-inline">{{ _('Enable or Disable Favicons next to the watch list') }}</span>
                 </div>
                 <div class="pure-control-group">
                     {{ render_checkbox_field(form.application.form.ui.use_page_title_in_list) }}
                 </div>
                 <div class="pure-control-group">
                     {{ render_field(form.application.form.pager_size) }}
-                    <span class="pure-form-message-inline">Number of items per page in the watch overview list, 0 to disable.</span>
+                    <span class="pure-form-message-inline">{{ _('Number of items per page in the watch overview list, 0 to disable.') }}</span>
                 </div>
 
             </div>
@@ -336,18 +334,18 @@ 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) }}
-                <span class="pure-form-message-inline">"Name" will be used for selecting the proxy in the Watch Edit settings</span><br>
-                <span class="pure-form-message-inline">SOCKS5 proxies with authentication are only supported with 'plain requests' fetcher, for other fetchers you should whitelist the IP access instead</span>
+                <span class="pure-form-message-inline">{{ _('"Name" will be used for selecting the proxy in the Watch Edit settings') }}</span><br>
+                <span class="pure-form-message-inline">{{ _('SOCKS5 proxies with authentication are only supported with \'plain requests\' fetcher, for other fetchers you should whitelist the IP access instead') }}</span>
                 {% if form.requests.proxy %}
                 <div>
                 <br>
                     <div class="inline-radio">
                         {{ render_field(form.requests.form.proxy, class="fetch-backend-proxy") }}
-                        <span class="pure-form-message-inline">Choose a default proxy for all watches</span>
+                        <span class="pure-form-message-inline">{{ _('Choose a default proxy for all watches') }}</span>
                     </div>
                 </div>
                 {% endif %}

changedetectionio/blueprint/tags/__init__.py

@@ -1,5 +1,7 @@
+import threading
 from flask import Blueprint, request, render_template, flash, url_for, redirect
 from flask_babel import gettext
+from loguru import logger
 
 from changedetectionio.store import ChangeDetectionStore
 from changedetectionio.flask_app import login_optionally_required
@@ -62,39 +64,73 @@ def construct_blueprint(datastore: ChangeDetectionStore):
     @tags_blueprint.route("/delete/<string:uuid>", methods=['GET'])
     @login_optionally_required
     def delete(uuid):
-        removed = 0
-        # Delete the tag, and any tag reference
+        # Delete the tag from settings immediately
         if datastore.data['settings']['application']['tags'].get(uuid):
             del datastore.data['settings']['application']['tags'][uuid]
 
-        for watch_uuid, watch in datastore.data['watching'].items():
-            if watch.get('tags') and uuid in watch['tags']:
-                removed += 1
-                watch['tags'].remove(uuid)
+        # Remove tag from all watches in background thread to avoid blocking
+        def remove_tag_background(tag_uuid):
+            """Background thread to remove tag from watches - discarded after completion."""
+            removed_count = 0
+            try:
+                for watch_uuid, watch in datastore.data['watching'].items():
+                    if watch.get('tags') and tag_uuid in watch['tags']:
+                        watch['tags'].remove(tag_uuid)
+                        removed_count += 1
+                logger.info(f"Background: Tag {tag_uuid} removed from {removed_count} watches")
+            except Exception as e:
+                logger.error(f"Error removing tag from watches: {e}")
 
-        flash(gettext("Tag deleted and removed from {} watches").format(removed))
+        # Start daemon thread
+        threading.Thread(target=remove_tag_background, args=(uuid,), daemon=True).start()
+
+        flash(gettext("Tag deleted, removing from watches in background"))
         return redirect(url_for('tags.tags_overview_page'))
 
     @tags_blueprint.route("/unlink/<string:uuid>", methods=['GET'])
     @login_optionally_required
     def unlink(uuid):
-        unlinked = 0
-        for watch_uuid, watch in datastore.data['watching'].items():
-            if watch.get('tags') and uuid in watch['tags']:
-                unlinked += 1
-                watch['tags'].remove(uuid)
+        # Unlink tag from all watches in background thread to avoid blocking
+        def unlink_tag_background(tag_uuid):
+            """Background thread to unlink tag from watches - discarded after completion."""
+            unlinked_count = 0
+            try:
+                for watch_uuid, watch in datastore.data['watching'].items():
+                    if watch.get('tags') and tag_uuid in watch['tags']:
+                        watch['tags'].remove(tag_uuid)
+                        unlinked_count += 1
+                logger.info(f"Background: Tag {tag_uuid} unlinked from {unlinked_count} watches")
+            except Exception as e:
+                logger.error(f"Error unlinking tag from watches: {e}")
 
-        flash(gettext("Tag unlinked removed from {} watches").format(unlinked))
+        # Start daemon thread
+        threading.Thread(target=unlink_tag_background, args=(uuid,), daemon=True).start()
+
+        flash(gettext("Unlinking tag from watches in background"))
         return redirect(url_for('tags.tags_overview_page'))
 
     @tags_blueprint.route("/delete_all", methods=['GET'])
     @login_optionally_required
     def delete_all():
-        for watch_uuid, watch in datastore.data['watching'].items():
-            watch['tags'] = []
+        # Clear all tags from settings immediately
         datastore.data['settings']['application']['tags'] = {}
 
-        flash(gettext("All tags deleted"))
+        # Clear tags from all watches in background thread to avoid blocking
+        def clear_all_tags_background():
+            """Background thread to clear tags from all watches - discarded after completion."""
+            cleared_count = 0
+            try:
+                for watch_uuid, watch in datastore.data['watching'].items():
+                    watch['tags'] = []
+                    cleared_count += 1
+                logger.info(f"Background: Cleared tags from {cleared_count} watches")
+            except Exception as e:
+                logger.error(f"Error clearing tags from watches: {e}")
+
+        # Start daemon thread
+        threading.Thread(target=clear_all_tags_background, daemon=True).start()
+
+        flash(gettext("All tags deleted, clearing from watches in background"))
         return redirect(url_for('tags.tags_overview_page'))
 
     @tags_blueprint.route("/edit/<string:uuid>", methods=['GET'])

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

@@ -1,4 +1,5 @@
 import time
+import threading
 from flask import Blueprint, request, redirect, url_for, flash, render_template, session
 from flask_babel import gettext
 from loguru import logger
@@ -151,9 +152,24 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_handle
             confirmtext = request.form.get('confirmtext')
 
             if confirmtext == 'clear':
-                for uuid in datastore.data['watching'].keys():
-                    datastore.clear_watch_history(uuid)
-                flash(gettext("Cleared snapshot history for all watches"))
+                # Run in background thread to avoid blocking
+                def clear_history_background():
+                    # Capture UUIDs first to avoid race conditions
+                    watch_uuids = list(datastore.data['watching'].keys())
+                    logger.info(f"Background: Clearing history for {len(watch_uuids)} watches")
+
+                    for uuid in watch_uuids:
+                        try:
+                            datastore.clear_watch_history(uuid)
+                        except Exception as e:
+                            logger.error(f"Error clearing history for watch {uuid}: {e}")
+
+                    logger.info("Background: Completed clearing history")
+
+                # Start daemon thread
+                threading.Thread(target=clear_history_background, daemon=True).start()
+
+                flash(gettext("History clearing started in background"))
             else:
                 flash(gettext('Incorrect confirmation text.'), 'error')
 
@@ -169,18 +185,32 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_handle
         # Save the current newest history as the most recently viewed
         with_errors = request.args.get('with_errors') == "1"
         tag_limit = request.args.get('tag')
-        logger.debug(f"Limiting to tag {tag_limit}")
         now = int(time.time())
-        for watch_uuid, watch in datastore.data['watching'].items():
-            if with_errors and not watch.get('last_error'):
-                continue
 
-            if tag_limit and ( not watch.get('tags') or tag_limit not in watch['tags'] ):
-                logger.debug(f"Skipping watch {watch_uuid}")
-                continue
+        # Mark watches as viewed in background thread to avoid blocking
+        def mark_viewed_background():
+            """Background thread to mark watches as viewed - discarded after completion."""
+            marked_count = 0
+            try:
+                for watch_uuid, watch in datastore.data['watching'].items():
+                    if with_errors and not watch.get('last_error'):
+                        continue
 
-            datastore.set_last_viewed(watch_uuid, now)
+                    if tag_limit and (not watch.get('tags') or tag_limit not in watch['tags']):
+                        continue
 
+                    datastore.set_last_viewed(watch_uuid, now)
+                    marked_count += 1
+
+                logger.info(f"Background marking complete: {marked_count} watches marked as viewed")
+            except Exception as e:
+                logger.error(f"Error in background mark as viewed: {e}")
+
+        # Start background thread and return immediately
+        thread = threading.Thread(target=mark_viewed_background, daemon=True)
+        thread.start()
+
+        flash(gettext("Marking watches as viewed in background..."))
         return redirect(url_for('watchlist.index', tag=tag_limit))
 
     @ui_blueprint.route("/delete", methods=['GET'])
@@ -225,38 +255,81 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_handle
         uuid = request.args.get('uuid')
         with_errors = request.args.get('with_errors') == "1"
 
-        i = 0
-
-        running_uuids = worker_handler.get_running_uuids()
-
         if uuid:
-            if uuid not in running_uuids:
+            # Single watch - check if already queued or running
+            if worker_handler.is_watch_running(uuid) or uuid in update_q.get_queued_uuids():
+                flash(gettext("Watch is already queued or being checked."))
+            else:
                 worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
-                i += 1
-
+                flash(gettext("Queued 1 watch for rechecking."))
         else:
-            # Recheck all, including muted
-            # Get most overdue first
+            # Multiple watches - first count how many need to be queued
+            watches_to_queue = []
             for k in sorted(datastore.data['watching'].items(), key=lambda item: item[1].get('last_checked', 0)):
                 watch_uuid = k[0]
                 watch = k[1]
-                if not watch['paused']:
-                    if watch_uuid not in running_uuids:
-                        if with_errors and not watch.get('last_error'):
-                            continue
+                if not watch['paused'] and watch_uuid:
+                    if with_errors and not watch.get('last_error'):
+                        continue
+                    if tag != None and tag not in watch['tags']:
+                        continue
+                    watches_to_queue.append(watch_uuid)
 
-                        if tag != None and tag not in watch['tags']:
-                            continue
+            # If less than 20 watches, queue synchronously for immediate feedback
+            if len(watches_to_queue) < 20:
+                # Get already queued/running UUIDs once (efficient)
+                queued_uuids = set(update_q.get_queued_uuids())
+                running_uuids = set(worker_handler.get_running_uuids())
 
-                        worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
-                        i += 1
+                # Filter out watches that are already queued or running
+                watches_to_queue_filtered = []
+                for watch_uuid in watches_to_queue:
+                    if watch_uuid not in queued_uuids and watch_uuid not in running_uuids:
+                        watches_to_queue_filtered.append(watch_uuid)
 
-        if i == 1:
-            flash(gettext("Queued 1 watch for rechecking."))
-        if i > 1:
-            flash(gettext("Queued {} watches for rechecking.").format(i))
-        if i == 0:
-            flash(gettext("No watches available to recheck."))
+                # Queue only the filtered watches
+                for watch_uuid in watches_to_queue_filtered:
+                    worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
+
+                # Provide feedback about skipped watches
+                skipped_count = len(watches_to_queue) - len(watches_to_queue_filtered)
+                if skipped_count > 0:
+                    flash(gettext("Queued {} watches for rechecking ({} already queued or running).").format(
+                        len(watches_to_queue_filtered), skipped_count))
+                else:
+                    if len(watches_to_queue_filtered) == 1:
+                        flash(gettext("Queued 1 watch for rechecking."))
+                    else:
+                        flash(gettext("Queued {} watches for rechecking.").format(len(watches_to_queue_filtered)))
+            else:
+                # 20+ watches - queue in background thread to avoid blocking HTTP response
+                # Capture queued/running state before background thread
+                queued_uuids = set(update_q.get_queued_uuids())
+                running_uuids = set(worker_handler.get_running_uuids())
+
+                def queue_watches_background():
+                    """Background thread to queue watches - discarded after completion."""
+                    try:
+                        queued_count = 0
+                        skipped_count = 0
+                        for watch_uuid in watches_to_queue:
+                            # Check if already queued or running (state captured at start)
+                            if watch_uuid not in queued_uuids and watch_uuid not in running_uuids:
+                                worker_handler.queue_item_async_safe(update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': watch_uuid}))
+                                queued_count += 1
+                            else:
+                                skipped_count += 1
+
+                        logger.info(f"Background queueing complete: {queued_count} watches queued, {skipped_count} skipped (already queued/running)")
+                    except Exception as e:
+                        logger.error(f"Error in background queueing: {e}")
+
+                # Start background thread and return immediately
+                thread = threading.Thread(target=queue_watches_background, daemon=True, name="QueueWatches-Background")
+                thread.start()
+
+                # Return immediately with approximate message
+                flash(gettext("Queueing watches for rechecking in background..."))
 
         return redirect(url_for('watchlist.index', **({'tag': tag} if tag else {})))
 

changedetectionio/blueprint/ui/edit.py

@@ -52,7 +52,13 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                     redirect(url_for('ui_edit.edit_page', uuid=uuid))
 
         # be sure we update with a copy instead of accidently editing the live object by reference
-        default = deepcopy(datastore.data['watching'][uuid])
+        default = None
+        while not default:
+            try:
+                default = deepcopy(datastore.data['watching'][uuid])
+            except RuntimeError as e:
+                # Dictionary changed
+                continue
 
         # Defaults for proxy choice
         if datastore.proxy_list is not None:  # When enabled
@@ -238,6 +244,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 +338,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

@@ -2,8 +2,8 @@ import os
 import time
 
 from flask import Blueprint, request, make_response, render_template, redirect, url_for, flash, session
-from flask_login import current_user
 from flask_paginate import Pagination, get_page_parameter
+from flask_babel import gettext as _
 
 from changedetectionio import forms
 from changedetectionio import processors
@@ -74,7 +74,10 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
 
         pagination = Pagination(page=page,
                                 total=total_count,
-                                per_page=datastore.data['settings']['application'].get('pager_size', 50), css_framework="semantic")
+                                per_page=datastore.data['settings']['application'].get('pager_size', 50),
+                                css_framework="semantic",
+                                display_msg=_('displaying <b>{start} - {end}</b> {record_name} in total <b>{total}</b>'),
+                                record_name=_('records'))
 
         sorted_tags = sorted(datastore.data['settings']['application'].get('tags').items(), key=lambda x: x[1]['title'])
 
@@ -85,16 +88,19 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             app_rss_token=datastore.data['settings']['application'].get('rss_access_token'),
             datastore=datastore,
             errored_count=errored_count,
+            extra_classes='has-queue' if not update_q.empty() else '',
             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,
             now_time_server=round(time.time()),
             pagination=pagination,
+            processor_badge_css=processors.get_processor_badge_css(),
             processor_badge_texts=processors.get_processor_badge_texts(),
             processor_descriptions=processors.get_processor_descriptions(),
-            processor_badge_css=processors.get_processor_badge_css(),
-            queued_uuids=[q_uuid.item['uuid'] for q_uuid in update_q.queue],
+            queue_size=update_q.qsize(),
+            queued_uuids=update_q.get_queued_uuids(),
             search_q=request.args.get('q', '').strip(),
             sort_attribute=request.args.get('sort') if request.args.get('sort') else request.cookies.get('sort'),
             sort_order=request.args.get('order') if request.args.get('order') else request.cookies.get('order'),

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">
 
@@ -35,7 +62,7 @@ document.addEventListener('DOMContentLoaded', function() {
                     {{ render_nolabel_field(form.edit_and_watch_submit_button, title=_("Edit first then Watch") ) }}
             </div>
             <div id="watch-group-tag">
-               {{ render_field(form.tags, value=active_tag.title if active_tag_uuid else '', placeholder="Watch group / tag", class="transparent-field") }}
+               {{ render_field(form.tags, value=active_tag.title if active_tag_uuid else '', placeholder=_("Watch group / tag"), class="transparent-field") }}
             </div>
             <div id="quick-watch-processor-type">
                 {{ render_simple_field(form.processor) }}
@@ -72,9 +99,14 @@ document.addEventListener('DOMContentLoaded', function() {
                        data-confirm-message="{{ _('<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>') }}"
                        data-confirm-button="{{ _('Delete') }}"><i data-feather="trash" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Delete') }}</button>
     </div>
-    {%- if watches|length >= pagination.per_page -%}
-        {{ pagination.info }}
-    {%- endif -%}
+
+    <div id="stats_row">
+        <div class="left">{%- if watches|length >= pagination.per_page -%}{{ pagination.info }}{%- endif -%}</div>
+        <div class="right" >{{ _('Queued size') }}: <span id="queue-size-int">{{ queue_size }}</span></div>
+    </div>
+
+
+
     {%- if search_q -%}<div id="search-result-info">{{ _('Searching') }} "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
     <div>
         <a href="{{url_for('watchlist.index')}}" class="pure-button button-tag {{'active' if not active_tag_uuid }}">{{ _('All') }}</a>
@@ -82,7 +114,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>
@@ -127,7 +159,7 @@ document.addEventListener('DOMContentLoaded', function() {
             <tbody>
             {%- if not watches|length -%}
             <tr>
-                <td colspan="{{ cols_required }}" style="text-wrap: wrap;">{{ _('No website watches configured, please add a URL in the box above, or') }} <a href="{{ url_for('imports.import_page')}}" >{{ _('import a list') }}</a>.</td>
+                <td colspan="{{ cols_required }}" style="text-wrap: wrap;">{{ _('No web page change detection watches configured, please add a URL in the box above, or') }} <a href="{{ url_for('imports.import_page')}}" >{{ _('import a list') }}</a>.</td>
             </tr>
             {%- endif -%}
 
@@ -169,7 +201,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 +223,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/puppeteer.py

@@ -204,7 +204,7 @@ class fetcher(Fetcher):
         import re
         self.delete_browser_steps_screenshots()
 
-        n = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay
+        n = int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 12)) + self.render_extract_delay
         extra_wait = min(n, 15)
 
         logger.debug(f"Extra wait set to {extra_wait}s, requested was {n}s.")
@@ -288,28 +288,27 @@ class fetcher(Fetcher):
         # Enable Network domain to detect when first bytes arrive
         await self.page._client.send('Network.enable')
 
+        # Now set up the frame navigation handlers
+        async def handle_frame_navigation(event=None):
+            # Wait n seconds after the frameStartedLoading, not from any frameStartedLoading/frameStartedNavigating
+            logger.debug(f"Frame navigated: {event}")
+            w = extra_wait - 2 if extra_wait > 4 else 2
+            logger.debug(f"Waiting {w} seconds before calling Page.stopLoading...")
+            await asyncio.sleep(w)
+            logger.debug("Issuing stopLoading command...")
+            await self.page._client.send('Page.stopLoading')
+            logger.debug("stopLoading command sent!")
+
         async def setup_frame_handlers_on_first_response(event):
             # Only trigger for the main document response
             if event.get('type') == 'Document':
                 logger.debug("First response received, setting up frame handlers for forced page stop load.")
-
-                # De-register this listener - we only need it once
-                self.page._client.remove_listener('Network.responseReceived', setup_frame_handlers_on_first_response)
-
-                # Now set up the frame navigation handlers
-                async def handle_frame_navigation(event):
-                    # Wait n seconds after the frameStartedLoading, not from any frameStartedLoading/frameStartedNavigating
-                    logger.debug(f"Frame navigated: {event}")
-                    w = extra_wait - 2 if extra_wait > 4 else 2
-                    logger.debug(f"Waiting {w} seconds before calling Page.stopLoading...")
-                    await asyncio.sleep(w)
-                    logger.debug("Issuing stopLoading command...")
-                    await self.page._client.send('Page.stopLoading')
-                    logger.debug("stopLoading command sent!")
-
                 self.page._client.on('Page.frameStartedNavigating', lambda e: asyncio.create_task(handle_frame_navigation(e)))
                 self.page._client.on('Page.frameStartedLoading', lambda e: asyncio.create_task(handle_frame_navigation(e)))
                 self.page._client.on('Page.frameStoppedLoading', lambda e: logger.debug(f"Frame stopped loading: {e}"))
+                logger.debug("First response received, setting up frame handlers for forced page stop load DONE SETUP")
+                # De-register this listener - we only need it once
+                self.page._client.remove_listener('Network.responseReceived', setup_frame_handlers_on_first_response)
 
         # Listen for first response to trigger frame handler setup
         self.page._client.on('Network.responseReceived', setup_frame_handlers_on_first_response)
@@ -318,8 +317,11 @@ class fetcher(Fetcher):
         attempt=0
         while not response:
             logger.debug(f"Attempting page fetch {url} attempt {attempt}")
+            asyncio.create_task(handle_frame_navigation())
             response = await self.page.goto(url, timeout=0)
             await asyncio.sleep(1 + extra_wait)
+            await self.page._client.send('Page.stopLoading')
+
             if response:
                 break
             if not response:

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
 
@@ -156,6 +156,19 @@ class fetcher(Fetcher):
                     from PIL import Image
                     import io
                     img = Image.open(io.BytesIO(screenshot_png))
+                    # Convert to RGB if needed (JPEG doesn't support transparency)
+                    # Always convert non-RGB modes to RGB to ensure JPEG compatibility
+                    if img.mode in ('RGBA', 'LA', 'P', 'PA'):
+                        # Handle transparency by compositing onto white background
+                        if img.mode == 'P':
+                            img = img.convert('RGBA')
+                        background = Image.new('RGB', img.size, (255, 255, 255))
+                        if img.mode in ('RGBA', 'LA', 'PA'):
+                            background.paste(img, mask=img.split()[-1])  # Use alpha channel as mask
+                        img = background
+                    elif img.mode != 'RGB':
+                        # For other modes, direct conversion
+                        img = img.convert('RGB')
                     jpeg_buffer = io.BytesIO()
                     img.save(jpeg_buffer, format='JPEG', quality=int(os.getenv("SCREENSHOT_QUALITY", 72)))
                     self.screenshot = jpeg_buffer.getvalue()

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

@@ -9,6 +9,7 @@ import threading
 import time
 import timeago
 from blinker import signal
+from pathlib import Path
 
 from changedetectionio.strtobool import strtobool
 from threading import Event
@@ -27,7 +28,6 @@ from flask import (
     url_for,
 )
 from flask_compress import Compress as FlaskCompress
-from flask_login import current_user
 from flask_restful import abort, Api
 from flask_cors import CORS
 
@@ -44,6 +44,7 @@ from changedetectionio.api import Watch, WatchHistory, WatchSingleHistory, Watch
 from changedetectionio.api.Search import Search
 from .time_handler import is_within_schedule
 from changedetectionio.languages import get_available_languages, get_language_codes, get_flag_for_locale, get_timeago_locale
+IN_PYTEST = "pytest" in sys.modules or "PYTEST_CURRENT_TEST" in os.environ
 
 datastore = None
 
@@ -54,7 +55,7 @@ extra_stylesheets = []
 # Use bulletproof janus-based queues for sync/async reliability  
 update_q = RecheckPriorityQueue()
 notification_q = NotificationQueue()
-MAX_QUEUE_SIZE = 2000
+MAX_QUEUE_SIZE = 5000
 
 app = Flask(__name__,
             static_url_path="",
@@ -83,6 +84,10 @@ app.config['NEW_VERSION_AVAILABLE'] = False
 if os.getenv('FLASK_SERVER_NAME'):
     app.config['SERVER_NAME'] = os.getenv('FLASK_SERVER_NAME')
 
+# Babel/i18n configuration
+app.config['BABEL_TRANSLATION_DIRECTORIES'] = str(Path(__file__).parent / 'translations')
+app.config['BABEL_DEFAULT_LOCALE'] = 'en_GB'
+
 #app.config["EXPLAIN_TEMPLATE_LOADING"] = True
 
 
@@ -296,6 +301,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
 
@@ -350,6 +374,16 @@ def changedetection_app(config=None, datastore_o=None):
     global datastore, socketio_server
     datastore = datastore_o
 
+    # Set datastore reference in notification queue for all_muted checking
+    notification_q.set_datastore(datastore)
+
+    # Import and create a wrapper for is_safe_url that has access to app
+    from changedetectionio.is_safe_url import is_safe_url as _is_safe_url
+
+    def is_safe_url(target):
+        """Wrapper for is_safe_url that passes the app instance"""
+        return _is_safe_url(target, app)
+
     # so far just for read-only via tests, but this will be moved eventually to be the main source
     # (instead of the global var)
     app.config['DATASTORE'] = datastore_o
@@ -368,13 +402,9 @@ def changedetection_app(config=None, datastore_o=None):
     def get_locale():
         # 1. Try to get locale from session (user explicitly selected)
         if 'locale' in session:
-            locale = session['locale']
-            logger.trace(f"DEBUG: get_locale() returning from session: {locale}")
-            return locale
+            return session['locale']
         # 2. Fall back to Accept-Language header
-        locale = request.accept_languages.best_match(language_codes)
-        logger.trace(f"DEBUG: get_locale() returning from Accept-Language: {locale}")
-        return locale
+        return request.accept_languages.best_match(language_codes)
 
     # Initialize Babel with locale selector
     babel = Babel(app, locale_selector=get_locale)
@@ -471,36 +501,73 @@ def changedetection_app(config=None, datastore_o=None):
 
     @login_manager.unauthorized_handler
     def unauthorized_handler():
-        return redirect(url_for('login', next=url_for('watchlist.index')))
+        # Pass the current request path so users are redirected back after login
+        return redirect(url_for('login', redirect=request.path))
 
     @app.route('/logout')
     def logout():
         flask_login.logout_user()
+
+        # Check if there's a redirect parameter to return to after re-login
+        redirect_url = request.args.get('redirect')
+
+        # If redirect is provided and safe, pass it to login page
+        if redirect_url and is_safe_url(redirect_url):
+            return redirect(url_for('login', redirect=redirect_url))
+
+        # Otherwise just go to watchlist
         return redirect(url_for('watchlist.index'))
 
     @app.route('/set-language/<locale>')
     def set_language(locale):
         """Set the user's preferred language in the session"""
+        if not request.cookies:
+            logger.error("Cannot set language without session cookie")
+            flash("Cannot set language without session cookie", 'error')
+            return redirect(url_for('watchlist.index'))
+
         # Validate the locale against available languages
         if locale in language_codes:
             session['locale'] = locale
+
+            # CRITICAL: Flask-Babel caches the locale in the request context (ctx.babel_locale)
+            # We must refresh to clear this cache so the new locale takes effect immediately
+            # This is especially important for tests where multiple requests happen rapidly
+            from flask_babel import refresh
+            refresh()
         else:
             logger.error(f"Invalid locale {locale}, available: {language_codes}")
 
-        # Redirect back to the page they came from, or home
+        # Check if there's a redirect parameter to return to the same page
+        redirect_url = request.args.get('redirect')
+
+        # If redirect is provided and safe, use it
+        if redirect_url and is_safe_url(redirect_url):
+            return redirect(redirect_url)
+
+        # Otherwise redirect to watchlist
         return redirect(url_for('watchlist.index'))
 
     # https://github.com/pallets/flask/blob/93dd1709d05a1cf0e886df6223377bdab3b077fb/examples/tutorial/flaskr/__init__.py#L39
     # You can divide up the stuff like this
     @app.route('/login', methods=['GET', 'POST'])
     def login():
+        # Extract and validate the redirect parameter
+        redirect_url = request.args.get('redirect') or request.form.get('redirect')
+
+        # Validate the redirect URL - default to watchlist if invalid
+        if redirect_url and is_safe_url(redirect_url):
+            validated_redirect = redirect_url
+        else:
+            validated_redirect = url_for('watchlist.index')
 
         if request.method == 'GET':
             if flask_login.current_user.is_authenticated:
+                # Already logged in - redirect immediately to the target
                 flash(gettext("Already logged in"))
-                return redirect(url_for("watchlist.index"))
+                return redirect(validated_redirect)
             flash(gettext("You must be logged in, please log in."), 'error')
-            output = render_template("login.html")
+            output = render_template("login.html", redirect_url=validated_redirect)
             return output
 
         user = User()
@@ -510,23 +577,13 @@ def changedetection_app(config=None, datastore_o=None):
 
         if (user.check_password(password)):
             flask_login.login_user(user, remember=True)
-
-            # For now there's nothing else interesting here other than the index/list page
-            # It's more reliable and safe to ignore the 'next' redirect
-            # When we used...
-            # next = request.args.get('next')
-            # return redirect(next or url_for('watchlist.index'))
-            # We would sometimes get login loop errors on sites hosted in sub-paths
-
-            # note for the future:
-            #            if not is_safe_valid_url(next):
-            #                return flask.abort(400)
-            return redirect(url_for('watchlist.index'))
+            # Redirect to the validated URL after successful login
+            return redirect(validated_redirect)
 
         else:
             flash(gettext('Incorrect password'), 'error')
 
-        return redirect(url_for('login'))
+        return redirect(url_for('login', redirect=redirect_url if redirect_url else None))
 
     @app.before_request
     def before_request_handle_cookie_x_settings():
@@ -820,13 +877,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
@@ -871,7 +928,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:
 
@@ -908,7 +965,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:]
 
@@ -924,6 +981,10 @@ def ticker_thread_check_time_launch_checks():
     logger.debug(f"System env MINIMUM_SECONDS_RECHECK_TIME {recheck_time_minimum_seconds}")
 
     # Workers are now started during app initialization, not here
+    WAIT_TIME_BETWEEN_LOOP = 1.0 if not IN_PYTEST else 0.01
+    if IN_PYTEST:
+        # The time between loops should be less than the first .sleep/wait in def wait_for_all_checks() of tests/util.py
+        logger.warning(f"Looks like we're in PYTEST! Setting time between searching for items to add to the queue to {WAIT_TIME_BETWEEN_LOOP}s")
 
     while not app.config.exit.is_set():
 
@@ -941,12 +1002,20 @@ def ticker_thread_check_time_launch_checks():
             
             if health_result['status'] != 'healthy':
                 logger.warning(f"Worker health check: {health_result['message']}")
-                
+
             last_health_check = now
 
+        # Check if all checks are paused
+        if datastore.data['settings']['application'].get('all_paused', False):
+            app.config.exit.wait(1)
+            continue
+
         # Get a list of watches by UUID that are currently fetching data
         running_uuids = worker_handler.get_running_uuids()
 
+        # Build set of queued UUIDs once for O(1) lookup instead of O(n) per watch
+        queued_uuids = {q_item.item['uuid'] for q_item in update_q.queue}
+
         # Re #232 - Deepcopy the data incase it changes while we're iterating through it all
         watch_uuid_list = []
         while True:
@@ -963,16 +1032,17 @@ def ticker_thread_check_time_launch_checks():
             else:
                 break
 
-        # 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)
-
-
         recheck_time_system_seconds = int(datastore.threshold_seconds)
 
         # Check for watches outside of the time threshold to put in the thread queue.
-        for uuid in watch_uuid_list:
+        for watch_index, uuid in enumerate(watch_uuid_list):
+            # Re #438 - Check queue size every 100 watches for CPU efficiency (not every watch)
+            if watch_index % 100 == 0:
+                current_queue_size = update_q.qsize()
+                if current_queue_size >= MAX_QUEUE_SIZE:
+                    logger.debug(f"Queue size limit reached ({current_queue_size}/{MAX_QUEUE_SIZE}), stopping scheduler this iteration.")
+                    break
+
             now = time.time()
             watch = datastore.data['watching'].get(uuid)
             if not watch:
@@ -1022,7 +1092,7 @@ def ticker_thread_check_time_launch_checks():
             seconds_since_last_recheck = now - watch['last_checked']
 
             if seconds_since_last_recheck >= (threshold + watch.jitter_seconds) and seconds_since_last_recheck >= recheck_time_minimum_seconds:
-                if not uuid in running_uuids and uuid not in [q_uuid.item['uuid'] for q_uuid in update_q.queue]:
+                if not uuid in running_uuids and uuid not in queued_uuids:
 
                     # Proxies can be set to have a limit on seconds between which they can be called
                     watch_proxy = datastore.get_preferred_proxy_for_watch(uuid=uuid)
@@ -1064,8 +1134,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)
+        app.config.exit.wait(WAIT_TIME_BETWEEN_LOOP)

changedetectionio/forms.py

@@ -727,8 +727,8 @@ class ValidateStartsWithRegex(object):
                 raise ValidationError(self.message or _l("Invalid value."))
 
 class quickWatchForm(Form):
-    url = fields.URLField('URL', validators=[validateURL()])
-    tags = StringTagUUID('Group tag', [validators.Optional()])
+    url = fields.URLField(_l('URL'), validators=[validateURL()])
+    tags = StringTagUUID(_l('Group tag'), validators=[validators.Optional()])
     watch_submit_button = SubmitField(_l('Watch'), render_kw={"class": "pure-button pure-button-primary"})
     processor = RadioField(_l('Processor'), choices=lambda: processors.available_processors(), default="text_json_diff")
     edit_and_watch_submit_button = SubmitField(_l('Edit > Watch'), render_kw={"class": "pure-button pure-button-primary"})
@@ -781,11 +781,12 @@ 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,
+        label=_l('Time Between Check'),
         conditional_field='time_between_check_use_default',
         conditional_message=REQUIRE_ATLEAST_ONE_TIME_PART_WHEN_NOT_GLOBAL_DEFAULT,
         conditional_test_function=validate_time_between_check_has_values
@@ -947,7 +948,7 @@ class DefaultUAInputForm(Form):
 
 # datastore.data['settings']['requests']..
 class globalSettingsRequestForm(Form):
-    time_between_check = RequiredFormField(TimeBetweenCheckForm)
+    time_between_check = RequiredFormField(TimeBetweenCheckForm, label=_l('Time Between Check'))
     time_schedule_limit = FormField(ScheduleLimitForm)
     proxy = RadioField(_l('Default proxy'))
     jitter_seconds = IntegerField(_l('Random jitter seconds ± check'),
@@ -1007,7 +1008,7 @@ class globalSettingsApplicationForm(commonSettingsForm):
         render_kw={"placeholder": "0.1", "style": "width: 8em;"}
     )
 
-    password = SaltyPasswordField()
+    password = SaltyPasswordField(_l('Password'))
     pager_size = IntegerField(_l('Pager size'),
                               render_kw={"style": "width: 5em;"},
                               validators=[validators.NumberRange(min=0,

changedetectionio/html_tools.py

@@ -539,6 +539,18 @@ def cdata_in_document_to_text(html_content: str, render_anchor_tag_content=False
 
 
 def html_to_text(html_content: str, render_anchor_tag_content=False, is_rss=False, timeout=10) -> str:
+    """
+    Convert HTML content to plain text using inscriptis.
+
+    Thread-Safety: This function uses inscriptis.get_text() which internally calls
+    lxml.html.fromstring() with the default parser. Testing with 50 concurrent threads
+    confirms this approach is thread-safe and produces deterministic output.
+
+    Alternative Approach Rejected: An explicit HTMLParser instance (thread-local or fresh)
+    would also be thread-safe, but was found to break change detection logic in subtle ways
+    (test_check_basic_change_detection_functionality). The default parser provides correct
+    and reliable behavior.
+    """
     from inscriptis import get_text
     from inscriptis.model.config import ParserConfig
 

changedetectionio/is_safe_url.py

@@ -0,0 +1,113 @@
+"""
+URL redirect validation module for preventing open redirect vulnerabilities.
+
+This module provides functionality to safely validate redirect URLs, ensuring they:
+1. Point to internal routes only (no external redirects)
+2. Are properly normalized (preventing browser parsing differences)
+3. Match registered Flask routes (no fake/non-existent pages)
+4. Are fully logged for security monitoring
+
+References:
+- https://flask-login.readthedocs.io/ (safe redirect patterns)
+- https://blog.miguelgrinberg.com/post/the-flask-mega-tutorial-part-v-user-logins
+- https://www.pythonkitchen.com/how-prevent-open-redirect-vulnerab-flask/
+"""
+
+from urllib.parse import urlparse, urljoin
+from flask import request
+from loguru import logger
+
+
+def is_safe_url(target, app):
+    """
+    Validate that a redirect URL is safe to prevent open redirect vulnerabilities.
+
+    This follows Flask/Werkzeug best practices by ensuring the redirect URL:
+    1. Is a relative path starting with exactly one '/'
+    2. Does not start with '//' (double-slash attack)
+    3. Has no external protocol handlers
+    4. Points to a valid registered route in the application
+    5. Is properly normalized to prevent browser parsing differences
+
+    Args:
+        target: The URL to validate (e.g., '/settings', '/login#top')
+        app: The Flask application instance (needed for route validation)
+
+    Returns:
+        bool: True if the URL is safe for redirection, False otherwise
+
+    Examples:
+        >>> is_safe_url('/settings', app)
+        True
+        >>> is_safe_url('//evil.com', app)
+        False
+        >>> is_safe_url('/settings#general', app)
+        True
+        >>> is_safe_url('/fake-page', app)
+        False
+    """
+    if not target:
+        return False
+
+    # Normalize the URL to prevent browser parsing differences
+    # Strip whitespace and replace backslashes (which some browsers interpret as forward slashes)
+    target = target.strip()
+    target = target.replace('\\', '/')
+
+    # First, check if it starts with // or more (double-slash attack)
+    if target.startswith('//'):
+        logger.warning(f"Blocked redirect attempt with double-slash: {target}")
+        return False
+
+    # Parse the URL to check for scheme and netloc
+    parsed = urlparse(target)
+
+    # Block any URL with a scheme (http://, https://, javascript:, etc.)
+    if parsed.scheme:
+        logger.warning(f"Blocked redirect attempt with scheme: {target}")
+        return False
+
+    # Block any URL with a network location (netloc)
+    # This catches patterns like //evil.com, user@host, etc.
+    if parsed.netloc:
+        logger.warning(f"Blocked redirect attempt with netloc: {target}")
+        return False
+
+    # At this point, we have a relative URL with no scheme or netloc
+    # Use urljoin to resolve it and verify it points to the same host
+    ref_url = urlparse(request.host_url)
+    test_url = urlparse(urljoin(request.host_url, target))
+
+    # Check: ensure the resolved URL has the same netloc as current host
+    if not (test_url.scheme in ('http', 'https') and ref_url.netloc == test_url.netloc):
+        logger.warning(f"Blocked redirect attempt with mismatched netloc: {target}")
+        return False
+
+    # Additional validation: Check if the URL matches a registered route
+    # This prevents redirects to non-existent pages or unintended endpoints
+    try:
+        # Get the path without query string and fragment
+        # Fragments (like #general) are automatically stripped by urlparse
+        path = parsed.path
+
+        # Create a URL adapter bound to the server name
+        adapter = app.url_map.bind(ref_url.netloc)
+
+        # Try to match the path to a registered route
+        # This will raise NotFound if the route doesn't exist
+        endpoint, values = adapter.match(path, return_rule=False)
+
+        # Block redirects to static file endpoints - these are catch-all routes
+        # that would match arbitrary paths, potentially allowing unintended redirects
+        if endpoint in ('static_content', 'static', 'static_flags'):
+            logger.warning(f"Blocked redirect to static endpoint: {target}")
+            return False
+
+        # Successfully matched a valid route
+        logger.debug(f"Validated safe redirect to endpoint '{endpoint}': {target}")
+        return True
+
+    except Exception as e:
+        # Route doesn't exist or can't be matched
+        logger.warning(f"Blocked redirect to non-existent route: {target} (error: {e})")
+        return False

changedetectionio/languages.py

@@ -29,18 +29,24 @@ def get_timeago_locale(flask_locale):
     """
     locale_map = {
         'zh': 'zh_CN',      # Chinese Simplified
+        # timeago library just hasn't been updated to use the more modern locale naming convention, before BCP 47 / RFC 5646.
+        'zh_TW': 'zh_TW',   # Chinese Traditional (timeago uses zh_TW)
+        'zh_Hant_TW': 'zh_TW',  # Flask-Babel normalizes zh_TW to zh_Hant_TW, map back to timeago's zh_TW
         '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': '한국어'},
@@ -50,7 +56,7 @@ LANGUAGE_DATA = {
     'it': {'flag': 'fi fi-it fis', 'name': 'Italiano'},
     'ja': {'flag': 'fi fi-jp fis', 'name': '日本語'},
     'zh': {'flag': 'fi fi-cn fis', 'name': '中文 (简体)'},
-    'zh_TW': {'flag': 'fi fi-tw fis', 'name': '繁體中文'},
+    'zh_Hant_TW': {'flag': 'fi fi-tw fis', 'name': '繁體中文'},
     'ru': {'flag': 'fi fi-ru fis', 'name': 'Русский'},
     'pl': {'flag': 'fi fi-pl fis', 'name': 'Polski'},
     'nl': {'flag': 'fi fi-nl fis', 'name': 'Nederlands'},
@@ -71,10 +77,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 +88,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

@@ -37,6 +37,8 @@ class model(dict):
                 },
                 'application': {
                     # Custom notification content
+                    'all_paused': False,
+                    'all_muted': False,
                     'api_access_token_enabled': True,
                     'base_url' : None,
                     'empty_pages_are_a_change': False,

changedetectionio/model/Watch.py

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

changedetectionio/processors/image_ssim_diff/difference.py

@@ -130,7 +130,7 @@ def get_asset(asset_name, watch, datastore, request):
                 except Exception as e:
                     exception_container[0] = e
 
-            thread = threading.Thread(target=thread_target)
+            thread = threading.Thread(target=thread_target, daemon=True, name="ImageDiff-Asset")
             thread.start()
             thread.join(timeout=60)
 
@@ -284,7 +284,7 @@ def _draw_bounding_box_if_configured(img_bytes, watch, datastore):
             except Exception as e:
                 exception_container[0] = e
 
-        thread = threading.Thread(target=thread_target)
+        thread = threading.Thread(target=thread_target, daemon=True, name="ImageDiff-BoundingBox")
         thread.start()
         thread.join(timeout=15)
 
@@ -393,7 +393,7 @@ def render(watch, datastore, request, url_for, render_template, flash, redirect)
             except Exception as e:
                 exception_container[0] = e
 
-        thread = threading.Thread(target=thread_target)
+        thread = threading.Thread(target=thread_target, daemon=True, name="ImageDiff-ChangePercentage")
         thread.start()
         thread.join(timeout=60)
 

changedetectionio/processors/image_ssim_diff/image_handler/isolated_libvips.py

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

changedetectionio/processors/image_ssim_diff/processor.py

@@ -204,7 +204,7 @@ class perform_site_check(difference_detection_processor):
                 except Exception as e:
                     exception_container[0] = e
 
-            thread = threading.Thread(target=thread_target)
+            thread = threading.Thread(target=thread_target, daemon=True, name="ImageDiff-Processor")
             thread.start()
             thread.join(timeout=60)
 

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)
@@ -172,7 +176,16 @@ class RecheckPriorityQueue:
     def empty(self) -> bool:
         """Check if queue is empty"""
         return self.qsize() == 0
-    
+
+    def get_queued_uuids(self) -> list:
+        """Get list of all queued UUIDs efficiently with single lock"""
+        try:
+            with self._lock:
+                return [item.item['uuid'] for item in self._priority_items if hasattr(item, 'item') and 'uuid' in item.item]
+        except Exception as e:
+            logger.critical(f"CRITICAL: Failed to get queued UUIDs: {str(e)}")
+            return []
+
     def close(self):
         """Close the janus queue"""
         try:
@@ -348,21 +361,31 @@ class NotificationQueue:
     Simple wrapper around janus with bulletproof error handling.
     """
     
-    def __init__(self, maxsize: int = 0):
+    def __init__(self, maxsize: int = 0, datastore=None):
         try:
             self._janus_queue = janus.Queue(maxsize=maxsize)
             # BOTH interfaces required - see class docstring for why
             self.sync_q = self._janus_queue.sync_q   # Flask routes, threads
             self.async_q = self._janus_queue.async_q # Async workers
             self.notification_event_signal = signal('notification_event')
+            self.datastore = datastore  # For checking all_muted setting
             logger.debug("NotificationQueue initialized successfully")
         except Exception as e:
             logger.critical(f"CRITICAL: Failed to initialize NotificationQueue: {str(e)}")
             raise
+
+    def set_datastore(self, datastore):
+        """Set datastore reference after initialization (for circular dependency handling)"""
+        self.datastore = datastore
     
     def put(self, item: Dict[str, Any], block: bool = True, timeout: Optional[float] = None):
         """Thread-safe sync put with signal emission"""
         try:
+            # Check if all notifications are muted
+            if self.datastore and self.datastore.data['settings']['application'].get('all_muted', False):
+                logger.debug(f"Notification blocked - all notifications are muted: {item.get('uuid', 'unknown')}")
+                return False
+
             self.sync_q.put(item, block=block, timeout=timeout)
             self._emit_notification_signal(item)
             logger.debug(f"Successfully queued notification: {item.get('uuid', 'unknown')}")
@@ -374,6 +397,11 @@ class NotificationQueue:
     async def async_put(self, item: Dict[str, Any]):
         """Pure async put with signal emission"""
         try:
+            # Check if all notifications are muted
+            if self.datastore and self.datastore.data['settings']['application'].get('all_muted', False):
+                logger.debug(f"Notification blocked - all notifications are muted: {item.get('uuid', 'unknown')}")
+                return False
+
             await self.async_q.put(item)
             self._emit_notification_signal(item)
             logger.debug(f"Successfully async queued notification: {item.get('uuid', 'unknown')}")

changedetectionio/realtime/socket_server.py

@@ -150,11 +150,8 @@ def handle_watch_update(socketio, **kwargs):
         # Get list of watches that are currently running
         running_uuids = worker_handler.get_running_uuids()
 
-        # Get list of watches in the queue
-        queue_list = []
-        for q_item in update_q.queue:
-            if hasattr(q_item, 'item') and 'uuid' in q_item.item:
-                queue_list.append(q_item.item['uuid'])
+        # Get list of watches in the queue (efficient single-lock method)
+        queue_list = update_q.get_queued_uuids()
 
         # Get the error texts from the watch
         error_texts = watch.compile_error_texts()
@@ -254,21 +251,32 @@ def init_socketio(app, datastore):
         from changedetectionio import queuedWatchMetaData
         from changedetectionio import worker_handler
         from changedetectionio.flask_app import update_q, watch_check_update
+        import threading
+
         logger.trace(f"Got checkbox operations event: {data}")
 
         datastore = socketio.datastore
 
-        _handle_operations(
-            op=data.get('op'),
-            uuids=data.get('uuids'),
-            datastore=datastore,
-            extra_data=data.get('extra_data'),
-            worker_handler=worker_handler,
-            update_q=update_q,
-            queuedWatchMetaData=queuedWatchMetaData,
-            watch_check_update=watch_check_update,
-            emit_flash=False
-        )
+        def run_operation():
+            """Run the operation in a background thread to avoid blocking the socket.io event loop"""
+            try:
+                _handle_operations(
+                    op=data.get('op'),
+                    uuids=data.get('uuids'),
+                    datastore=datastore,
+                    extra_data=data.get('extra_data'),
+                    worker_handler=worker_handler,
+                    update_q=update_q,
+                    queuedWatchMetaData=queuedWatchMetaData,
+                    watch_check_update=watch_check_update,
+                    emit_flash=False
+                )
+            except Exception as e:
+                logger.error(f"Error in checkbox operation thread: {e}")
+
+        # Start operation in a disposable daemon thread
+        thread = threading.Thread(target=run_operation, daemon=True, name=f"checkbox-op-{data.get('op')}")
+        thread.start()
 
     @socketio.on('connect')
     def handle_connect():

changedetectionio/run_basic_tests.sh

@@ -82,27 +82,22 @@ echo "RUNNING WITH BASE_URL SET"
 # Re #65 - Ability to include a link back to the installation, in the notification.
 export BASE_URL="https://really-unique-domain.io"
 
-REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 tests/test_notification.py
-
-
 # Re-run with HIDE_REFERER set - could affect login
 export HIDE_REFERER=True
-pytest -vv -s --maxfail=1 tests/test_access_control.py
+REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 tests/test_notification.py tests/test_access_control.py
+
 
 # Re-run a few tests that will trigger brotli based storage
-export SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD=5
-pytest -vv -s --maxfail=1 tests/test_access_control.py
-REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest tests/test_notification.py
-pytest -vv -s --maxfail=1 tests/test_backend.py
-pytest -vv -s --maxfail=1 tests/test_rss.py
-pytest -vv -s --maxfail=1 tests/test_unique_lines.py
+# And again with brotli+screenshot attachment
+SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD=5 REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 --dist=load tests/test_backend.py tests/test_rss.py tests/test_unique_lines.py tests/test_notification.py  tests/test_access_control.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/flask-toast-bridge.js

@@ -0,0 +1,99 @@
+/**
+ * Flask Toast Bridge
+ * Automatically converts Flask flash messages to toast notifications
+ *
+ * Maps Flask message categories to toast types:
+ * - 'message' or 'info' -> info toast
+ * - 'success' -> success toast
+ * - 'error' or 'danger' -> error toast
+ * - 'warning' -> warning toast
+ */
+
+(function() {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', function() {
+    // Find the Flask messages container
+    const messagesContainer = document.querySelector('ul.messages');
+
+    if (!messagesContainer) {
+      return;
+    }
+
+    // Get all flash messages
+    const messages = messagesContainer.querySelectorAll('li');
+
+    if (messages.length === 0) {
+      return;
+    }
+
+    let toastIndex = 0;
+
+    // Convert each message to a toast (except errors)
+    messages.forEach(function(messageEl) {
+      const text = messageEl.textContent.trim();
+      const category = getMessageCategory(messageEl);
+
+      // Skip error messages - they should stay in the page
+      if (category === 'error') {
+        return;
+      }
+
+      const toastType = mapCategoryToToastType(category);
+
+      // Stagger toast appearance for multiple messages
+      setTimeout(function() {
+        Toast[toastType](text, {
+          duration: 6000  // 6 seconds for Flask messages
+        });
+      }, toastIndex * 200);  // 200ms delay between each toast
+
+      toastIndex++;
+
+      // Hide this specific message element (not errors)
+      messageEl.style.display = 'none';
+    });
+  });
+
+  /**
+   * Extract message category from class names
+   */
+  function getMessageCategory(messageEl) {
+    const classes = messageEl.className.split(' ');
+
+    // Common Flask flash message categories
+    const categoryMap = {
+      'success': 'success',
+      'error': 'error',
+      'danger': 'error',
+      'warning': 'warning',
+      'info': 'info',
+      'message': 'info',
+      'notice': 'info'
+    };
+
+    for (let className of classes) {
+      if (categoryMap[className]) {
+        return categoryMap[className];
+      }
+    }
+
+    // Default to info if no category found
+    return 'info';
+  }
+
+  /**
+   * Map Flask category to Toast type
+   */
+  function mapCategoryToToastType(category) {
+    const typeMap = {
+      'success': 'success',
+      'error': 'error',
+      'warning': 'warning',
+      'info': 'info'
+    };
+
+    return typeMap[category] || 'info';
+  }
+
+})();

changedetectionio/static/js/hamburger-menu.js

@@ -0,0 +1,69 @@
+// Hamburger menu toggle functionality
+(function() {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', function() {
+    const hamburgerToggle = document.getElementById('hamburger-toggle');
+    const mobileMenuDrawer = document.getElementById('mobile-menu-drawer');
+    const mobileMenuOverlay = document.getElementById('mobile-menu-overlay');
+
+    if (!hamburgerToggle || !mobileMenuDrawer || !mobileMenuOverlay) {
+      return;
+    }
+
+    function openMenu() {
+      hamburgerToggle.classList.add('active');
+      mobileMenuDrawer.classList.add('active');
+      mobileMenuOverlay.classList.add('active');
+      document.body.style.overflow = 'hidden';
+    }
+
+    function closeMenu() {
+      hamburgerToggle.classList.remove('active');
+      mobileMenuDrawer.classList.remove('active');
+      mobileMenuOverlay.classList.remove('active');
+      document.body.style.overflow = '';
+    }
+
+    function toggleMenu() {
+      if (mobileMenuDrawer.classList.contains('active')) {
+        closeMenu();
+      } else {
+        openMenu();
+      }
+    }
+
+    // Toggle menu on hamburger click
+    hamburgerToggle.addEventListener('click', function(e) {
+      e.stopPropagation();
+      toggleMenu();
+    });
+
+    // Close menu when clicking overlay
+    mobileMenuOverlay.addEventListener('click', closeMenu);
+
+    // Close menu when clicking a menu item
+    const menuItems = mobileMenuDrawer.querySelectorAll('.mobile-menu-items a');
+    menuItems.forEach(function(item) {
+      item.addEventListener('click', closeMenu);
+    });
+
+    // Close menu on escape key
+    document.addEventListener('keydown', function(e) {
+      if (e.key === 'Escape' && mobileMenuDrawer.classList.contains('active')) {
+        closeMenu();
+      }
+    });
+
+    // Close menu when window is resized above mobile breakpoint
+    let resizeTimer;
+    window.addEventListener('resize', function() {
+      clearTimeout(resizeTimer);
+      resizeTimer = setTimeout(function() {
+        if (window.innerWidth > 768 && mobileMenuDrawer.classList.contains('active')) {
+          closeMenu();
+        }
+      }, 250);
+    });
+  });
+})();

changedetectionio/static/js/language-selector.js

@@ -3,53 +3,71 @@
  * 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();
-    languageModal.showModal();
+
+    // Update all language links to include current hash in the redirect parameter
+    const currentPath = window.location.pathname;
+    const currentHash = window.location.hash;
+
+    if (currentHash) {
+      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.attr('href', url.pathname + url.search + url.hash);
+      });
+    }
+
+    $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

@@ -74,6 +74,9 @@ $(document).ready(function () {
     }
 
 
+    // Cache DOM elements for performance
+    const queueBubble = document.getElementById('queue-bubble');
+    const queueSizePagerInfoText = document.getElementById('queue-size-int');
     // Only try to connect if authentication isn't required or user is authenticated
     // The 'is_authenticated' variable will be set in the template
     if (typeof is_authenticated !== 'undefined' ? is_authenticated : true) {
@@ -115,7 +118,44 @@ $(document).ready(function () {
 
             socket.on('queue_size', function (data) {
                 console.log(`${data.event_timestamp} - Queue size update: ${data.q_length}`);
-                // Update queue size display if implemented in the UI
+                if(queueSizePagerInfoText) {
+                    queueSizePagerInfoText.textContent = parseInt(data.q_length).toLocaleString() || 'None';
+                }
+                document.body.classList.toggle('has-queue', parseInt(data.q_length) > 0);
+
+                // Update queue bubble in action sidebar
+                //if (queueBubble) {
+                if (0) {
+                    const count = parseInt(data.q_length) || 0;
+                    const oldCount = parseInt(queueBubble.getAttribute('data-count')) || 0;
+
+                    if (count > 0) {
+                        // Format number according to browser locale
+                        const formatter = new Intl.NumberFormat(navigator.language);
+                        queueBubble.textContent = formatter.format(count);
+                        queueBubble.setAttribute('data-count', count);
+                        queueBubble.classList.add('visible');
+
+                        // Add large-number class for numbers > 999
+                        if (count > 999) {
+                            queueBubble.classList.add('large-number');
+                        } else {
+                            queueBubble.classList.remove('large-number');
+                        }
+
+                        // Pulse animation if count changed
+                        if (count !== oldCount) {
+                            queueBubble.classList.remove('pulse');
+                            // Force reflow to restart animation
+                            void queueBubble.offsetWidth;
+                            queueBubble.classList.add('pulse');
+                        }
+                    } else {
+                        // Hide bubble when queue is empty
+                        queueBubble.classList.remove('visible', 'pulse', 'large-number');
+                        queueBubble.setAttribute('data-count', '0');
+                    }
+                }
             })
 
             // Listen for operation results

changedetectionio/static/js/search-modal.js

@@ -0,0 +1,96 @@
+// Search modal functionality
+(function() {
+  'use strict';
+
+  document.addEventListener('DOMContentLoaded', function() {
+    const searchModal = document.getElementById('search-modal');
+    const openSearchButton = document.getElementById('open-search-modal');
+    const closeSearchButton = document.getElementById('close-search-modal');
+    const searchForm = document.getElementById('search-form');
+    const searchInput = document.getElementById('search-modal-input');
+
+    if (!searchModal || !openSearchButton) {
+      return;
+    }
+
+    // Open modal
+    function openSearchModal() {
+      searchModal.showModal();
+      // Focus the input after a small delay to ensure modal is rendered
+      setTimeout(function() {
+        if (searchInput) {
+          searchInput.focus();
+        }
+      }, 100);
+    }
+
+    // Close modal
+    function closeSearchModal() {
+      searchModal.close();
+      if (searchInput) {
+        searchInput.value = '';
+      }
+    }
+
+    // Open search modal on button click
+    openSearchButton.addEventListener('click', openSearchModal);
+
+    // Close modal on cancel button
+    if (closeSearchButton) {
+      closeSearchButton.addEventListener('click', closeSearchModal);
+    }
+
+    // Close modal on escape key (native behavior for dialog)
+    searchModal.addEventListener('cancel', function(e) {
+      if (searchInput) {
+        searchInput.value = '';
+      }
+    });
+
+    // Close modal when clicking the backdrop
+    searchModal.addEventListener('click', function(e) {
+      const rect = searchModal.getBoundingClientRect();
+      const isInDialog = (
+        rect.top <= e.clientY &&
+        e.clientY <= rect.top + rect.height &&
+        rect.left <= e.clientX &&
+        e.clientX <= rect.left + rect.width
+      );
+      if (!isInDialog) {
+        closeSearchModal();
+      }
+    });
+
+    // Handle Alt+S keyboard shortcut
+    document.addEventListener('keydown', function(e) {
+      if (e.altKey && e.key.toLowerCase() === 's') {
+        e.preventDefault();
+        openSearchModal();
+      }
+    });
+
+    // Handle form submission
+    if (searchForm) {
+      searchForm.addEventListener('submit', function(e) {
+        e.preventDefault();
+
+        // Get form data
+        const formData = new FormData(searchForm);
+        const searchQuery = formData.get('q');
+        const tags = formData.get('tags');
+
+        // Build URL
+        const params = new URLSearchParams();
+        if (searchQuery) {
+          params.append('q', searchQuery);
+        }
+        if (tags) {
+          params.append('tags', tags);
+        }
+
+        // Navigate to search results
+        window.location.href = '?' + params.toString();
+      });
+    }
+  });
+})();

changedetectionio/static/js/tabs.js

@@ -1,11 +1,12 @@
 // Rewrite this is a plugin.. is all this JS really 'worth it?'
 
 window.addEventListener('hashchange', function () {
-    var tabs = document.getElementsByClassName('active');
-    while (tabs[0]) {
-        tabs[0].classList.remove('active');
-        document.body.classList.remove('full-width');
-    }
+    // Only remove active from tab elements, not menu items
+    var tabs = document.querySelectorAll('.tabs li.active');
+    tabs.forEach(function(tab) {
+        tab.classList.remove('active');
+    });
+    document.body.classList.remove('full-width');
     set_active_tab();
 }, false);
 
@@ -22,9 +23,9 @@ if (!has_errors.length) {
 
 function set_active_tab() {
     document.body.classList.remove('full-width');
-    var tab = document.querySelectorAll("a[href='" + location.hash + "']");
+    var tab = document.querySelectorAll(".tabs a[href='" + location.hash + "']");
     if (tab.length) {
-        tab[0].parentElement.className = "active";
+        tab[0].parentElement.classList.add("active");
     }
 }
 

changedetectionio/static/js/toast.js

@@ -0,0 +1,275 @@
+/**
+ * Toast - Modern toast notification system
+ * Inspired by Toastify, Notyf, and React Hot Toast
+ *
+ * Usage:
+ *   Toast.success('Operation completed!');
+ *   Toast.error('Something went wrong');
+ *   Toast.info('Here is some information');
+ *   Toast.warning('Warning message');
+ *   Toast.show('Custom message', { type: 'success', duration: 3000 });
+ *
+ * License: MIT
+ */
+
+(function(window) {
+  'use strict';
+
+  // Toast configuration
+  const defaultConfig = {
+    duration: 5000,        // Auto-dismiss after 5 seconds (0 = no auto-dismiss)
+    position: 'top-center', // top-right, top-center, top-left, bottom-right, bottom-center, bottom-left
+    closeButton: true,     // Show close button
+    progressBar: true,     // Show progress bar
+    pauseOnHover: true,    // Pause auto-dismiss on hover
+    maxToasts: 5,          // Maximum toasts to show at once
+    offset: '20px',        // Offset from edge
+    zIndex: 10000,         // Z-index for toast container
+  };
+
+  let config = { ...defaultConfig };
+  let toastCount = 0;
+  let container = null;
+
+  /**
+   * Initialize toast system with custom config
+   */
+  function init(userConfig = {}) {
+    config = { ...defaultConfig, ...userConfig };
+    createContainer();
+  }
+
+  /**
+   * Create toast container if it doesn't exist
+   */
+  function createContainer() {
+    if (container) return;
+
+    container = document.createElement('div');
+    container.className = `toast-container toast-${config.position}`;
+    container.style.zIndex = config.zIndex;
+    document.body.appendChild(container);
+  }
+
+  /**
+   * Show a toast notification
+   */
+  function show(message, options = {}) {
+    createContainer();
+
+    const toast = createToastElement(message, options);
+
+    // Limit number of toasts
+    const existingToasts = container.querySelectorAll('.toast');
+    if (existingToasts.length >= config.maxToasts) {
+      removeToast(existingToasts[0]);
+    }
+
+    // Add to container
+    container.appendChild(toast);
+
+    // Trigger animation
+    requestAnimationFrame(() => {
+      toast.classList.add('toast-show');
+    });
+
+    // Auto-dismiss
+    if (options.duration !== 0 && (options.duration || config.duration) > 0) {
+      setupAutoDismiss(toast, options.duration || config.duration);
+    }
+
+    return {
+      dismiss: () => removeToast(toast)
+    };
+  }
+
+  /**
+   * Create toast DOM element
+   */
+  function createToastElement(message, options) {
+    const toast = document.createElement('div');
+    toast.className = `toast toast-${options.type || 'default'}`;
+    toast.setAttribute('role', 'alert');
+    toast.setAttribute('aria-live', 'polite');
+
+    // Icon
+    const icon = createIcon(options.type || 'default');
+    if (icon) {
+      toast.appendChild(icon);
+    }
+
+    // Message
+    const messageEl = document.createElement('div');
+    messageEl.className = 'toast-message';
+    messageEl.textContent = message;
+    toast.appendChild(messageEl);
+
+    // Close button
+    if (options.closeButton !== false && config.closeButton) {
+      const closeBtn = document.createElement('button');
+      closeBtn.className = 'toast-close';
+      closeBtn.innerHTML = '×';
+      closeBtn.setAttribute('aria-label', 'Close');
+      closeBtn.onclick = () => removeToast(toast);
+      toast.appendChild(closeBtn);
+    }
+
+    // Progress bar
+    if (options.progressBar !== false && config.progressBar && (options.duration || config.duration) > 0) {
+      const progressBar = document.createElement('div');
+      progressBar.className = 'toast-progress';
+      toast.appendChild(progressBar);
+      toast._progressBar = progressBar;
+    }
+
+    return toast;
+  }
+
+  /**
+   * Create icon based on toast type
+   */
+  function createIcon(type) {
+    const iconEl = document.createElement('div');
+    iconEl.className = 'toast-icon';
+
+    const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+    svg.setAttribute('viewBox', '0 0 24 24');
+    svg.setAttribute('fill', 'none');
+    svg.setAttribute('stroke', 'currentColor');
+    svg.setAttribute('stroke-width', '2');
+
+    let path = '';
+    switch (type) {
+      case 'success':
+        path = 'M20 6L9 17l-5-5';
+        break;
+      case 'error':
+        path = 'M18 6L6 18M6 6l12 12';
+        break;
+      case 'warning':
+        path = 'M12 9v4m0 4h.01M12 2a10 10 0 100 20 10 10 0 000-20z';
+        svg.setAttribute('stroke-width', '1.5');
+        break;
+      case 'info':
+        path = 'M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z';
+        svg.setAttribute('stroke-width', '1.5');
+        break;
+      default:
+        return null;
+    }
+
+    const pathEl = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+    pathEl.setAttribute('d', path);
+    pathEl.setAttribute('stroke-linecap', 'round');
+    pathEl.setAttribute('stroke-linejoin', 'round');
+    svg.appendChild(pathEl);
+    iconEl.appendChild(svg);
+
+    return iconEl;
+  }
+
+  /**
+   * Setup auto-dismiss with progress bar
+   */
+  function setupAutoDismiss(toast, duration) {
+    let startTime = Date.now();
+    let remainingTime = duration;
+    let isPaused = false;
+    let animationFrame;
+
+    function updateProgress() {
+      if (isPaused) return;
+
+      const elapsed = Date.now() - startTime;
+      const progress = Math.min(elapsed / duration, 1);
+
+      if (toast._progressBar) {
+        toast._progressBar.style.transform = `scaleX(${1 - progress})`;
+      }
+
+      if (progress >= 1) {
+        removeToast(toast);
+      } else {
+        animationFrame = requestAnimationFrame(updateProgress);
+      }
+    }
+
+    // Pause on hover
+    if (config.pauseOnHover) {
+      toast.addEventListener('mouseenter', () => {
+        isPaused = true;
+        remainingTime = duration - (Date.now() - startTime);
+        cancelAnimationFrame(animationFrame);
+      });
+
+      toast.addEventListener('mouseleave', () => {
+        isPaused = false;
+        startTime = Date.now();
+        duration = remainingTime;
+        animationFrame = requestAnimationFrame(updateProgress);
+      });
+    }
+
+    animationFrame = requestAnimationFrame(updateProgress);
+  }
+
+  /**
+   * Remove toast with animation
+   */
+  function removeToast(toast) {
+    if (!toast || !toast.parentElement) return;
+
+    toast.classList.add('toast-hide');
+
+    // Remove after animation
+    setTimeout(() => {
+      if (toast.parentElement) {
+        toast.parentElement.removeChild(toast);
+      }
+    }, 300);
+  }
+
+  // Convenience methods
+  function success(message, options = {}) {
+    return show(message, { ...options, type: 'success' });
+  }
+
+  function error(message, options = {}) {
+    return show(message, { ...options, type: 'error' });
+  }
+
+  function warning(message, options = {}) {
+    return show(message, { ...options, type: 'warning' });
+  }
+
+  function info(message, options = {}) {
+    return show(message, { ...options, type: 'info' });
+  }
+
+  /**
+   * Clear all toasts
+   */
+  function clear() {
+    if (!container) return;
+    const toasts = container.querySelectorAll('.toast');
+    toasts.forEach(removeToast);
+  }
+
+  // Public API
+  window.Toast = {
+    init,
+    show,
+    success,
+    error,
+    warning,
+    info,
+    clear,
+    version: '1.0.0'
+  };
+
+  // Auto-initialize
+  document.addEventListener('DOMContentLoaded', () => {
+    init();
+  });
+
+})(window);

changedetectionio/static/js/toastify.min.css

@@ -0,0 +1,15 @@
+/**
+ * Minified by jsDelivr using clean-css v5.3.3.
+ * Original file: /npm/toastify-js@1.12.0/src/toastify.css
+ *
+ * Do NOT use SRI with dynamically generated files! More information: https://www.jsdelivr.com/using-sri-with-dynamic-files
+ */
+/*!
+ * Toastify js 1.12.0
+ * https://github.com/apvarun/toastify-js
+ * @license MIT licensed
+ *
+ * Copyright (C) 2018 Varun A P
+ */
+.toastify{padding:12px 20px;color:#fff;display:inline-block;box-shadow:0 3px 6px -1px rgba(0,0,0,.12),0 10px 36px -4px rgba(77,96,232,.3);background:-webkit-linear-gradient(315deg,#73a5ff,#5477f5);background:linear-gradient(135deg,#73a5ff,#5477f5);position:fixed;opacity:0;transition:all .4s cubic-bezier(.215, .61, .355, 1);border-radius:2px;cursor:pointer;text-decoration:none;max-width:calc(50% - 20px);z-index:2147483647}.toastify.on{opacity:1}.toast-close{background:0 0;border:0;color:#fff;cursor:pointer;font-family:inherit;font-size:1em;opacity:.4;padding:0 5px}.toastify-right{right:15px}.toastify-left{left:15px}.toastify-top{top:-150px}.toastify-bottom{bottom:-150px}.toastify-rounded{border-radius:25px}.toastify-avatar{width:1.5em;height:1.5em;margin:-7px 5px;border-radius:2px}.toastify-center{margin-left:auto;margin-right:auto;left:0;right:0;max-width:fit-content;max-width:-moz-fit-content}@media only screen and (max-width:360px){.toastify-left,.toastify-right{margin-left:auto;margin-right:auto;left:0;right:0;max-width:fit-content}}
+/*# sourceMappingURL=/sm/cb4335d1b03e933ed85cb59fffa60cf51f07567ed09831438c60f59afd166464.map */

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

@@ -0,0 +1,115 @@
+// Action Sidebar - Minimal navigation icons with light grey aesthetic
+
+.content-wrapper {
+  display: flex;
+  gap: 0;
+  width: 100%;
+  max-width: 100%;
+  position: relative;
+
+  @media only screen and (max-width: 900px) {
+    flex-direction: column;
+  }
+}
+
+.action-sidebar {
+  position: sticky;
+  top: 100px;
+  flex-shrink: 0;
+  width: 80px;
+  height: fit-content;
+  background: transparent;
+  padding: 1.5rem 0;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  align-items: center;
+  z-index: 0;
+
+  @media only screen and (max-width: 900px) {
+    position: relative;
+    top: 0;
+    width: 100%;
+    flex-direction: row;
+    justify-content: space-around;
+    padding: 0;
+    overflow-x: auto;
+  }
+}
+
+.action-sidebar-item {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 0.35rem;
+  padding: 0.75rem 0.5rem;
+  min-width: 64px;
+  text-decoration: none;
+  opacity: 0.8;
+  transition: opacity 0.2s ease;
+
+  &:hover {
+    opacity: 1;
+  }
+
+  &.active {
+    opacity: 1;
+
+    .action-icon {
+      stroke: #fff;
+      stroke-width: 2.5;
+    }
+
+    .action-label {
+      color: #fff;
+      font-weight: 700;
+    }
+  }
+}
+
+.action-icon {
+  width: 28px;
+  height: 28px;
+  stroke: #fff;
+  stroke-width: 2;
+  fill: none;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  transition: stroke 0.2s ease;
+}
+
+.action-label {
+  font-size: 0.65rem;
+  font-weight: 500;
+  text-align: center;
+  line-height: 1.1;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+  color: #fff;
+  transition: color 0.2s ease;
+  max-width: 60px;
+  word-wrap: break-word;
+}
+
+.content-main {
+  flex: 0 1 auto;
+  width: 100%;
+  min-width: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+// Dark mode adjustments
+html[data-darkmode=true] {
+  .action-icon {
+/*    stroke: #666;*/
+  }
+
+  .action-label {
+/*    color: #666;*/
+  }
+}

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

@@ -0,0 +1,170 @@
+// Hamburger Menu for Mobile Navigation
+@use "../settings" as *;
+
+.hamburger-menu {
+  display: none;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  padding: 0.5rem;
+  z-index: 10001;
+  position: relative;
+
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
+.hamburger-icon {
+  width: 24px;
+  height: 20px;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  span {
+    display: block;
+    height: 3px;
+    width: 100%;
+    background: var(--color-text);
+    border-radius: 2px;
+    transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+    transform-origin: center;
+  }
+}
+
+.hamburger-menu.active {
+  .hamburger-icon span:nth-child(1) {
+    transform: translateY(8.5px) rotate(45deg);
+  }
+
+  .hamburger-icon span:nth-child(2) {
+    opacity: 0;
+    transform: translateX(-10px);
+  }
+
+  .hamburger-icon span:nth-child(3) {
+    transform: translateY(-8.5px) rotate(-45deg);
+  }
+}
+
+// Mobile menu overlay
+.mobile-menu-overlay {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+
+  &.active {
+    display: block;
+    opacity: 1;
+  }
+}
+
+// Mobile menu drawer
+.mobile-menu-drawer {
+  position: fixed;
+  top: 0;
+  right: -280px;
+  width: 280px;
+  height: 100%;
+  background: var(--color-background);
+  opacity: 1;
+  box-shadow: -2px 0 8px rgba(0, 0, 0, 0.15);
+  z-index: 10000;
+  transition: right 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+  overflow-y: auto;
+  padding-top: 60px;
+
+  &.active {
+    right: 0;
+  }
+
+  .mobile-menu-items {
+    list-style: none;
+    padding: 1rem 0;
+    margin: 0;
+
+    li {
+      border-bottom: 1px solid var(--color-border-table-cell);
+
+      >* {
+        display: block;
+        padding: 1rem 1.5rem;
+        color: var(--color-text);
+        text-decoration: none;
+        font-weight: 500;
+        transition: background 0.2s ease;
+
+        &:hover {
+          background: var(--color-background-menu-link-hover);
+        }
+      }
+      &#menu-pause, &#menu-mute {
+        display: none;
+      }
+    }
+  }
+}
+
+// Logo styling
+.logo-cdio {
+  font-weight: bold;
+  font-size: 1.1rem;
+
+  .logo-cd {
+    color: var(--color-grey-500);
+  }
+
+  .logo-io {
+    color: var(--color-text);
+  }
+}
+
+// Always visible items container
+.menu-always-visible {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-left: auto;
+}
+
+// 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;
+  }
+
+  .pure-menu-horizontal {
+    overflow-x: visible !important;
+  }
+
+  #nav-menu {
+    overflow-x: visible !important;
+  }
+}
+
+// Desktop - hide mobile menu elements
+@media only screen and (min-width: 1025px) {
+  .hamburger-menu,
+  .mobile-menu-drawer,
+  .mobile-menu-overlay {
+    display: none !important;
+  }
+}
+
+html[data-darkmode=true] {
+  .mobile-menu-drawer {
+    box-shadow: -2px 0 8px rgba(0, 0, 0, 0.4);
+  }
+}

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

@@ -0,0 +1,233 @@
+// Modern Login Form - Friendly and Welcoming Design
+
+.login-form {
+  min-height: 52vh;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2rem 1rem;
+
+  .inner {
+    background: var(--color-background);
+    border-radius: 16px;
+    box-shadow:
+      0 10px 40px rgba(0, 0, 0, 0.08),
+      0 2px 8px rgba(0, 0, 0, 0.04);
+    padding: 3rem 2.5rem;
+    width: 100%;
+    max-width: 420px;
+    position: relative;
+    overflow: hidden;
+    transition: transform 0.3s ease, box-shadow 0.3s ease;
+
+    &:hover {
+
+      box-shadow:
+        0 15px 50px rgba(0, 0, 0, 0.12),
+        0 5px 15px rgba(0, 0, 0, 0.06);
+    }
+  }
+
+  form {
+    margin: 0;
+  }
+
+  fieldset {
+    border: none;
+    padding: 0;
+    margin: 0;
+  }
+
+  .pure-control-group {
+    margin-bottom: 1.75rem;
+
+    &:last-of-type {
+      margin-bottom: 0;
+      margin-top: 2rem;
+    }
+  }
+
+  label {
+    display: block;
+    margin-bottom: 0.5rem;
+    font-weight: 600;
+    font-size: 0.9rem;
+    color: var(--color-text);
+    letter-spacing: 0.01em;
+  }
+
+  input[type="password"] {
+    width: 100%;
+    padding: 0.875rem 1rem;
+    border: 2px solid var(--color-grey-800);
+    border-radius: 8px;
+    font-size: 1rem;
+    background: var(--color-background-input);
+    color: var(--color-text-input);
+    transition: all 0.2s ease;
+    box-sizing: border-box;
+
+    &:focus {
+      outline: none;
+      border-color: var(--color-link);
+      box-shadow: 0 0 0 3px rgba(27, 152, 248, 0.1);
+      transform: translateY(-1px);
+    }
+
+    &::placeholder {
+      color: var(--color-text-input-placeholder);
+    }
+  }
+
+  button[type="submit"] {
+    width: 100%;
+    padding: 0.875rem 1.5rem;
+    font-size: 1rem;
+    font-weight: 600;
+    border-radius: 8px;
+    border: none;
+    background: var(--color-background-button-primary);
+    color: var(--color-text-button);
+    cursor: pointer;
+    transition: all 0.2s ease;
+    box-shadow: 0 2px 8px rgba(27, 152, 248, 0.2);
+
+    &:hover {
+      box-shadow: 0 4px 12px rgba(27, 152, 248, 0.3);
+      background: #0066cc;
+    }
+
+    &:active {
+      transform: translateY(0);
+      box-shadow: 0 2px 4px rgba(27, 152, 248, 0.2);
+    }
+  }
+}
+
+// Messages styling for login page
+.content-main > ul.messages {
+  position: fixed;
+  top: 120px;
+  left: 50%;
+  transform: translateX(-50%);
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  z-index: 1000;
+  min-width: 300px;
+  max-width: 500px;
+
+  li {
+    padding: 1rem 1.25rem;
+    border-radius: 8px;
+    font-size: 0.95rem;
+    line-height: 1.5;
+    font-weight: 500;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+    animation: slideDown 0.3s ease-out;
+    border: 2px solid transparent;
+
+    &.error {
+      background: #fee;
+      border: 2px solid #ef4444;
+      color: #991b1b;
+      font-weight: 600;
+    }
+
+    &.success {
+      background: #f0fdf4;
+      border: 2px solid #10b981;
+      color: #166534;
+    }
+
+    &.info,
+    &.message {
+      background: #eff6ff;
+      border: 2px solid #3b82f6;
+      color: #1e40af;
+    }
+  }
+}
+
+@keyframes slideDown {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+// Dark mode adjustments
+html[data-darkmode="true"] {
+  .login-form {
+    .inner {
+      box-shadow:
+        0 10px 40px rgba(0, 0, 0, 0.4),
+        0 2px 8px rgba(0, 0, 0, 0.2);
+
+      &:hover {
+        box-shadow:
+          0 15px 50px rgba(0, 0, 0, 0.5),
+          0 5px 15px rgba(0, 0, 0, 0.3);
+      }
+    }
+
+    input[type="password"] {
+      border-color: var(--color-grey-400);
+
+      &:focus {
+        border-color: var(--color-link);
+      }
+    }
+  }
+
+  .content-main > ul.messages {
+    li {
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4);
+
+      &.error {
+        background: #4a1d1d;
+        border-color: #ef4444;
+        color: #fca5a5;
+      }
+
+      &.success {
+        background: #1a3a2a;
+        border-color: #10b981;
+        color: #86efac;
+      }
+
+      &.info,
+      &.message {
+        background: #1e3a5f;
+        border-color: #3b82f6;
+        color: #93c5fd;
+      }
+    }
+  }
+}
+
+// Mobile adjustments
+@media only screen and (max-width: 768px) {
+  .login-form {
+    min-height: auto;
+    padding: 1rem 0.5rem;
+    padding-top: 5rem; // Space for error message
+
+    .inner {
+      padding: 2rem 1.5rem;
+      border-radius: 12px;
+    }
+  }
+
+  .content-main > ul.messages {
+    top: 70px; // Higher up on mobile to avoid overlap
+    left: 10px;
+    right: 10px;
+    transform: none;
+    min-width: auto;
+  }
+}

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

@@ -2,6 +2,13 @@
   padding: 0.5rem 1em;
   line-height: 1.2rem;
 }
+#menu-mute, #menu-pause {
+  padding-left: 0.3rem;
+  padding-right: 0.3rem;
+  img {
+    height: 1.2rem;
+  }
+}
 
 .pure-menu-item {
   svg {
@@ -22,4 +29,22 @@
       cursor: pointer;
     }
   }
+
+  // Active menu item styling
+  &.active {
+    .pure-menu-link {
+      background-color: var(--color-background-menu-link-hover);
+      color: var(--color-text-menu-link-hover);
+    }
+  }
 }
+
+#cdio-logo {
+  padding-left: 0.5em;
+}
+
+#inline-menu-extras-group {
+  >* {
+    display: inline-block;
+  }
+}

changedetectionio/static/styles/scss/parts/_notification_bubble.scss

@@ -0,0 +1,73 @@
+// Reusable notification bubble for action sidebar icons
+
+.action-sidebar-item {
+  position: relative;
+
+  .notification-bubble {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    min-width: 18px;
+    height: 18px;
+    background: #ff4444;
+    color: #fff;
+    font-size: 10px;
+    font-weight: 700;
+    line-height: 18px;
+    text-align: center;
+    border-radius: 9px;
+    padding: 0 2px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+    pointer-events: none;
+    transition: all 0.2s ease;
+    display: none;
+
+    // Red bubble for errors/urgent
+    &.red-bubble {
+      background: #ff4444;
+    }
+
+    // Blue bubble for informational
+    &.blue-bubble {
+      background: #4a9eff;
+      color: #fff;
+    }
+
+    &.visible {
+      display: block;
+    }
+
+    // Pulse animation when value changes
+    &.pulse {
+      animation: bubblePulse 0.4s ease-out;
+    }
+
+    // Large numbers get smaller font
+    &.large-number {
+      font-size: 8px;
+      min-width: 20px;
+      height: 20px;
+      line-height: 20px;
+      border-radius: 10px;
+    }
+  }
+}
+
+@keyframes bubblePulse {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(1.3);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+// Dark mode adjustments
+html[data-darkmode=true] {
+  .notification-bubble {
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.6);
+  }
+}

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

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

changedetectionio/static/styles/scss/parts/_search_modal.scss

@@ -0,0 +1,55 @@
+// Search Modal Styles
+
+#search-modal {
+  .modal-body {
+    padding: 2rem 1.5rem;
+
+    .pure-control-group {
+      padding-bottom: 0;
+
+      label {
+        display: block;
+        margin-bottom: 0.5rem;
+        font-size: 0.9rem;
+        font-weight: 600;
+        color: var(--color-text);
+      }
+
+      #search-modal-input {
+        width: 100%;
+        max-width: 100%;
+        box-sizing: border-box;
+        padding: 0.6rem 0.8rem;
+        font-size: 1rem;
+        border: 1px solid var(--color-border-input);
+        border-radius: 4px;
+        background-color: var(--color-background-input);
+        color: var(--color-text-input);
+        box-shadow: inset 0 1px 3px var(--color-shadow-input);
+        transition: border-color 0.2s ease, box-shadow 0.2s ease;
+
+        &:focus {
+          outline: none;
+          border-color: var(--color-link);
+          box-shadow: 0 0 0 3px rgba(27, 152, 248, 0.1);
+        }
+
+        &::placeholder {
+          color: var(--color-text-input-placeholder);
+          opacity: 0.7;
+        }
+      }
+    }
+  }
+}
+
+// Dark mode adjustments
+html[data-darkmode=true] {
+  #search-modal {
+    #search-modal-input {
+      &:focus {
+        box-shadow: 0 0 0 3px rgba(89, 189, 251, 0.15);
+      }
+    }
+  }
+}

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/parts/_toast.scss

@@ -0,0 +1,231 @@
+// Toast Notification System
+// Modern, animated toast notifications
+
+.toast-container {
+  position: fixed;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+  pointer-events: none;
+  z-index: 10000;
+
+  // Positioning
+  &.toast-top-right {
+    top: 20px;
+    right: 20px;
+  }
+
+  &.toast-top-center {
+    top: 100px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &.toast-top-left {
+    top: 20px;
+    left: 20px;
+  }
+
+  &.toast-bottom-right {
+    bottom: 20px;
+    right: 20px;
+  }
+
+  &.toast-bottom-center {
+    bottom: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+
+  &.toast-bottom-left {
+    bottom: 20px;
+    left: 20px;
+  }
+}
+
+.toast {
+  position: relative;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  min-width: 300px;
+  max-width: 500px;
+  padding: 1rem 1.25rem;
+  background: var(--color-background);
+  border-radius: 8px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15), 0 0 0 1px rgba(0, 0, 0, 0.05);
+  pointer-events: auto;
+  overflow: hidden;
+  opacity: 0;
+  transform: translateY(-50px);
+  transition: all 0.3s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+  font-family: inherit;
+
+  &.toast-show {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  &.toast-hide {
+    opacity: 0;
+    transform: translateY(-50px) scale(0.95);
+  }
+
+  // Toast types
+  &.toast-success {
+    border-left: 4px solid #10b981;
+
+    .toast-icon {
+      color: #10b981;
+    }
+  }
+
+  &.toast-error {
+    border-left: 4px solid #ef4444;
+
+    .toast-icon {
+      color: #ef4444;
+    }
+  }
+
+  &.toast-warning {
+    border-left: 4px solid #f59e0b;
+
+    .toast-icon {
+      color: #f59e0b;
+    }
+  }
+
+  &.toast-info {
+    border-left: 4px solid #3b82f6;
+
+    .toast-icon {
+      color: #3b82f6;
+    }
+  }
+
+  &.toast-default {
+    border-left: 4px solid var(--color-grey-500);
+  }
+}
+
+.toast-icon {
+  flex-shrink: 0;
+  width: 24px;
+  height: 24px;
+
+  svg {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+.toast-message {
+  flex: 1;
+  font-size: 0.875rem;
+  line-height: 1.5;
+  color: var(--color-text);
+  word-break: break-word;
+  font-family: inherit;
+}
+
+.toast-close {
+  flex-shrink: 0;
+  width: 24px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: transparent;
+  border: none;
+  border-radius: 4px;
+  color: var(--color-grey-500);
+  font-size: 1.5rem;
+  line-height: 1;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  padding: 0;
+  margin-left: 0.25rem;
+
+  &:hover {
+    background: var(--color-grey-800);
+    color: var(--color-text);
+  }
+
+  &:active {
+    transform: scale(0.95);
+  }
+}
+
+.toast-progress {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 3px;
+  background: currentColor;
+  opacity: 0.3;
+  transform-origin: left;
+  transition: transform linear;
+}
+
+// Dark mode adjustments
+html[data-darkmode=true] {
+  .toast {
+    background: var(--color-grey-300);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4), 0 0 0 1px rgba(255, 255, 255, 0.05);
+  }
+
+  .toast-close:hover {
+    background: var(--color-grey-400);
+  }
+}
+
+// Mobile adjustments
+@media only screen and (max-width: 768px) {
+  .toast-container {
+    left: 50% !important;
+    right: auto !important;
+    top: 80px !important;
+    transform: translateX(-50%) !important;
+    align-items: center;
+
+    &.toast-bottom-right,
+    &.toast-bottom-center,
+    &.toast-bottom-left {
+      top: auto !important;
+      bottom: 80px !important;
+    }
+  }
+
+  .toast {
+    min-width: auto;
+    max-width: none;
+    width: 80vw;
+    transform: translateY(-100px);
+
+    &.toast-show {
+      transform: translateY(0);
+    }
+
+    &.toast-hide {
+      transform: translateY(-100px) scale(0.95);
+    }
+  }
+}
+
+// Accessibility
+@media (prefers-reduced-motion: reduce) {
+  .toast {
+    transition: opacity 0.2s ease;
+    transform: none !important;
+
+    &.toast-show {
+      opacity: 1;
+    }
+
+    &.toast-hide {
+      opacity: 0;
+    }
+  }
+}

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

@@ -125,6 +125,11 @@ $grid-gap: 0.5rem;
           border-bottom: none;
         }
 
+        // Empty state message - span full width on mobile
+        > td[colspan] {
+          grid-column: 1 / -1;
+        }
+
         > td.title-col {
           grid-column: 1 / -1;
           grid-row: 1;

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

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

changedetectionio/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,7 +24,40 @@
 @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";
 
+// Smooth transitions for theme switching
+body,
+.pure-table,
+.pure-table thead,
+.pure-table td,
+.pure-table th,
+.pure-form input,
+.pure-form textarea,
+.pure-form select,
+.edit-form .inner,
+.pure-menu-horizontal,
+footer,
+.sticky-tab,
+#diff-jump,
+.button-tag,
+#new-watch-form,
+#new-watch-form input:not(.pure-button),
+code,
+.messages li,
+#checkbox-operations,
+.inline-warning,
+a,
+.watch-controls img {
+  transition: color 0.4s ease, background-color 0.4s ease, background 0.4s ease, border-color 0.4s ease, box-shadow 0.4s ease;
+}
 
 body {
   color: var(--color-text);
@@ -71,20 +105,6 @@ a.github-link {
   }
 }
 
-#search-q {
-  opacity: 0;
-  -webkit-transition: all .9s ease;
-  -moz-transition: all .9s ease;
-  transition: all .9s ease;
-  width: 0;
-  display: none;
-  &.expanded {
-    width: auto;
-    display: inline-block;
-
-    opacity: 1;
-  }
-}
 #search-result-info {
   color: #fff;
 }
@@ -165,7 +185,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;
@@ -183,13 +209,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 {
@@ -522,6 +548,9 @@ footer {
 }
 
 .sticky-tab {
+  @media only screen and (max-width: $desktop-wide-breakpoint) {
+    display: none;
+  }
   position: absolute;
   top: 60px;
   font-size: 65%;
@@ -666,7 +695,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;
@@ -678,30 +707,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 {
@@ -777,45 +786,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 {
@@ -824,14 +794,7 @@ $form-edge-padding: 20px;
   }
 }
 
-.login-form {
-  .inner {
-    background: var(--color-background);
-    ;
-    padding: $form-edge-padding;
-    border-radius: 5px;
-  }
-}
+// Login form styles moved to parts/_login_form.scss
 
 .tab-pane-inner {
 
@@ -1159,44 +1122,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

@@ -6,94 +6,93 @@
 
     <div class="pure-controls">
             <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.
+        {{ _('Body for all notifications — 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 data-target="#notification-tokens-info{{ suffix }}" class="toggle-show pure-button button-tag button-xsmall">{{ _('Show token/placeholders') }}
         </div>
     </div>
     <div class="pure-controls" style="display: none;" id="notification-tokens-info{{ suffix }}">
         <table class="pure-table" id="token-table">
             <thead>
             <tr>
-                <th>Token</th>
-                <th>Description</th>
+                <th>{{ _('Token') }}</th>
+                <th>{{ _('Description') }}</th>
             </tr>
             </thead>
             <tbody>
             <tr>
                 <td><code>{{ '{{base_url}}' }}</code></td>
-                <td>The URL of the changedetection.io instance you are running.</td>
+                <td>{{ _('The URL of the changedetection.io instance you are running.') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{watch_url}}' }}</code></td>
-                <td>The URL being watched.</td>
+                <td>{{ _('The URL being watched.') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{watch_uuid}}' }}</code></td>
-                <td>The UUID of the watch.</td>
+                <td>{{ _('The UUID of the watch.') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{watch_title}}' }}</code></td>
-                <td>The page title of the watch, uses &lt;title&gt; if not set, falls back to URL</td>
+                <td>{{ _('The page title of the watch, uses <title> if not set, falls back to URL') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{watch_tag}}' }}</code></td>
-                <td>The watch group / tag</td>
+                <td>{{ _('The watch group / tag') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{preview_url}}' }}</code></td>
-                <td>The URL of the preview page generated by changedetection.io.</td>
+                <td>{{ _('The URL of the preview page generated by changedetection.io.') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_url}}' }}</code></td>
-                <td>The URL of the diff output for the watch.</td>
+                <td>{{ _('The URL of the diff output for the watch.') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff}}' }}</code></td>
-                <td>The diff output - only changes, additions, and removals</td>
+                <td>{{ _('The diff output - only changes, additions, and removals') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_clean}}' }}</code></td>
-                <td>The diff output - only changes, additions, and removals &dash; <i>Without (added) prefix or colors</i>
+                <td>{{ _('The diff output - only changes, additions, and removals —') }} <i>{{ _('Without (added) prefix or colors') }}</i>
                 </td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_added}}' }}</code></td>
-                <td>The diff output - only changes and additions</td>
+                <td>{{ _('The diff output - only changes and additions') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_added_clean}}' }}</code></td>
-                <td>The diff output - only changes and additions &dash; <i>Without (added) prefix or colors</i></td>
+                <td>{{ _('The diff output - only changes and additions —') }} <i>{{ _('Without (added) prefix or colors') }}</i></td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_removed}}' }}</code></td>
-                <td>The diff output - only changes and removals</td>
+                <td>{{ _('The diff output - only changes and removals') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_removed_clean}}' }}</code></td>
-                <td>The diff output - only changes and removals &dash; <i>Without (added) prefix or colors</i></td>
+                <td>{{ _('The diff output - only changes and removals —') }} <i>{{ _('Without (added) prefix or colors') }}</i></td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_full}}' }}</code></td>
-                <td>The diff output - full difference output</td>
+                <td>{{ _('The diff output - full difference output') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_full_clean}}' }}</code></td>
-                <td>The diff output - full difference output &dash; <i>Without (added) prefix or colors</i></td>
+                <td>{{ _('The diff output - full difference output —') }} <i>{{ _('Without (added) prefix or colors') }}</i></td>
             </tr>
             <tr>
                 <td><code>{{ '{{diff_patch}}' }}</code></td>
-                <td>The diff output - patch in unified format</td>
+                <td>{{ _('The diff output - patch in unified format') }}</td>
             </tr>
             <tr>
                 <td><code>{{ '{{current_snapshot}}' }}</code></td>
-                <td>The current snapshot text contents value, useful when combined with JSON or CSS filters
+                <td>{{ _('The current snapshot text contents value, useful when combined with JSON or CSS filters') }}
                 </td>
             </tr>
             <tr>
                 <td><code>{{ '{{triggered_text}}' }}</code></td>
-                <td>Text that tripped the trigger from filters</td>
+                <td>{{ _('Text that tripped the trigger from filters') }}</td>
 
                 {% if extra_notification_token_placeholder_info %}
                     {% for token in extra_notification_token_placeholder_info %}
@@ -107,8 +106,8 @@
         </table>
 
         <span 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>
+        {{ _('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>
     </div>
 {%  endmacro %}
@@ -124,31 +123,32 @@
                             }}
                             <div class="pure-form-message-inline">
                                 <p>
-                                <strong>Tip:</strong> Use <a target="newwindow" href="https://github.com/caronc/apprise">AppRise Notification URLs</a> for notification to just about any service! <i><a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes">Please read the notification services wiki here for important configuration notes</a></i>.<br>
+                                <strong>{{ _('Tip:') }}</strong> {{ _('Use') }} <a target="newwindow" href="https://github.com/caronc/apprise">{{ _('AppRise Notification URLs') }}</a> {{ _('for notification to just about any service!') }} <i><a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes">{{ _('Please read the notification services wiki here for important configuration notes') }}</a></i>.<br>
 </p>
-                                <div data-target="#advanced-help-notifications" class="toggle-show pure-button button-tag button-xsmall">Show advanced help and tips</div>
+                                <div data-target="#advanced-help-notifications" class="toggle-show pure-button button-tag button-xsmall">{{ _('Show advanced help and tips') }}</div>
                                 <ul style="display: none" id="advanced-help-notifications">
-                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_discord">discord://</a></code> (or <code>https://discord.com/api/webhooks...</code>)) only supports a maximum <strong>2,000 characters</strong> of notification text, including the title.</li>
-                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_telegram">tgram://</a></code> bots can't send messages to other bots, so you should specify chat ID of non-bot user.</li>
-                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_telegram">tgram://</a></code> only supports very limited HTML and can fail when extra tags are sent, <a href="https://core.telegram.org/bots/api#html-style">read more here</a> (or use plaintext/markdown format)</li>
-                                <li><code>gets://</code>, <code>posts://</code>, <code>puts://</code>, <code>deletes://</code> for direct API calls (or omit the "<code>s</code>" for non-SSL ie <code>get://</code>) <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes#postposts">more help here</a></li>
-                                  <li>Accepts the <code>{{ '{{token}}' }}</code> placeholders listed below</li>
+                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_discord">discord://</a></code> {{ _('(or') }} <code>https://discord.com/api/webhooks...</code>)) {{ _('only supports a maximum') }} <strong>{{ _('2,000 characters') }}</strong> {{ _('of notification text, including the title.') }}</li>
+                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_telegram">tgram://</a></code> {{ _('bots can\'t send messages to other bots, so you should specify chat ID of non-bot user.') }}</li>
+                                <li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_telegram">tgram://</a></code> {{ _('only supports very limited HTML and can fail when extra tags are sent,') }} <a href="https://core.telegram.org/bots/api#html-style">{{ _('read more here') }}</a> {{ _('(or use plaintext/markdown format)') }}</li>
+                                <li><code>gets://</code>, <code>posts://</code>, <code>puts://</code>, <code>deletes://</code> {{ _('for direct API calls (or omit the') }} "<code>s</code>" {{ _('for non-SSL ie') }} <code>get://</code>) <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes#postposts">{{ _('more help here') }}</a></li>
+                                  <li>{{ _('Accepts the') }} <code>{{ '{{token}}' }}</code> {{ _('placeholders listed below') }}</li>
                               </ul>
                             </div>
                             <div class="notifications-wrapper">
-                              <a id="send-test-notification" class="pure-button button-secondary button-xsmall" >Send test notification</a> <div class="spinner"  style="display: none;"></div>
+                              <a id="send-test-notification" class="pure-button button-secondary button-xsmall" >{{ _('Send test notification') }}</a> <div class="spinner"  style="display: none;"></div>
                             {% if emailprefix %}
-                              <a id="add-email-helper" class="pure-button button-secondary button-xsmall" >Add email <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='email.svg')}}" alt="Add an email address"> </a>
+                              <a id="add-email-helper" class="pure-button button-secondary button-xsmall" >{{ _('Add email') }} <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='email.svg')}}" alt="{{ _('Add an email address') }}"> </a>
                             {% endif %}
-                              <a href="{{url_for('settings.notification_logs')}}" class="pure-button button-secondary button-xsmall" >Notification debug logs</a>
+                              <a href="{{url_for('settings.notification_logs')}}" class="pure-button button-secondary button-xsmall" >{{ _('Notification debug logs') }}</a>
                               <br>
-                                <div id="notification-test-log" style="display: none;"><span class="pure-form-message-inline">Processing..</span></div>
+                                <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>
+                                <span class="pure-form-message-inline">{{ _('Title for all notifications') }}</span>
                             </div>
                             <div class="pure-control-group">
                                 {{ render_field(form.notification_body , rows=5, class="notification-body", placeholder=settings_application['notification_body']) }}
@@ -156,23 +156,24 @@
                                 <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>
+                                        {{ _('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>
+                                        {{ _('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>
+                                        {{ _('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>
+                                        {{ _('For a complete reference of all Jinja2 built-in filters, users can refer to the') }} <a href="https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters">https://jinja.palletsprojects.com/en/3.1.x/templates/#builtin-filters</a>
                                     </span></li>
                                     </ul>
                                     <br>
+                                </div>
                             </div>
                             <div class="">
                                 {{ render_field(form.notification_format , class="notification-format") }}
-                                <span class="pure-form-message-inline">Format for all notifications</span>
+                                <span class="pure-form-message-inline">{{ _('Format for all notifications') }}</span>
                             </div>
                         </div>
 {% endmacro %}

changedetectionio/templates/_helpers.html

@@ -1,5 +1,5 @@
 {% macro render_field(field) %}
-    <div {% if field.errors or field.top_errors %} class="error" {% endif %}><label for="{{ field.id }}">{{ field.label.text | string | forceescape }}</label></div>
+    <div {% if field.errors or field.top_errors %} class="error" {% endif %}>{{ field.label }}</div>
     <div {% if field.errors or field.top_errors %} class="error" {% endif %}>{{ field(**kwargs)|safe }}
         {% if field.top_errors %}
             top
@@ -22,7 +22,7 @@
                     {% for idx, entry_errors in field.errors|enumerate %}
                         {% if entry_errors is mapping and entry_errors %}
                             {# Only show entries that have actual errors #}
-                            <li><strong>Entry {{ idx + 1 }}:</strong>
+                            <li><strong>{{ _('Entry') }} {{ idx + 1 }}:</strong>
                                 <ul>
                                     {% for field_name, messages in entry_errors.items() %}
                                         {% for message in messages %}
@@ -59,7 +59,7 @@
 
 {% macro render_ternary_field(field, BooleanField=false) %}
   {% if BooleanField %}
-    {% set _ = field.__setattr__('boolean_mode', true) %}
+    {% set dummy = field.__setattr__('boolean_mode', true) %}
   {% endif %}
   <div class="ternary-field {% if field.errors %} error {% endif %}">
     <div class="ternary-field-label"><label for="{{ field.id }}">{{ field.label.text | string | forceescape }}</label></div>
@@ -113,17 +113,17 @@
 
 {% macro render_fieldlist_with_inline_errors(fieldlist) %}
   {# Specialized macro for FieldList(FormField(...)) that renders errors inline with each field #}
-  <div {% if fieldlist.errors %} class="error" {% endif %}>{{ fieldlist.label }}</div>
+  <div {% if fieldlist.errors %} class="error" {% endif %}>{{ _(fieldlist.label.text | string) }}</div>
   <div {% if fieldlist.errors %} class="error" {% endif %}>
     <ul id="{{ fieldlist.id }}">
       {% for entry in fieldlist %}
         <li {% if entry.errors %} class="error" {% endif %}>
-          <label for="{{ entry.id }}" {% if entry.errors %} class="error" {% endif %}>{{ fieldlist.label.text }}-{{ loop.index0 }}</label>
+          <label for="{{ entry.id }}" {% if entry.errors %} class="error" {% endif %}>{{ _(fieldlist.label.text | string) }}-{{ loop.index0 }}</label>
           <table id="{{ entry.id }}" {% if entry.errors %} class="error" {% endif %}>
             <tbody>
               {% for subfield in entry %}
                 <tr {% if subfield.errors %} class="error" {% endif %}>
-                  <th {% if subfield.errors %} class="error" {% endif %}><label for="{{ subfield.id }}" {% if subfield.errors %} class="error" {% endif %}>{{ subfield.label.text }}</label></th>
+                  <th {% if subfield.errors %} class="error" {% endif %}><label for="{{ subfield.id }}" {% if subfield.errors %} class="error" {% endif %}>{{ subfield.label.text | string }}</label></th>
                   <td {% if subfield.errors %} class="error" {% endif %}>
                     {{ subfield(**kwargs)|safe }}
                     {% if subfield.errors %}
@@ -148,9 +148,9 @@
   <div class="fieldlist_formfields" id="{{ table_id }}">
     <div class="fieldlist-header">
       {% for subfield in fieldlist[0] %}
-        <div class="fieldlist-header-cell">{{ subfield.label }}</div>
+        <div class="fieldlist-header-cell">{{ subfield.label.text | string }}</div>
       {% endfor %}
-      <div class="fieldlist-header-cell">Actions</div>
+      <div class="fieldlist-header-cell">{{ _('Actions') }}</div>
     </div>
     <div class="fieldlist-body">
       {% for form_row in fieldlist %}
@@ -169,9 +169,9 @@
             </div>
           {% endfor %}
           <div class="fieldlist-cell fieldlist-actions">
-            <button type="button" class="addRuleRow" title="Add a row/rule after">+</button>
-            <button type="button" class="removeRuleRow" title="Remove this row/rule">-</button>
-            <button type="button" class="verifyRuleRow" title="Verify this rule against current snapshot">✓</button>
+            <button type="button" class="addRuleRow" title="{{ _('Add a row/rule after') }}">+</button>
+            <button type="button" class="removeRuleRow" title="{{ _('Remove this row/rule') }}">-</button>
+            <button type="button" class="verifyRuleRow" title="{{ _('Verify this rule against current snapshot') }}">✓</button>
           </div>
         </div>
       {% endfor %}
@@ -181,8 +181,8 @@
 
 
 {% macro playwright_warning() %}
-    <p><strong>Error - This watch needs Chrome (with playwright/sockpuppetbrowser), but Chrome based fetching is not enabled.</strong> Alternatively try our <a href="https://changedetection.io">very affordable subscription based service which has all this setup for you</a>.</p>
-    <p>You may need to <a href="https://github.com/dgtlmoon/changedetection.io/blob/09ebc6ec6338545bdd694dc6eee57f2e9d2b8075/docker-compose.yml#L31">Enable playwright environment variable</a> and uncomment the <strong>sockpuppetbrowser</strong> in the <a href="https://github.com/dgtlmoon/changedetection.io/blob/master/docker-compose.yml">docker-compose.yml</a> file.</p>
+    <p><strong>{{ _('Error - This watch needs Chrome (with playwright/sockpuppetbrowser), but Chrome based fetching is not enabled.') }}</strong> {{ _('Alternatively try our') }} <a href="https://changedetection.io">{{ _('very affordable subscription based service which has all this setup for you') }}</a>.</p>
+    <p>{{ _('You may need to') }} <a href="https://github.com/dgtlmoon/changedetection.io/blob/09ebc6ec6338545bdd694dc6eee57f2e9d2b8075/docker-compose.yml#L31">{{ _('Enable playwright environment variable') }}</a> {{ _('and uncomment the') }} <strong>sockpuppetbrowser</strong> {{ _('in the') }} <a href="https://github.com/dgtlmoon/changedetection.io/blob/master/docker-compose.yml">docker-compose.yml</a> {{ _('file') }}.</p>
     <br>
 {% endmacro %}
 
@@ -237,18 +237,17 @@
         <span id="scheduler-icon-label" style="">
             {{ render_checkbox_field(form.time_schedule_limit.enabled) }}
             <div class="pure-form-message-inline">
-                Set a hourly/week day schedule
+                {{ _('Set a hourly/week day schedule') }}
             </div>
         </span>
 
     </div>
     <br>
     <div id="schedule-day-limits-wrapper">
-        <label>Schedule time limits</label><a data-template="business-hours"
-                                              class="set-schedule pure-button button-secondary button-xsmall">Business
-        hours</a>
-        <a data-template="weekend" class="set-schedule pure-button button-secondary button-xsmall">Weekends</a>
-        <a data-template="reset" class="set-schedule pure-button button-xsmall">Reset</a><br>
+        <label>{{ _('Schedule time limits') }}</label><a data-template="business-hours"
+                                              class="set-schedule pure-button button-secondary button-xsmall">{{ _('Business hours') }}</a>
+        <a data-template="weekend" class="set-schedule pure-button button-secondary button-xsmall">{{ _('Weekends') }}</a>
+        <a data-template="reset" class="set-schedule pure-button button-xsmall">{{ _('Reset') }}</a><br>
         <br>
 
         <ul id="day-wrapper">
@@ -257,8 +256,8 @@
                     {{ render_nolabel_field(form.time_schedule_limit[day]) }}
                 </li>
             {% endfor %}
-            <li id="timespan-warning">Warning, one or more of your 'days' has a duration that would extend into the next day.<br>
-            This could have unintended consequences.</li>
+            <li id="timespan-warning">{{ _("Warning, one or more of your 'days' has a duration that would extend into the next day.") }}<br>
+            {{ _('This could have unintended consequences.') }}</li>
             <li id="timezone-info">
                 {{ render_field(form.time_schedule_limit.timezone, placeholder=timezone_default_config) }} <span id="local-time-in-tz"></span>
                 <datalist id="timezones" style="display: none;">
@@ -268,12 +267,12 @@
         </ul>
     <br>
         <span class="pure-form-message-inline">
-         <a href="https://changedetection.io/tutorials">More help and examples about using the scheduler</a>
+         <a href="https://changedetection.io/tutorial/checking-web-pages-changes-according-schedule">{{ _('More help and examples about using the scheduler') }}</a>
         </span>
     </div>
     {% else %}
         <span class="pure-form-message-inline">
-            Want to use a time schedule? <a href="{{url_for('settings.settings_page')}}#timedate">First confirm/save your Time Zone Settings</a>
+            {{ _('Want to use a time schedule?') }} <a href="{{url_for('settings.settings_page')}}#timedate">{{ _('First confirm/save your Time Zone Settings') }}</a>
         </span>
         <br>
     {% endif %}
@@ -282,8 +281,8 @@
 
 {% macro highlight_trigger_ignored_explainer() %}
                 <p>
-                    <span title="Triggers a change if this text appears, AND something changed in the document." style="background-color: var(--highlight-trigger-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">Triggered text</span>
-                    <span title="Ignored for calculating changes, but still shown." style="background-color: var(--highlight-ignored-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">Ignored text</span>
-                    <span title="No change-detection will occur because this text exists." style="background-color: var(--highlight-blocked-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">Blocked text</span>
+                    <span title="{{ _('Triggers a change if this text appears, AND something changed in the document.') }}" style="background-color: var(--highlight-trigger-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">{{ _('Triggered text') }}</span>
+                    <span title="{{ _('Ignored for calculating changes, but still shown.') }}" style="background-color: var(--highlight-ignored-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">{{ _('Ignored text') }}</span>
+                    <span title="{{ _('No change-detection will occur because this text exists.') }}" style="background-color: var(--highlight-blocked-text-bg-color); color: #fff; padding: 4px; border-radius: 2px; margin-right: 4px;">{{ _('Blocked text') }}</span>
                 </p>
 {% endmacro %}

changedetectionio/templates/base.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ get_locale() }}" data-darkmode="{{ get_darkmode_state() }}">
+<html lang="{{ get_locale()|replace('_', '-') }}" data-darkmode="{{ get_darkmode_state() }}">
 
   <head>
     <meta charset="utf-8" >
@@ -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) %}
@@ -71,64 +71,20 @@
         {% endif %}
 
         <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">
-                <a href="{{ url_for('tags.tags_overview_page')}}" class="pure-menu-link">{{ _('GROUPS') }}</a>
-              </li>
-              <li class="pure-menu-item">
-                <a href="{{ url_for('settings.settings_page')}}" class="pure-menu-link">{{ _('SETTINGS') }}</a>
-              </li>
-              <li class="pure-menu-item">
-                <a href="{{ url_for('imports.import_page')}}" class="pure-menu-link">{{ _('IMPORT') }}</a>
-              </li>
-              <li class="pure-menu-item">
-                <a href="{{ url_for('backups.index')}}" class="pure-menu-link">{{ _('BACKUPS') }}</a>
-              </li>
-            {% else %}
-              <li class="pure-menu-item">
-                <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">
-              <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">
-              <a href="{{url_for('logout')}}" class="pure-menu-link">{{ _('LOG OUT') }}</a>
-            </li>
-          {% endif %}
-          {% if current_user.is_authenticated or not has_password %}
-          <li class="pure-menu-item pure-form" id="search-menu-item">
-            <!-- We use GET here so it offers people a chance to set bookmarks etc -->
-            <form name="searchForm" action="" method="GET">
-              <input id="search-q" class="" name="q" placeholder="URL or Title {% if active_tag_uuid %}in '{{ active_tag.title }}'{% endif %}" required="" type="text" value="">
-              <input name="tags" type="hidden" value="{% if active_tag_uuid %}{{active_tag_uuid}}{% endif %}">
-              <button class="toggle-button " id="toggle-search" type="button" title="{{ _('Search, or Use Alt+S Key') }}" >
-                {% include "svgs/search-icon.svg" %}
-              </button>
-            </form>
-          </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"
@@ -138,24 +94,37 @@
                    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>
+          <!-- Hamburger menu button (mobile only) -->
           <li class="pure-menu-item">
-            <a class="github-link" href="https://github.com/dgtlmoon/changedetection.io">
-              {% include "svgs/github.svg" %}
-            </a>
+            <button class="hamburger-menu" id="hamburger-toggle" aria-label="Toggle menu">
+              <div class="hamburger-icon">
+                <span></span>
+                <span></span>
+                <span></span>
+              </div>
+            </button>
           </li>
         </ul>
       </div>
+
+      <!-- Mobile menu drawer -->
+      <div class="mobile-menu-overlay" id="mobile-menu-overlay"></div>
+      <div class="mobile-menu-drawer" id="mobile-menu-drawer">
+        <ul class="mobile-menu-items">
+          {% 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>
@@ -218,32 +187,62 @@
                 </p>
             </div>
         </div>
-        <header>
-        {% block header %}{% endblock %}
-      </header>
 
-      {% with messages = get_flashed_messages(with_categories = true) %}
-      {% if
-      messages %}
-        <ul class="messages">
-          {% for category, message in messages %}
-            <li class="{{ category }}">{{ message }}</li>
-          {% endfor %}
-        </ul>
-      {% endif %}
-      {% endwith %}
-      {% if session['share-link'] %}
-        <ul class="messages with-share-link">
-          <li class="message">
-            Share this link:
-            <span id="share-link">{{ session['share-link'] }}</span>
-            <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='copy.svg')}}" >
-          </li>
-        </ul>
-      {% endif %}
-      {% block content %}{% endblock %}
+        <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') }}">
+              <svg class="action-icon" viewBox="0 0 24 24">
+                <circle cx="12" cy="12" r="10"/>
+                <path d="M12 6v6l4 2"/>
+              </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"/>
+                <line x1="8" y1="12" x2="21" y2="12"/>
+                <line x1="8" y1="18" x2="21" y2="18"/>
+                <line x1="3" y1="6" x2="3.01" y2="6"/>
+                <line x1="3" y1="12" x2="3.01" y2="12"/>
+                <line x1="3" y1="18" x2="3.01" y2="18"/>
+              </svg>
+              <span class="action-label">{{ _('Queue') }}</span>
+              <span class="notification-bubble blue-bubble" id="queue-bubble" data-count="0"></span>
+            </a>
+          </aside>
+          {% endif %}
+#}
+          <div class="content-main">
+            <header>
+              {% block header %}{% endblock %}
+            </header>
+
+            {% with messages = get_flashed_messages(with_categories = true) %}
+            {% if messages %}
+              <ul class="messages">
+                {% for category, message in messages %}
+                  <li class="{{ category }}">{{ message }}</li>
+                {% endfor %}
+              </ul>
+            {% endif %}
+            {% endwith %}
+            {% if session['share-link'] %}
+              <ul class="messages with-share-link">
+                <li class="message">
+                  Share this link:
+                  <span id="share-link">{{ session['share-link'] }}</span>
+                  <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='copy.svg')}}" >
+                </li>
+              </ul>
+            {% endif %}
+            {% block content %}{% endblock %}
+          </div>
+        </div>
     </section>
     <script src="{{url_for('static_content', group='js', filename='toggle-theme.js')}}" defer></script>
+    <script src="{{url_for('static_content', group='js', filename='hamburger-menu.js')}}" defer></script>
 
     <div id="checking-now-fixed-tab" style="display: none;"><span class="spinner"></span><span class="status-text">&nbsp;{{ _('Checking now') }}</span></div>
     <div id="realtime-conn-error" style="display:none">{{ _('Real-time updates offline') }}</div>
@@ -261,8 +260,8 @@
       <div class="modal-body">
         <div class="language-list">
           {% for locale, lang_data in available_languages.items()|sort %}
-          <a href="{{ url_for('set_language', locale=locale) }}" 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>
+          <a href="{{ url_for('set_language', locale=locale, redirect=request.path) }}" class="language-option" data-locale="{{ locale }}">
+            <span class="lang-option {{ lang_data.flag }}"></span> <span class="language-name">{{ lang_data.name }}</span>
           </a>
           {% endfor %}
         </div>
@@ -275,7 +274,103 @@
       </div>
     </dialog>
 
+    <!-- Search Modal -->
+    {% if current_user.is_authenticated or not has_password %}
+    <dialog id="search-modal" class="modal-dialog" aria-labelledby="search-modal-title">
+      <div class="modal-header">
+        <h2 class="modal-title" id="search-modal-title">{{ _('Search') }}</h2>
+      </div>
+      <div class="modal-body">
+        <form id="search-form" method="GET">
+          <div class="pure-control-group">
+            <label for="search-modal-input">{{ _('URL or Title') }}{% if active_tag_uuid %} {{ _('in') }} '{{ active_tag.title }}'{% endif %}</label>
+            <input id="search-modal-input" class="m-d" name="q" placeholder="{{ _('Enter search term...') }}" required type="text" value="" autofocus>
+            <input name="tags" type="hidden" value="{% if active_tag_uuid %}{{active_tag_uuid}}{% endif %}">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="pure-button button-cancel" id="close-search-modal">{{ _('Cancel') }}</button>
+        <button type="submit" form="search-form" class="pure-button pure-button-primary">{{ _('Search') }}</button>
+      </div>
+    </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>
+    <script src="{{url_for('static_content', group='js', filename='flask-toast-bridge.js')}}" defer></script>
   </body>
 
 </html>

changedetectionio/templates/edit/text-options.html

@@ -6,10 +6,10 @@
 ") }}
                         <span class="pure-form-message-inline">
                     <ul>
-                        <li>Text to wait for before triggering a change/notification, all text and regex are tested <i>case-insensitive</i>.</li>
-                        <li>Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this watch</li>
-                        <li>Each line is processed separately (think of each line as "OR")</li>
-                        <li>Note: Wrap in forward slash / to use regex  example: <code>/foo\d/</code></li>
+                        <li>{{ _('Text to wait for before triggering a change/notification, all text and regex are tested case-insensitive.') }}</li>
+                        <li>{{ _('Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor') }}</li>
+                        <li>{{ _('Each line is processed separately (think of each line as "OR")') }}</li>
+                        <li>{{ _('Note: Wrap in forward slash / to use regex example:') }} <code>/foo\d/</code></li>
                     </ul>
                         </span>
                     </div>
@@ -20,10 +20,10 @@
 ") }}
                     <span class="pure-form-message-inline">
                         <ul>
-                            <li>Matching text will be <strong>ignored</strong> in the text snapshot (you can still see it but it wont trigger a change)</li>
-                            <li>Each line processed separately, any line matching will be ignored (removed before creating the checksum)</li>
-                            <li>Regular Expression support, wrap the entire line in forward slash <code>/regex/</code></li>
-                            <li>Changing this will affect the comparison checksum which may trigger an alert</li>
+                            <li>{{ _('Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)') }}</li>
+                            <li>{{ _('Each line processed separately, any line matching will be ignored (removed before creating the checksum)') }}</li>
+                            <li>{{ _('Regular Expression support, wrap the entire line in forward slash') }} <code>/regex/</code></li>
+                            <li>{{ _('Changing this will affect the comparison checksum which may trigger an alert') }}</li>
                         </ul>
                 </span>
                 <br><br>
@@ -40,10 +40,10 @@ Not in stock
 Unavailable") }}
                         <span class="pure-form-message-inline">
                             <ul>
-                                <li>Block change-detection while this text is on the page, all text and regex are tested <i>case-insensitive</i>, good for waiting for when a product is available again</li>
-                                <li>Block text is processed from the result-text that comes out of any CSS/JSON Filters for this watch</li>
-                                <li>All lines here must not exist (think of each line as "OR")</li>
-                                <li>Note: Wrap in forward slash / to use regex  example: <code>/foo\d/</code></li>
+                                <li>{{ _('Block change-detection while this text is on the page, all text and regex are tested case-insensitive, good for waiting for when a product is available again') }}</li>
+                                <li>{{ _('Block text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor') }}</li>
+                                <li>{{ _('All lines here must not exist (think of each line as "OR")') }}</li>
+                                <li>{{ _('Note: Wrap in forward slash / to use regex example:') }} <code>/foo\d/</code></li>
                             </ul>
                         </span>
                     </div>
@@ -55,17 +55,17 @@ Unavailable") }}
 keyword") }}
                         <span class="pure-form-message-inline">
                     <ul>
-                        <li>Extracts text in the final output (line by line) after other filters using regular expressions or string match;
+                        <li>{{ _('Extracts text in the final output (line by line) after other filters using regular expressions or string match:') }}
                             <ul>
-                                <li>Regular expression &dash; example <code>/reports.+?2022/i</code></li>
-                                <li>Don't forget to consider the white-space at the start of a line <code>/.+?reports.+?2022/i</code></li>
-                                <li>Use <code>//(?aiLmsux))</code> type flags (more <a href="https://docs.python.org/3/library/re.html#index-15">information here</a>)<br></li>
-                                <li>Keyword example &dash; example <code>Out of stock</code></li>
-                                <li>Use groups to extract just that text &dash; example <code>/reports.+?(\d+)/i</code> returns a list of years only</li>
-                                <li>Example - match lines containing a keyword <code>/.*icecream.*/</code></li>
+                                <li>{{ _('Regular expression - example') }} <code>/reports.+?2022/i</code></li>
+                                <li>{{ _('Don\'t forget to consider the white-space at the start of a line') }} <code>/.+?reports.+?2022/i</code></li>
+                                <li>{{ _('Use') }} <code>//(?aiLmsux))</code> {{ _('type flags (more') }} <a href="https://docs.python.org/3/library/re.html#index-15">{{ _('information here') }}</a>)<br></li>
+                                <li>{{ _('Keyword example - example') }} <code>Out of stock</code></li>
+                                <li>{{ _('Use groups to extract just that text - example') }} <code>/reports.+?(\d+)/i</code> {{ _('returns a list of years only') }}</li>
+                                <li>{{ _('Example - match lines containing a keyword') }} <code>/.*icecream.*/</code></li>
                             </ul>
                         </li>
-                        <li>One line per regular-expression/string match</li>
+                        <li>{{ _('One line per regular-expression/string match') }}</li>
                     </ul>
                         </span>
                     </div>

changedetectionio/templates/login.html

@@ -5,6 +5,7 @@
  <div class="inner">
     <form class="pure-form pure-form-stacked" action="{{url_for('login')}}" method="POST">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+        <input type="hidden" id="redirect" name="redirect" value="{{ redirect_url }}">
         <fieldset>
             <div class="pure-control-group">
                 <label for="password">{{ _('Password') }}</label>

changedetectionio/templates/menu.html

@@ -0,0 +1,57 @@
+{# 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" id="menu-pause">
+        <a href="{{ url_for('settings.toggle_all_paused') }}" ><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="{% if all_paused %}{{ _('Resume automatic scheduling') }}{% else %}{{ _('Pause auto-queue scheduling of watches') }}{% endif %}" title="{% if all_paused %}{{ _('Scheduling is paused - click to resume') }}{% else %}{{ _('Pause auto-queue scheduling of watches') }}{% endif %}" class="icon icon-pause"{% if not all_paused %} style="opacity: 0.3"{% endif %}></a>
+    </li>
+    <li class="pure-menu-item " id="menu-mute">
+        <a href="{{ url_for('settings.toggle_all_muted') }}" ><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="{% if all_muted %}{{ _('Unmute notifications') }}{% else %}{{ _('Mute notifications') }}{% endif %}" title="{% if all_muted %}{{ _('Notifications are muted - click to unmute') }}{% else %}{{ _('Mute notifications') }}{% endif %}" class="icon icon-mute"{% if not all_muted %} style="opacity: 0.3"{% endif %}></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

@@ -159,6 +159,14 @@ def prepare_test_function(live_server, datastore_path):
     # CRITICAL: Get datastore and stop it from writing stale data
     datastore = live_server.app.config.get('DATASTORE')
 
+    # Clear the queue before starting the test to prevent state leakage
+    from changedetectionio.flask_app import update_q
+    while not update_q.empty():
+        try:
+            update_q.get_nowait()
+        except:
+            break
+
     # Prevent background thread from writing during cleanup/reload
     datastore.needs_write = False
     datastore.needs_write_urgent = False
@@ -183,8 +191,17 @@ def prepare_test_function(live_server, datastore_path):
 
     yield
 
-    # Cleanup: Clear watches again after test
+    # Cleanup: Clear watches and queue after test
     try:
+        from changedetectionio.flask_app import update_q
+
+        # Clear the queue to prevent leakage to next test
+        while not update_q.empty():
+            try:
+                update_q.get_nowait()
+            except:
+                break
+
         datastore.data['watching'] = {}
         datastore.needs_write = True
     except Exception as e:
@@ -238,17 +255,20 @@ def app(request, datastore_path):
     app.config['TEST_DATASTORE_PATH'] = datastore_path
 
     def teardown():
+        import threading
+        import time
+
         # Stop all threads and services
         datastore.stop_thread = True
         app.config.exit.set()
-        
+
         # Shutdown workers gracefully before loguru cleanup
         try:
             from changedetectionio import worker_handler
             worker_handler.shutdown_workers()
         except Exception:
             pass
-            
+
         # Stop socket server threads
         try:
             from changedetectionio.flask_app import socketio_server
@@ -256,17 +276,41 @@ def app(request, datastore_path):
                 socketio_server.shutdown()
         except Exception:
             pass
-        
-        # Give threads a moment to finish their shutdown
-        import time
-        time.sleep(0.1)
-        
+
+        # Get all active threads before cleanup
+        main_thread = threading.main_thread()
+        active_threads = [t for t in threading.enumerate() if t != main_thread and t.is_alive()]
+
+        # Wait for non-daemon threads to finish (with timeout)
+        timeout = 2.0  # 2 seconds max wait
+        start_time = time.time()
+
+        for thread in active_threads:
+            if not thread.daemon:
+                remaining_time = timeout - (time.time() - start_time)
+                if remaining_time > 0:
+                    logger.debug(f"Waiting for non-daemon thread to finish: {thread.name}")
+                    thread.join(timeout=remaining_time)
+                    if thread.is_alive():
+                        logger.warning(f"Thread {thread.name} did not finish in time")
+
+        # Give daemon threads a moment to finish their current work
+        time.sleep(0.2)
+
+        # Log any threads still running
+        remaining_threads = [t for t in threading.enumerate() if t != main_thread and t.is_alive()]
+        if remaining_threads:
+            logger.debug(f"Threads still running after teardown: {[t.name for t in remaining_threads]}")
+
         # Remove all loguru handlers to prevent "closed file" errors
         logger.remove()
-        
+
         # Cleanup files
         cleanup(app_config['datastore_path'])
 
        
     request.addfinalizer(teardown)
     yield app
+
+
+

changedetectionio/tests/test_access_control.py

@@ -124,7 +124,6 @@ def test_check_access_control(app, client, live_server, measure_memory_usage, da
 
         # Menu should be available now
         assert b"SETTINGS" in res.data
-        assert b"BACKUP" in res.data
         assert b"IMPORT" in res.data
         assert b"LOG OUT" in res.data
         assert b"time_between_check-minutes" in res.data

changedetectionio/tests/test_api.py

@@ -109,18 +109,17 @@ def test_api_simple(client, live_server, measure_memory_usage, datastore_path):
         headers={'x-api-key': api_key}
     )
     assert len(res.json) == 0
-    time.sleep(1)
+    time.sleep(2)
     wait_for_all_checks(client)
-
     set_modified_response(datastore_path=datastore_path)
     # Trigger recheck of all ?recheck_all=1
-    client.get(
+    res = client.get(
         url_for("createwatch", recheck_all='1'),
         headers={'x-api-key': api_key},
     )
     wait_for_all_checks(client)
 
-    time.sleep(1)
+    time.sleep(2)
     # Did the recheck fire?
     res = client.get(
         url_for("createwatch"),
@@ -165,18 +164,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_api_tags.py

@@ -125,10 +125,12 @@ def test_api_tags_listing(client, live_server, measure_memory_usage, datastore_p
        url_for("tag", uuid=new_tag_uuid) + "?recheck=true",
        headers={'x-api-key': api_key}
     )
-    wait_for_all_checks()
-    assert res.status_code == 200
-    assert b'OK, 1 watches' in res.data
 
+    assert res.status_code == 200
+    assert b'OK, queued 1 watches for rechecking' in res.data
+
+
+    wait_for_all_checks()
     after_check_time = live_server.app.config['DATASTORE'].data['watching'][watch_uuid].get('last_checked')
 
     assert before_check_time != after_check_time

changedetectionio/tests/test_backend.py

@@ -38,7 +38,6 @@ def test_check_basic_change_detection_functionality(client, live_server, measure
         # Default no password set, this stuff should be always available.
 
         assert b"SETTINGS" in res.data
-        assert b"BACKUP" in res.data
         assert b"IMPORT" in res.data
 
     #####################

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_filter_failure_notification.py

@@ -45,7 +45,7 @@ def run_filter_test(client, live_server, content_filter, app_notification_format
     uuid = client.application.config.get('DATASTORE').add_watch(url=test_url)
     res = client.get(url_for("watchlist.index"))
 
-    assert b'No website watches configured' not in res.data
+    assert b'No web page change detection watches configured' not in res.data
 
 
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)

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_i18n.py

@@ -1,7 +1,71 @@
 #!/usr/bin/env python3
 
 from flask import url_for
-from .util import live_server_setup
+from .util import live_server_setup, wait_for_all_checks
+
+
+def test_zh_TW(client, live_server, measure_memory_usage, datastore_path):
+    import time
+    test_url = url_for('test_endpoint', _external=True)
+
+    # Be sure we got a session cookie
+    res = client.get(url_for("watchlist.index"), follow_redirects=True)
+
+    res = client.get(
+        url_for("set_language", locale="zh_Hant_TW"), # Traditional
+        follow_redirects=True
+    )
+    # HTML follows BCP 47 language tag rules, not underscore-based locale formats.
+    assert b'<html lang="zh-Hant-TW"' in res.data
+    assert b'Cannot set language without session cookie' not in res.data
+    assert '選擇語言'.encode() in res.data
+
+    # Check second set works
+    res = client.get(
+        url_for("set_language", locale="en_GB"),
+        follow_redirects=True
+    )
+    assert b'Cannot set language without session cookie' not in res.data
+    res = client.get(url_for("watchlist.index"), follow_redirects=True)
+    assert b"Select Language" in res.data, "Second set of language worked"
+
+    # Check arbitration between zh_Hant_TW<->zh
+    res = client.get(
+        url_for("set_language", locale="zh"), # Simplified chinese
+        follow_redirects=True
+    )
+    res = client.get(url_for("watchlist.index"), follow_redirects=True)
+    assert "选择语言".encode() in res.data, "Simplified chinese worked and it means the flask-babel cache worked"
+
+
+# timeago library just hasn't been updated to use the more modern locale naming convention, before BCP 47 / RFC 5646.
+# The Python timeago library (https://github.com/hustcc/timeago) supports 48 locales but uses different naming conventions than Flask-Babel.
+def test_zh_Hant_TW_timeago_integration():
+    """Test that zh_Hant_TW mapping works and timeago renders Traditional Chinese correctly"""
+    import timeago
+    from datetime import datetime, timedelta
+    from changedetectionio.languages import get_timeago_locale
+
+    # 1. Test the mapping
+    mapped_locale = get_timeago_locale('zh_Hant_TW')
+    assert mapped_locale == 'zh_TW', "zh_Hant_TW should map to timeago's zh_TW"
+    assert get_timeago_locale('zh_TW') == 'zh_TW', "zh_TW should also map to zh_TW"
+
+    # 2. Test timeago library renders Traditional Chinese with the mapped locale
+    now = datetime.now()
+
+    # Test various time periods with Traditional Chinese strings
+    result_15s = timeago.format(now - timedelta(seconds=15), now, mapped_locale)
+    assert '秒前' in result_15s, f"Expected '秒前' in '{result_15s}'"
+
+    result_5m = timeago.format(now - timedelta(minutes=5), now, mapped_locale)
+    assert '分鐘前' in result_5m, f"Expected '分鐘前' in '{result_5m}'"
+
+    result_2h = timeago.format(now - timedelta(hours=2), now, mapped_locale)
+    assert '小時前' in result_2h, f"Expected '小時前' in '{result_2h}'"
+
+    result_3d = timeago.format(now - timedelta(days=3), now, mapped_locale)
+    assert '天前' in result_3d, f"Expected '天前' in '{result_3d}'"
 
 
 def test_language_switching(client, live_server, measure_memory_usage, datastore_path):
@@ -13,6 +77,9 @@ def test_language_switching(client, live_server, measure_memory_usage, datastore
     3. Switch back to English and verify English text appears
     """
 
+    # Establish session cookie
+    client.get(url_for("watchlist.index"), follow_redirects=True)
+
     # Step 1: Set the language to Italian using the /set-language endpoint
     res = client.get(
         url_for("set_language", locale="it"),
@@ -61,6 +128,9 @@ def test_invalid_locale(client, live_server, measure_memory_usage, datastore_pat
     The app should ignore invalid locales and continue working.
     """
 
+    # Establish session cookie
+    client.get(url_for("watchlist.index"), follow_redirects=True)
+
     # First set to English
     res = client.get(
         url_for("set_language", locale="en"),
@@ -93,6 +163,9 @@ def test_language_persistence_in_session(client, live_server, measure_memory_usa
     within the same session.
     """
 
+    # Establish session cookie
+    client.get(url_for("watchlist.index"), follow_redirects=True)
+
     # Set language to Italian
     res = client.get(
         url_for("set_language", locale="it"),
@@ -110,3 +183,145 @@ def test_language_persistence_in_session(client, live_server, measure_memory_usa
 
         assert res.status_code == 200
         assert b"Annulla" in res.data, "Italian text should persist across requests"
+
+
+def test_set_language_with_redirect(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test that changing language keeps the user on the same page.
+    Example: User is on /settings, changes language, stays on /settings.
+    """
+    from flask import url_for
+
+    # Establish session cookie
+    client.get(url_for("watchlist.index"), follow_redirects=True)
+
+    # Set language with a redirect parameter (simulating language change from /settings)
+    res = client.get(
+        url_for("set_language", locale="de", redirect="/settings"),
+        follow_redirects=False
+    )
+
+    # Should redirect back to settings
+    assert res.status_code in [302, 303]
+    assert '/settings' in res.location
+
+    # Verify language was set in session
+    with client.session_transaction() as sess:
+        assert sess.get('locale') == 'de'
+
+    # Test with invalid locale (should still redirect safely)
+    res = client.get(
+        url_for("set_language", locale="invalid_locale", redirect="/settings"),
+        follow_redirects=False
+    )
+    assert res.status_code in [302, 303]
+    assert '/settings' in res.location
+
+    # Test with malicious redirect (should default to watchlist)
+    res = client.get(
+        url_for("set_language", locale="en", redirect="https://evil.com"),
+        follow_redirects=False
+    )
+    assert res.status_code in [302, 303]
+    # Should not redirect to evil.com
+    assert 'evil.com' not in res.location
+
+
+def test_time_unit_translations(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test that time unit labels (Hours, Minutes, Seconds) and Chrome Extension
+    are correctly translated on the settings page for all supported languages.
+    """
+    from flask import url_for
+
+    # Establish session cookie
+    client.get(url_for("watchlist.index"), follow_redirects=True)
+
+    # Test Italian translations
+    res = client.get(url_for("set_language", locale="it"), follow_redirects=True)
+    assert res.status_code == 200
+
+    res = client.get(url_for("settings.settings_page"), follow_redirects=True)
+    assert res.status_code == 200
+
+    # Check that Italian translations are present (not English)
+    assert b"Minutes" not in res.data or b"Minuti" in res.data, "Expected Italian 'Minuti' not English 'Minutes'"
+    assert b"Ore" in res.data, "Expected Italian 'Ore' for Hours"
+    assert b"Minuti" in res.data, "Expected Italian 'Minuti' for Minutes"
+    assert b"Secondi" in res.data, "Expected Italian 'Secondi' for Seconds"
+    assert b"Estensione Chrome" in res.data, "Expected Italian 'Estensione Chrome' for Chrome Extension"
+    assert b"Intervallo tra controlli" in res.data, "Expected Italian 'Intervallo tra controlli' for Time Between Check"
+    assert b"Time Between Check" not in res.data, "Should not have English 'Time Between Check'"
+
+    # Test Korean translations
+    res = client.get(url_for("set_language", locale="ko"), follow_redirects=True)
+    assert res.status_code == 200
+
+    res = client.get(url_for("settings.settings_page"), follow_redirects=True)
+    assert res.status_code == 200
+
+    # Check that Korean translations are present (not English)
+    # Korean: Hours=시간, Minutes=분, Seconds=초, Chrome Extension=Chrome 확장 프로그램, Time Between Check=확인 간격
+    assert "시간".encode() in res.data, "Expected Korean '시간' for Hours"
+    assert "분".encode() in res.data, "Expected Korean '분' for Minutes"
+    assert "초".encode() in res.data, "Expected Korean '초' for Seconds"
+    assert "Chrome 확장 프로그램".encode() in res.data, "Expected Korean 'Chrome 확장 프로그램' for Chrome Extension"
+    assert "확인 간격".encode() in res.data, "Expected Korean '확인 간격' for Time Between Check"
+    # Make sure we don't have the incorrect translations
+    assert "목요일".encode() not in res.data, "Should not have '목요일' (Thursday) for Hours"
+    assert "무음".encode() not in res.data, "Should not have '무음' (Mute) for Minutes"
+    assert "Chrome 요청".encode() not in res.data, "Should not have 'Chrome 요청' (Chrome requests) for Chrome Extension"
+    assert b"Time Between Check" not in res.data, "Should not have English 'Time Between Check'"
+
+    # Test Chinese Simplified translations
+    res = client.get(url_for("set_language", locale="zh"), follow_redirects=True)
+    assert res.status_code == 200
+
+    res = client.get(url_for("settings.settings_page"), follow_redirects=True)
+    assert res.status_code == 200
+
+    # Check that Chinese translations are present
+    # Chinese: Hours=小时, Minutes=分钟, Seconds=秒, Chrome Extension=Chrome 扩展程序, Time Between Check=检查间隔
+    assert "小时".encode() in res.data, "Expected Chinese '小时' for Hours"
+    assert "分钟".encode() in res.data, "Expected Chinese '分钟' for Minutes"
+    assert "秒".encode() in res.data, "Expected Chinese '秒' for Seconds"
+    assert "Chrome 扩展程序".encode() in res.data, "Expected Chinese 'Chrome 扩展程序' for Chrome Extension"
+    assert "检查间隔".encode() in res.data, "Expected Chinese '检查间隔' for Time Between Check"
+    assert b"Time Between Check" not in res.data, "Should not have English 'Time Between Check'"
+
+    # Test German translations
+    res = client.get(url_for("set_language", locale="de"), follow_redirects=True)
+    assert res.status_code == 200
+
+    res = client.get(url_for("settings.settings_page"), follow_redirects=True)
+    assert res.status_code == 200
+
+    # Check that German translations are present
+    # German: Hours=Stunden, Minutes=Minuten, Seconds=Sekunden, Chrome Extension=Chrome-Erweiterung, Time Between Check=Prüfintervall
+    assert b"Stunden" in res.data, "Expected German 'Stunden' for Hours"
+    assert b"Minuten" in res.data, "Expected German 'Minuten' for Minutes"
+    assert b"Sekunden" in res.data, "Expected German 'Sekunden' for Seconds"
+    assert b"Chrome-Erweiterung" in res.data, "Expected German 'Chrome-Erweiterung' for Chrome Extension"
+    assert b"Time Between Check" not in res.data, "Should not have English 'Time Between Check'"
+
+    # Test Traditional Chinese (zh_Hant_TW) translations
+    res = client.get(url_for("set_language", locale="zh_Hant_TW"), follow_redirects=True)
+    assert res.status_code == 200
+
+    res = client.get(url_for("settings.settings_page"), follow_redirects=True)
+    assert res.status_code == 200
+
+    # Check that Traditional Chinese translations are present (not English)
+    # Traditional Chinese: Hours=小時, Minutes=分鐘, Seconds=秒, Chrome Extension=Chrome 擴充功能, Time Between Check=檢查間隔
+    assert "小時".encode() in res.data, "Expected Traditional Chinese '小時' for Hours"
+    assert "分鐘".encode() in res.data, "Expected Traditional Chinese '分鐘' for Minutes"
+    assert "秒".encode() in res.data, "Expected Traditional Chinese '秒' for Seconds"
+    assert "Chrome 擴充功能".encode() in res.data, "Expected Traditional Chinese 'Chrome 擴充功能' for Chrome Extension"
+    assert "發送測試通知".encode() in res.data, "Expected Traditional Chinese '發送測試通知' for Send test notification"
+    assert "通知除錯記錄".encode() in res.data, "Expected Traditional Chinese '通知除錯記錄' for Notification debug logs"
+    assert "檢查間隔".encode() in res.data, "Expected Traditional Chinese '檢查間隔' for Time Between Check"
+    # Make sure we don't have incorrect English text or wrong translations
+    assert b"Send test notification" not in res.data, "Should not have English 'Send test notification'"
+    assert b"Time Between Check" not in res.data, "Should not have English 'Time Between Check'"
+    assert "Chrome 請求".encode() not in res.data, "Should not have incorrect 'Chrome 請求' (Chrome requests)"
+    assert "使用預設通知".encode() not in res.data, "Should not have incorrect '使用預設通知' (Use default notification)"

changedetectionio/tests/test_live_preview.py

@@ -22,15 +22,15 @@ something to trigger<br>
 def test_content_filter_live_preview(client, live_server, measure_memory_usage, datastore_path):
    #  live_server_setup(live_server) # Setup on conftest per function
     set_response(datastore_path=datastore_path)
-
+    import time
     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)
+    time.sleep(0.5)
+    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,7 +528,8 @@ 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):
@@ -572,7 +576,7 @@ def _test_color_notifications(client, notification_body_token, datastore_path):
     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()

changedetectionio/tests/test_notification_errors.py

@@ -42,6 +42,9 @@ def test_check_notification_error_handling(client, live_server, measure_memory_u
     )
     assert b"Updated watch." in res.data
 
+
+    wait_for_all_checks(client)
+
     found=False
     for i in range(1, 10):
 

changedetectionio/tests/test_restock_itemprop.py

@@ -240,7 +240,6 @@ def test_restock_itemprop_with_tag(client, live_server, measure_memory_usage, da
 
 
 def test_itemprop_percent_threshold(client, live_server, measure_memory_usage, datastore_path):
-    
 
     delete_all_watches(client)
 
@@ -299,7 +298,26 @@ def test_itemprop_percent_threshold(client, live_server, measure_memory_usage, d
     assert b'has-unread-changes' not in res.data
 
 
+    # Re #2600 - Switch the mode to normal type and back, and see if the values stick..
+    ###################################################################################
+    uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
 
+    res = client.post(
+        url_for("ui.ui_edit.edit_page", uuid=uuid),
+        data={"restock_settings-follow_price_changes": "y",
+              "restock_settings-price_change_threshold_percent": 5.05,
+              "processor": "text_json_diff",
+              "url": test_url,
+              'fetch_backend': "html_requests",
+              "time_between_check_use_default": "y"
+              },
+        follow_redirects=True
+    )
+    assert b"Updated watch." in res.data
+    # And back again
+    live_server.app.config['DATASTORE'].data['watching'][uuid]['processor'] = 'restock_diff'
+    res = client.get(url_for("ui.ui_edit.edit_page", uuid=uuid))
+    assert b'type="text" value="5.05"' in res.data
 
     delete_all_watches(client)
 
@@ -443,3 +461,4 @@ def test_special_prop_examples(client, live_server, measure_memory_usage, datast
             res = client.get(url_for("watchlist.index"))
             assert b'ception' not in res.data
             assert b'155.55' in res.data
+

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_security.py

@@ -192,3 +192,289 @@ def test_xss_watch_last_error(client, live_server, measure_memory_usage, datasto
     assert b'<a href="https://foobar"></a><script>alert(123);</script>' in res.data
     assert b"https://foobar" in res.data # this text should be there
 
+
+def test_login_redirect_safe_urls(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test that safe redirect URLs work correctly in login flow.
+    This verifies the fix for open redirect vulnerabilities while maintaining
+    legitimate redirect functionality for both authenticated and unauthenticated users.
+    """
+
+    # Test 1: Accessing /login?redirect=/settings when not logged in
+    # Should show the login form with redirect parameter preserved
+    res = client.get(
+        url_for("login", redirect="/settings"),
+        follow_redirects=False
+    )
+    # Should show login form
+    assert res.status_code == 200
+    # Check that the redirect is preserved in the hidden form field
+    assert b'name="redirect"' in res.data
+
+    # Test 2: Valid internal redirect with query parameters
+    res = client.get(
+        url_for("login", redirect="/settings?tab=notifications"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    # Check that the redirect is preserved
+    assert b'value="/settings?tab=notifications"' in res.data
+
+    # Test 3: Malicious external URL should be blocked and default to watchlist
+    res = client.get(
+        url_for("login", redirect="https://evil.com/phishing"),
+        follow_redirects=False
+    )
+    # Should show login form
+    assert res.status_code == 200
+    # The redirect parameter in the form should NOT contain the evil URL
+    # Check the actual input value, not just anywhere in the page
+    assert b'value="https://evil.com' not in res.data
+    assert b'value="/evil.com' not in res.data
+    assert b'name="redirect"' in res.data
+
+    # Test 4: Double-slash attack should be blocked
+    res = client.get(
+        url_for("login", redirect="//evil.com"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    # Should not have the malicious URL in the redirect input value
+    assert b'value="//evil.com"' not in res.data
+
+    # Test 5: Protocol handler exploit should be blocked
+    res = client.get(
+        url_for("login", redirect="javascript:alert(document.domain)"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    # Should not have javascript: in the redirect input value
+    assert b'value="javascript:' not in res.data
+
+    # Test 6: At-symbol obfuscation attack should be blocked
+    res = client.get(
+        url_for("login", redirect="//@evil.com"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    # Should not have the malicious URL in the redirect input value
+    assert b'value="//@evil.com"' not in res.data
+
+    # Test 7: Multiple slashes attack should be blocked
+    res = client.get(
+        url_for("login", redirect="////evil.com"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    # Should not have the malicious URL in the redirect input value
+    assert b'value="////evil.com"' not in res.data
+
+
+def test_login_redirect_with_password(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test that redirect functionality works correctly when a password is set.
+    This ensures that notifications can always link to /login and users will
+    be redirected to the correct page after authentication.
+    """
+
+    # Set a password
+    from changedetectionio import store
+    import base64
+    import hashlib
+
+    # Generate a test password
+    password = "test123"
+    salt = os.urandom(32)
+    key = hashlib.pbkdf2_hmac('sha256', password.encode('utf-8'), salt, 100000)
+    salted_pass = base64.b64encode(salt + key).decode('ascii')
+
+    # Set the password in the datastore
+    client.application.config['DATASTORE'].data['settings']['application']['password'] = salted_pass
+
+    # Test 1: Try to access /login?redirect=/settings without being logged in
+    # Should show login form and preserve redirect parameter
+    res = client.get(
+        url_for("login", redirect="/settings"),
+        follow_redirects=False
+    )
+    assert res.status_code == 200
+    assert b"Password" in res.data
+    # Check that redirect parameter is preserved in the form
+    assert b'name="redirect"' in res.data
+    assert b'value="/settings"' in res.data
+
+    # Test 2: Submit correct password with redirect parameter
+    # Should redirect to /settings after successful login
+    res = client.post(
+        url_for("login"),
+        data={"password": password, "redirect": "/settings"},
+        follow_redirects=True
+    )
+    assert res.status_code == 200
+    # Should be on settings page
+    assert b"Settings" in res.data or b"settings" in res.data
+
+    # Test 3: Now that we're logged in, accessing /login?redirect=/settings
+    # should redirect immediately without showing login form
+    res = client.get(
+        url_for("login", redirect="/"),
+        follow_redirects=True
+    )
+    assert res.status_code == 200
+    assert b"Already logged in" in res.data
+
+    # Test 4: Malicious redirect should be blocked even with correct password
+    res = client.post(
+        url_for("login"),
+        data={"password": password, "redirect": "https://evil.com"},
+        follow_redirects=True
+    )
+    # Should redirect to watchlist index instead of evil.com
+    assert b"evil.com" not in res.data
+
+    # Logout for cleanup
+    client.get(url_for("logout"))
+
+    # Test 5: Incorrect password with redirect should stay on login page
+    res = client.post(
+        url_for("login"),
+        data={"password": "wrongpassword", "redirect": "/settings"},
+        follow_redirects=True
+    )
+    assert res.status_code == 200
+    assert b"Incorrect password" in res.data or b"password" in res.data
+
+    # Clear the password
+    del client.application.config['DATASTORE'].data['settings']['application']['password']
+
+
+def test_login_redirect_from_protected_page(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test the complete redirect flow: accessing a protected page while logged out
+    should redirect to login with the page URL, then redirect back after login.
+    This is the real-world scenario where users try to access /edit/uuid or /settings
+    and need to login first.
+    """
+    import base64
+    import hashlib
+
+    # Add a watch first
+    set_original_response(datastore_path=datastore_path)
+    res = client.post(
+        url_for("imports.import_page"),
+        data={"urls": url_for('test_endpoint', _external=True)},
+        follow_redirects=True
+    )
+    assert b"1 Imported" in res.data
+    wait_for_all_checks(client)
+
+    # Set a password
+    password = "test123"
+    salt = os.urandom(32)
+    key = hashlib.pbkdf2_hmac('sha256', password.encode('utf-8'), salt, 100000)
+    salted_pass = base64.b64encode(salt + key).decode('ascii')
+    client.application.config['DATASTORE'].data['settings']['application']['password'] = salted_pass
+
+    # Logout to ensure we're not authenticated
+    client.get(url_for("logout"))
+
+    # Try to access a protected page (edit page for first watch)
+    res = client.get(
+        url_for("ui.ui_edit.edit_page", uuid="first"),
+        follow_redirects=False
+    )
+
+    # Should redirect to login with the edit page as redirect parameter
+    assert res.status_code in [302, 303]
+    assert '/login' in res.location
+    assert 'redirect=' in res.location or 'redirect=%2F' in res.location
+
+    # Follow the redirect to login page
+    res = client.get(res.location, follow_redirects=False)
+    assert res.status_code == 200
+    assert b'Password' in res.data
+
+    # The redirect parameter should be preserved in the login form
+    # It should contain the edit page URL
+    assert b'name="redirect"' in res.data
+    assert b'value="/edit/first"' in res.data or b'value="%2Fedit%2Ffirst"' in res.data
+
+    # Now login with correct password and the redirect parameter
+    res = client.post(
+        url_for("login"),
+        data={"password": password, "redirect": "/edit/first"},
+        follow_redirects=False
+    )
+
+    # Should redirect to the edit page
+    assert res.status_code in [302, 303]
+    assert '/edit/first' in res.location
+
+    # Follow the redirect to verify we're on the edit page
+    res = client.get(res.location, follow_redirects=True)
+    assert res.status_code == 200
+    # Should see edit page content
+    assert b'Edit' in res.data or b'Watching' in res.data
+
+    # Cleanup
+    client.get(url_for("logout"))
+    del client.application.config['DATASTORE'].data['settings']['application']['password']
+
+
+def test_logout_with_redirect(client, live_server, measure_memory_usage, datastore_path):
+    """
+    Test that logout preserves the current page URL, so after re-login
+    the user returns to where they were before logging out.
+    Example: User is on /edit/uuid, clicks logout, then logs back in and
+    returns to /edit/uuid.
+    """
+    import base64
+    import hashlib
+
+    # Set a password and login
+    password = "test123"
+    salt = os.urandom(32)
+    key = hashlib.pbkdf2_hmac('sha256', password.encode('utf-8'), salt, 100000)
+    salted_pass = base64.b64encode(salt + key).decode('ascii')
+    client.application.config['DATASTORE'].data['settings']['application']['password'] = salted_pass
+
+    # Login
+    res = client.post(
+        url_for("login"),
+        data={"password": password},
+        follow_redirects=True
+    )
+    assert res.status_code == 200
+
+    # Now logout with a redirect parameter (simulating logout from /settings)
+    res = client.get(
+        url_for("logout", redirect="/settings"),
+        follow_redirects=False
+    )
+
+    # Should redirect to login with the redirect parameter
+    assert res.status_code in [302, 303]
+    assert '/login' in res.location
+    assert 'redirect=' in res.location or 'redirect=%2F' in res.location
+
+    # Follow the redirect to login page
+    res = client.get(res.location, follow_redirects=False)
+    assert res.status_code == 200
+    assert b'Password' in res.data
+    # The redirect parameter should be preserved
+    assert b'value="/settings"' in res.data or b'value="%2Fsettings"' in res.data
+
+    # Login again with the redirect
+    res = client.post(
+        url_for("login"),
+        data={"password": password, "redirect": "/settings"},
+        follow_redirects=False
+    )
+
+    # Should redirect back to settings
+    assert res.status_code in [302, 303]
+    assert '/settings' in res.location or 'settings' in res.location
+
+    # Cleanup
+    del client.application.config['DATASTORE'].data['settings']['application']['password']
+

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/unit/test_html_to_text.py

@@ -0,0 +1,205 @@
+#!/usr/bin/env python3
+# coding=utf-8
+
+"""Unit tests for html_tools.html_to_text function."""
+
+import hashlib
+import threading
+import unittest
+from queue import Queue
+
+from changedetectionio.html_tools import html_to_text
+
+
+class TestHtmlToText(unittest.TestCase):
+    """Test html_to_text function for correctness and thread-safety."""
+
+    def test_basic_text_extraction(self):
+        """Test basic HTML to text conversion."""
+        html = '<html><body><h1>Title</h1><p>Paragraph text.</p></body></html>'
+        text = html_to_text(html)
+
+        assert 'Title' in text
+        assert 'Paragraph text.' in text
+        assert '<' not in text  # HTML tags should be stripped
+        assert '>' not in text
+
+    def test_empty_html(self):
+        """Test handling of empty HTML."""
+        html = '<html><body></body></html>'
+        text = html_to_text(html)
+
+        # Should return empty or whitespace only
+        assert text.strip() == ''
+
+    def test_nested_elements(self):
+        """Test extraction from nested HTML elements."""
+        html = '''
+        <html>
+            <body>
+                <div>
+                    <h1>Header</h1>
+                    <div>
+                        <p>First paragraph</p>
+                        <p>Second paragraph</p>
+                    </div>
+                </div>
+            </body>
+        </html>
+        '''
+        text = html_to_text(html)
+
+        assert 'Header' in text
+        assert 'First paragraph' in text
+        assert 'Second paragraph' in text
+
+    def test_anchor_tag_rendering(self):
+        """Test anchor tag rendering option."""
+        html = '<html><body><a href="https://example.com">Link text</a></body></html>'
+
+        # Without rendering anchors
+        text_without = html_to_text(html, render_anchor_tag_content=False)
+        assert 'Link text' in text_without
+        assert 'https://example.com' not in text_without
+
+        # With rendering anchors
+        text_with = html_to_text(html, render_anchor_tag_content=True)
+        assert 'Link text' in text_with
+        assert 'https://example.com' in text_with or '[Link text]' in text_with
+
+    def test_rss_mode(self):
+        """Test RSS mode converts title tags to h1."""
+        html = '<item><title>RSS Title</title><description>Content</description></item>'
+
+        # is_rss=True should convert <title> to <h1>
+        text = html_to_text(html, is_rss=True)
+
+        assert 'RSS Title' in text
+        assert 'Content' in text
+
+    def test_special_characters(self):
+        """Test handling of special characters and entities."""
+        html = '<html><body><p>Test &amp; &lt;special&gt; characters</p></body></html>'
+        text = html_to_text(html)
+
+        # Entities should be decoded
+        assert 'Test &' in text or 'Test &amp;' in text
+        assert 'special' in text
+
+    def test_whitespace_handling(self):
+        """Test that whitespace is properly handled."""
+        html = '<html><body><p>Line 1</p><p>Line 2</p></body></html>'
+        text = html_to_text(html)
+
+        # Should have some separation between lines
+        assert 'Line 1' in text
+        assert 'Line 2' in text
+        assert text.count('\n') >= 1  # At least one newline
+
+    def test_deterministic_output(self):
+        """Test that the same HTML always produces the same text."""
+        html = '<html><body><h1>Test</h1><p>Content here</p></body></html>'
+
+        # Extract text multiple times
+        results = [html_to_text(html) for _ in range(10)]
+
+        # All results should be identical
+        assert len(set(results)) == 1, "html_to_text should be deterministic"
+
+    def test_thread_safety_determinism(self):
+        """
+        Test that html_to_text produces deterministic output under high concurrency.
+
+        This verifies that lxml's default parser (used by inscriptis.get_text)
+        is thread-safe and produces consistent results when called from multiple
+        threads simultaneously.
+        """
+        html = '''
+        <html>
+            <head><title>Test Page</title></head>
+            <body>
+                <h1>Main Heading</h1>
+                <div class="content">
+                    <p>First paragraph with <b>bold text</b>.</p>
+                    <p>Second paragraph with <i>italic text</i>.</p>
+                    <ul>
+                        <li>Item 1</li>
+                        <li>Item 2</li>
+                        <li>Item 3</li>
+                    </ul>
+                </div>
+            </body>
+        </html>
+        '''
+
+        results_queue = Queue()
+
+        def worker(worker_id, iterations=10):
+            """Worker that converts HTML to text multiple times."""
+            for i in range(iterations):
+                text = html_to_text(html)
+                md5 = hashlib.md5(text.encode('utf-8')).hexdigest()
+                results_queue.put((worker_id, i, md5))
+
+        # Launch many threads simultaneously
+        num_threads = 50
+        threads = []
+
+        for i in range(num_threads):
+            t = threading.Thread(target=worker, args=(i,))
+            threads.append(t)
+            t.start()
+
+        # Wait for all threads to complete
+        for t in threads:
+            t.join()
+
+        # Collect all MD5 results
+        md5_values = []
+        while not results_queue.empty():
+            _, _, md5 = results_queue.get()
+            md5_values.append(md5)
+
+        # All MD5s should be identical
+        unique_md5s = set(md5_values)
+
+        assert len(unique_md5s) == 1, (
+            f"Thread-safety issue detected! Found {len(unique_md5s)} different MD5 values: {unique_md5s}. "
+            "The thread-local parser fix may not be working correctly."
+        )
+
+        print(f"✓ Thread-safety test passed: {len(md5_values)} conversions, all identical")
+
+    def test_thread_safety_basic(self):
+        """Verify basic thread safety - multiple threads can call html_to_text simultaneously."""
+        results = []
+        errors = []
+
+        def worker():
+            """Worker that converts HTML to text."""
+            try:
+                html = '<html><body><h1>Test</h1><p>Content</p></body></html>'
+                text = html_to_text(html)
+                results.append(text)
+            except Exception as e:
+                errors.append(e)
+
+        # Launch 10 threads simultaneously
+        threads = [threading.Thread(target=worker) for _ in range(10)]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        # Should have no errors
+        assert len(errors) == 0, f"Thread-safety errors occurred: {errors}"
+
+        # All results should be identical
+        assert len(set(results)) == 1, "All threads should produce identical output"
+
+        print(f"✓ Basic thread-safety test passed: {len(results)} threads, no errors")
+
+
+if __name__ == '__main__':
+    # Can run this file directly for quick testing
+    unittest.main()

changedetectionio/tests/util.py

@@ -164,14 +164,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 +220,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
+    )