1.56 https://github.com/truenas/apps/issues/3587

.github/test/Dockerfile-alpine

@@ -7,8 +7,6 @@ ENV PYTHONUNBUFFERED=1
 
 COPY requirements.txt /requirements.txt
 
-ARG TARGETPLATFORM
-
 RUN \
  apk add --update --no-cache --virtual=build-dependencies \
     build-base \
@@ -29,19 +27,7 @@ RUN \
     file \
     nodejs \
     poppler-utils \
-    python3 \
-    glib \
-    libsm \
-    libxext \
-    libxrender && \
-  case "$TARGETPLATFORM" in \
-    linux/arm/v7|linux/arm/v8) \
-      echo "INFO: Skipping py3-opencv on $TARGETPLATFORM (using pixelmatch fallback)" \
-      ;; \
-    *) \
-      apk add --update --no-cache py3-opencv || echo "WARN: py3-opencv install failed, using pixelmatch fallback" \
-      ;; \
-  esac && \
+    python3 && \
   echo "**** pip3 install test of changedetection.io ****" && \
   python3 -m venv /lsiopy  && \
   pip install -U pip wheel setuptools && \

.github/workflows/codeql-analysis.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/containers.yml

@@ -15,7 +15,6 @@ on:
   push:
     branches:
       - master
-      - dev
 
 jobs:
   metadata:
@@ -40,14 +39,14 @@ jobs:
     # Or if we are in a tagged release scenario.
     if: ${{ github.event.workflow_run.conclusion == 'success' }} || ${{ github.event.release.tag_name }} != ''
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Set up Python 3.11
         uses: actions/setup-python@v6
         with:
           python-version: 3.11
 
       - name: Cache pip packages
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
@@ -93,10 +92,10 @@ jobs:
           version: latest
           driver-opts: image=moby/buildkit:master
 
-      # dev branch -> :dev container tag
+      # master branch -> :dev container tag
       - name: Build and push :dev
         id: docker_build
-        if: ${{ github.ref == 'refs/heads/dev' }}
+        if: ${{ github.ref }} == "refs/heads/master"
         uses: docker/build-push-action@v6
         with:
           context: ./

.github/workflows/pypi-release.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v5
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
@@ -21,7 +21,7 @@ jobs:
     - name: Build a binary wheel and a source tarball
       run: python3 -m build
     - name: Store the distribution packages
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
       with:
         name: python-package-distributions
         path: dist/
@@ -34,7 +34,7 @@ jobs:
     - build
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v6
       with:
         name: python-package-distributions
         path: dist/
@@ -93,7 +93,7 @@ jobs:
 
     steps:
     - name: Download all the dists
-      uses: actions/download-artifact@v7
+      uses: actions/download-artifact@v6
       with:
         name: python-package-distributions
         path: dist/

.github/workflows/test-container-build.yml

@@ -44,14 +44,14 @@ jobs:
           - platform: linux/arm64
             dockerfile: ./.github/test/Dockerfile-alpine
     steps:
-        - uses: actions/checkout@v6
+        - uses: actions/checkout@v5
         - name: Set up Python 3.11
           uses: actions/setup-python@v6
           with:
             python-version: 3.11
 
         - name: Cache pip packages
-          uses: actions/cache@v5
+          uses: actions/cache@v4
           with:
             path: ~/.cache/pip
             key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}

.github/workflows/test-only.yml

@@ -7,7 +7,7 @@ jobs:
   lint-code:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
       - name: Lint with Ruff
         run: |
           pip install ruff

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

@@ -21,7 +21,7 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v6
@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Cache pip packages
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-py${{ env.PYTHON_VERSION }}-${{ hashFiles('requirements.txt') }}
@@ -52,7 +52,7 @@ jobs:
           docker save test-changedetectionio -o /tmp/test-changedetectionio.tar
 
       - name: Upload Docker image artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp/test-changedetectionio.tar
@@ -66,10 +66,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -93,10 +93,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -119,7 +119,7 @@ jobs:
 
       - name: Store test artifacts
         if: always()
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: test-cdio-basic-tests-output-py${{ env.PYTHON_VERSION }}
           path: output-logs
@@ -132,10 +132,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -174,10 +174,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -214,10 +214,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -250,10 +250,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -279,10 +279,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -319,10 +319,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -350,10 +350,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp
@@ -395,10 +395,10 @@ jobs:
     env:
       PYTHON_VERSION: ${{ inputs.python-version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Download Docker image artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
         with:
           name: test-changedetectionio-${{ env.PYTHON_VERSION }}
           path: /tmp

Dockerfile

@@ -34,7 +34,6 @@ ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabihf"
 ENV OPENSSL_INCLUDE_DIR="/usr/include/openssl"
 # Additional environment variables for cryptography Rust build
 ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
-
 RUN --mount=type=cache,id=pip,sharing=locked,target=/tmp/pip-cache \
   pip install \
   --prefer-binary \
@@ -44,6 +43,7 @@ RUN --mount=type=cache,id=pip,sharing=locked,target=/tmp/pip-cache \
   --target=/dependencies \
   -r /requirements.txt
 
+
 # Playwright is an alternative to Selenium
 # Excluded this package from requirements.txt to prevent arm/v6 and arm/v7 builds from failing
 # https://github.com/dgtlmoon/changedetection.io/pull/1067 also musl/alpine (not supported)
@@ -55,25 +55,6 @@ RUN --mount=type=cache,id=pip,sharing=locked,target=/tmp/pip-cache \
   playwright~=1.56.0 \
   || echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled."
 
-# OpenCV is optional for fast image comparison (pixelmatch is the fallback)
-# Skip on arm/v7 and arm/v8 where builds take weeks - excluded from requirements.txt
-ARG TARGETPLATFORM
-RUN --mount=type=cache,id=pip,sharing=locked,target=/tmp/pip-cache \
-  case "$TARGETPLATFORM" in \
-    linux/arm/v7|linux/arm/v8) \
-      echo "INFO: Skipping OpenCV on $TARGETPLATFORM (build takes too long), using pixelmatch fallback" \
-      ;; \
-    *) \
-      pip install \
-        --prefer-binary \
-        --extra-index-url https://www.piwheels.org/simple \
-        --cache-dir=/tmp/pip-cache \
-        --target=/dependencies \
-        opencv-python-headless>=4.8.0.76 \
-        || echo "WARN: OpenCV install failed, will use pixelmatch fallback" \
-      ;; \
-  esac
-
 
 # Final image stage
 FROM python:${PYTHON_VERSION}-slim-bookworm
@@ -88,11 +69,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     # favicon type detection and other uses
     file \
     zlib1g \
-    # OpenCV dependencies for image processing
-    libglib2.0-0 \
-    libsm6 \
-    libxext6 \
-    libxrender-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 
@@ -113,9 +89,6 @@ EXPOSE 5000
 # The actual flask app module
 COPY changedetectionio /app/changedetectionio
 
-# Compile translation files for i18n support
-RUN pybabel compile -d /app/changedetectionio/translations
-
 # Also for OpenAPI validation wrapper - needs the YML
 RUN [ ! -d "/app/docs" ] && mkdir /app/docs
 COPY docs/api-spec.yaml /app/docs/api-spec.yaml

changedetectionio/__init__.py

@@ -2,11 +2,10 @@
 
 # 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.51.1'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError
-import logging
 import os
 import getopt
 import platform
@@ -20,57 +19,6 @@ from changedetectionio import store
 from changedetectionio.flask_app import changedetection_app
 from loguru import logger
 
-# ==============================================================================
-# Multiprocessing Configuration - CRITICAL for Thread Safety
-# ==============================================================================
-#
-# PROBLEM: Python 3.12+ warns about fork() with multi-threaded processes:
-#   "This process is multi-threaded, use of fork() may lead to deadlocks"
-#
-# WHY IT'S DANGEROUS:
-#   1. This Flask app has multiple threads (HTTP handlers, workers, SocketIO)
-#   2. fork() copies ONLY the calling thread to the child process
-#   3. BUT fork() also copies all locks/mutexes in their current state
-#   4. If another thread held a lock during fork() → child has locked lock with no owner
-#   5. Result: PERMANENT DEADLOCK if child tries to acquire that lock
-#
-# SOLUTION: Use 'spawn' instead of 'fork'
-#   - spawn starts a fresh Python interpreter (no inherited threads or locks)
-#   - Slower (~200ms vs ~1ms) but safe with multi-threaded parent
-#   - Consistent across all platforms (Windows already uses spawn by default)
-#
-# 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')
-#
-#   2. Global default (defense-in-depth, below):
-#      - Safety net if future code forgets explicit context
-#      - Protects against third-party libraries using Process()
-#      - Costs nothing (explicit contexts always override it)
-#
-# WHY BOTH?
-#   - Explicit contexts: Clear, self-documenting, always works
-#   - Global default: Safety net for forgotten contexts or library code
-#   - If someone writes "Process()" instead of "ctx.Process()", still safe!
-#
-# See: https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
-# ==============================================================================
-
-import multiprocessing
-import sys
-
-# Set spawn as global default (safety net - all our code uses explicit contexts anyway)
-# Skip in tests to avoid breaking pytest-flask's LiveServer fixture (uses unpicklable local functions)
-if 'pytest' not in sys.modules:
-    try:
-        if multiprocessing.get_start_method(allow_none=True) is None:
-            multiprocessing.set_start_method('spawn', force=False)
-            logger.debug("Set multiprocessing default to 'spawn' for thread safety (explicit contexts used everywhere)")
-    except RuntimeError:
-        logger.debug(f"Multiprocessing start method already set: {multiprocessing.get_start_method()}")
-
 # Only global so we can access it in the signal handler
 app = None
 datastore = None
@@ -217,11 +165,6 @@ def main():
               " WARNING, ERROR, CRITICAL")
         sys.exit(2)
 
-    # Disable verbose pyppeteer logging to prevent memory leaks from large CDP messages
-    # Set both parent and child loggers since pyppeteer hardcodes DEBUG level
-    logging.getLogger('pyppeteer.connection').setLevel(logging.WARNING)
-    logging.getLogger('pyppeteer.connection.Connection').setLevel(logging.WARNING)
-
     # isnt there some @thingy to attach to each route to tell it, that this route needs a datastore
     app_config = {'datastore_path': datastore_path}
 
@@ -244,10 +187,6 @@ def main():
         logger.critical(str(e))
         return
 
-    # Inject datastore into plugins that need access to settings
-    from changedetectionio.pluggy_interface import inject_datastore_into_plugins
-    inject_datastore_into_plugins(datastore)
-
     if default_url:
         datastore.add_watch(url = default_url)
 

changedetectionio/api/Watch.py

@@ -2,19 +2,16 @@ import os
 
 from changedetectionio.validate_url import is_safe_valid_url
 
-from . import auth
-from changedetectionio import queuedWatchMetaData, strtobool
-from changedetectionio import worker_handler
-from flask import request, make_response, send_from_directory
 from flask_expects_json import expects_json
+from changedetectionio import queuedWatchMetaData
+from changedetectionio import worker_handler
 from flask_restful import abort, Resource
-from loguru import logger
+from flask import request, make_response, send_from_directory
+from . import auth
 import copy
 
 # Import schemas from __init__.py
 from . import schema, schema_create_watch, schema_update_watch, validate_openapi_request
-from ..notification import valid_notification_formats
-from ..notification.handler import newline_re
 
 
 def validate_time_between_check_required(json_data):
@@ -128,60 +125,7 @@ class Watch(Resource):
         if request.json.get('url') and not is_safe_valid_url(request.json.get('url')):
             return "Invalid URL", 400
 
-        # Handle processor-config-* fields separately (save to JSON, not datastore)
-        from changedetectionio import processors
-        processor_config_data = {}
-        regular_data = {}
-
-        for key, value in request.json.items():
-            if key.startswith('processor_config_'):
-                config_key = key.replace('processor_config_', '')
-                if value:  # Only save non-empty values
-                    processor_config_data[config_key] = value
-            else:
-                regular_data[key] = value
-
-        # Update watch with regular (non-processor-config) fields
-        watch.update(regular_data)
-
-        # Save processor config to JSON file if any config data exists
-        if processor_config_data:
-            try:
-                processor_name = request.json.get('processor', watch.get('processor'))
-                if processor_name:
-                    # Create a processor instance to access config methods
-                    from changedetectionio.processors import difference_detection_processor
-                    processor_instance = difference_detection_processor(self.datastore, uuid)
-                    # Use processor name as filename so each processor keeps its own config
-                    config_filename = f'{processor_name}.json'
-                    processor_instance.update_extra_watch_config(config_filename, processor_config_data)
-                    logger.debug(f"API: Saved processor config to {config_filename}: {processor_config_data}")
-
-                    # Call optional edit_hook if processor has one
-                    try:
-                        import importlib
-                        edit_hook_module_name = f'changedetectionio.processors.{processor_name}.edit_hook'
-
-                        try:
-                            edit_hook = importlib.import_module(edit_hook_module_name)
-                            logger.debug(f"API: Found edit_hook module for {processor_name}")
-
-                            if hasattr(edit_hook, 'on_config_save'):
-                                logger.info(f"API: Calling edit_hook.on_config_save for {processor_name}")
-                                # Call hook and get updated config
-                                updated_config = edit_hook.on_config_save(watch, processor_config_data, self.datastore)
-                                # Save updated config back to file
-                                processor_instance.update_extra_watch_config(config_filename, updated_config)
-                                logger.info(f"API: Edit hook updated config: {updated_config}")
-                            else:
-                                logger.debug(f"API: Edit hook module found but no on_config_save function")
-                        except ModuleNotFoundError:
-                            logger.debug(f"API: No edit_hook module for processor {processor_name} (this is normal)")
-                    except Exception as hook_error:
-                        logger.error(f"API: Edit hook error (non-fatal): {hook_error}", exc_info=True)
-
-            except Exception as e:
-                logger.error(f"API: Failed to save processor config: {e}")
+        watch.update(request.json)
 
         return "OK", 200
 
@@ -237,114 +181,6 @@ class WatchSingleHistory(Resource):
 
         return response
 
-class WatchHistoryDiff(Resource):
-    """
-    Generate diff between two historical snapshots.
-
-    Note: This API endpoint currently returns text-based diffs and works best
-    with the text_json_diff processor. Future processor types (like image_diff,
-    restock_diff) may want to implement their own specialized API endpoints
-    for returning processor-specific data (e.g., price charts, image comparisons).
-
-    The web UI diff page (/diff/<uuid>) is processor-aware and delegates rendering
-    to processors/{type}/difference.py::render() for processor-specific visualizations.
-    """
-    def __init__(self, **kwargs):
-        # datastore is a black box dependency
-        self.datastore = kwargs['datastore']
-
-    @auth.check_token
-    @validate_openapi_request('getWatchHistoryDiff')
-    def get(self, uuid, from_timestamp, to_timestamp):
-        """Generate diff between two historical snapshots."""
-        from changedetectionio import diff
-        from changedetectionio.notification.handler import apply_service_tweaks
-
-        watch = self.datastore.data['watching'].get(uuid)
-        if not watch:
-            abort(404, message=f"No watch exists with the UUID of {uuid}")
-
-        if not len(watch.history):
-            abort(404, message=f"Watch found but no history exists for the UUID {uuid}")
-
-        history_keys = list(watch.history.keys())
-
-        # Handle 'latest' keyword for to_timestamp
-        if to_timestamp == 'latest':
-            to_timestamp = history_keys[-1]
-
-        # Handle 'previous' keyword for from_timestamp (second-most-recent)
-        if from_timestamp == 'previous':
-            if len(history_keys) < 2:
-                abort(404, message=f"Not enough history entries. Need at least 2 snapshots for 'previous'")
-            from_timestamp = history_keys[-2]
-
-        # Validate timestamps exist
-        if from_timestamp not in watch.history:
-            abort(404, message=f"From timestamp {from_timestamp} not found in watch history")
-        if to_timestamp not in watch.history:
-            abort(404, message=f"To timestamp {to_timestamp} not found in watch history")
-
-        # Get the format parameter (default to 'text')
-        output_format = request.args.get('format', 'text').lower()
-
-        # Validate format
-        if output_format not in valid_notification_formats.keys():
-            abort(400, message=f"Invalid format. Must be one of: {', '.join(valid_notification_formats.keys())}")
-
-        # Get the word_diff parameter (default to False - line-level mode)
-        word_diff = strtobool(request.args.get('word_diff', 'false'))
-
-        # Get the no_markup parameter (default to False)
-        no_markup = strtobool(request.args.get('no_markup', 'false'))
-
-        # Retrieve snapshot contents
-        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
-        }
-
-        # Generate the diff
-        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'),
-            word_diff=word_diff,
-        )
-
-        # Skip formatting if no_markup is set
-        if no_markup:
-            mimetype = "text/plain"
-        else:
-            # Apply formatting based on the requested format
-            if output_format == 'htmlcolor':
-                from changedetectionio.notification.handler import apply_html_color_to_body
-                content = apply_html_color_to_body(n_body=content)
-                mimetype = "text/html"
-            else:
-                # Apply service tweaks for text/html formats
-                # Pass empty URL and title as they're not used for the placeholder replacement we need
-                _, content, _ = apply_service_tweaks(
-                    url='',
-                    n_body=content,
-                    n_title='',
-                    requested_output_format=output_format
-                )
-                mimetype = "text/html" if output_format == 'html' else "text/plain"
-
-            if 'html' in output_format:
-                content = newline_re.sub('<br>\r\n', content)
-
-        response = make_response(content, 200)
-        response.mimetype = mimetype
-        return response
-
-
 class WatchFavicon(Resource):
     def __init__(self, **kwargs):
         # datastore is a black box dependency

changedetectionio/api/__init__.py

@@ -51,7 +51,6 @@ def validate_openapi_request(operation_id):
     def decorator(f):
         @functools.wraps(f)
         def wrapper(*args, **kwargs):
-            from werkzeug.exceptions import BadRequest
             try:
                 # Skip OpenAPI validation for GET requests since they don't have request bodies
                 if request.method.upper() != 'GET':
@@ -62,6 +61,7 @@ def validate_openapi_request(operation_id):
                     openapi_request = FlaskOpenAPIRequest(request)
                     result = spec.unmarshal_request(openapi_request)
                     if result.errors:
+                        from werkzeug.exceptions import BadRequest
                         error_details = []
                         for error in result.errors:
                             error_details.append(str(error))
@@ -78,7 +78,7 @@ def validate_openapi_request(operation_id):
     return decorator
 
 # Import all API resources
-from .Watch import Watch, WatchHistory, WatchSingleHistory, WatchHistoryDiff, CreateWatch, WatchFavicon
+from .Watch import Watch, WatchHistory, WatchSingleHistory, CreateWatch, WatchFavicon
 from .Tags import Tags, Tag
 from .Import import Import
 from .SystemInfo import SystemInfo

changedetectionio/async_update_worker.py

@@ -1,5 +1,3 @@
-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
@@ -42,13 +40,13 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
         try:
             # Use native janus async interface - no threads needed!
             queued_item_data = await asyncio.wait_for(q.async_get(), timeout=1.0)
-
+            
         except asyncio.TimeoutError:
             # No jobs available, continue loop
             continue
         except Exception as e:
             logger.critical(f"CRITICAL: Worker {worker_id} failed to get queue item: {type(e).__name__}: {e}")
-
+            
             # Log queue health for debugging
             try:
                 queue_size = q.qsize()
@@ -56,28 +54,15 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                 logger.critical(f"CRITICAL: Worker {worker_id} queue health - size: {queue_size}, empty: {is_empty}")
             except Exception as health_e:
                 logger.critical(f"CRITICAL: Worker {worker_id} queue health check failed: {health_e}")
-
+            
             await asyncio.sleep(0.1)
             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(uuid):
-            logger.trace(f"Worker {worker_id} skipping UUID {uuid} - already being processed, re-queuing for later")
-            # Re-queue with MUCH lower priority (higher number = processed later)
-            # This prevents tight loop where high-priority item keeps getting picked immediately
-            deferred_priority = max(1000, queued_item_data.priority * 10)
-            deferred_item = PrioritizedItem(priority=deferred_priority, item=queued_item_data.item)
-            worker_handler.queue_item_async_safe(q, deferred_item, silent=True)
-            await asyncio.sleep(0.1)  # Brief pause to avoid tight loop
-            continue
-
         fetch_start_time = round(time.time())
-
+        
         # Mark this UUID as being processed
+        from changedetectionio import worker_handler
         worker_handler.set_uuid_processing(uuid, processing=True)
         
         try:
@@ -102,8 +87,9 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                     processor = watch.get('processor', 'text_json_diff')
 
                     # Init a new 'difference_detection_processor'
+                    processor_module_name = f"changedetectionio.processors.{processor}.processor"
                     try:
-                        processor_module = importlib.import_module(f"changedetectionio.processors.{processor}.processor")
+                        processor_module = importlib.import_module(processor_module_name)
                     except ModuleNotFoundError as e:
                         print(f"Processor module '{processor}' not found.")
                         raise e
@@ -111,9 +97,6 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                     update_handler = processor_module.perform_site_check(datastore=datastore,
                                                                          watch_uuid=uuid)
 
-                    update_signal = signal('watch_small_status_comment')
-                    update_signal.send(watch_uuid=uuid, status="Fetching page..")
-
                     # All fetchers are now async, so call directly
                     await update_handler.call_browser()
 
@@ -326,7 +309,6 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                 if not datastore.data['watching'].get(uuid):
                     continue
 
-                logger.debug(f"Processing watch UUID: {uuid} - xpath_data length returned {len(update_handler.xpath_data) if update_handler.xpath_data else 'empty.'}")
                 if process_changedetection_results:
                     try:
                         datastore.update_watch(uuid=uuid, update_obj=update_obj)
@@ -344,7 +326,7 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                                 fetch_start_time += 1
                                 await asyncio.sleep(1)
 
-                            watch.save_history_blob(contents=contents,
+                            watch.save_history_text(contents=contents,
                                                     timestamp=int(fetch_start_time),
                                                     snapshot_id=update_obj.get('previous_md5', 'none'))
 
@@ -412,12 +394,6 @@ 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:
@@ -451,10 +427,6 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore):
                     # 3. GC can't collect the object anyway (still referenced by datastore)
                     # 4. It would just cause confusion
 
-                    # Force garbage collection after cleanup
-                    import gc
-                    gc.collect()
-
                     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}")

changedetectionio/blueprint/backups/templates/overview.html

@@ -3,31 +3,31 @@
     {% from '_helpers.html' import render_simple_field, render_field %}
     <div class="edit-form">
         <div class="box-wrap inner">
-            <h4>{{ _('Backups') }}</h4>
+            <h4>Backups</h4>
             {% if backup_running %}
                 <p>
-                    <strong>{{ _('A backup is running!') }}</strong>
+                    <strong>A backup is running!</strong>
                 </p>
             {% endif %}
             <p>
-                {{ _('Here you can download and request a new backup, when a backup is completed you will see it listed below.') }}
+                Here you can download and request a new backup, when a backup is completed you will see it listed below.
             </p>
             <br>
                 {% if available_backups %}
                     <ul>
                     {% for backup in available_backups %}
-                        <li><a href="{{ url_for('backups.download_backup', filename=backup["filename"]) }}">{{ backup["filename"] }}</a> {{  backup["filesize"] }} {{ _('Mb') }}</li>
+                        <li><a href="{{ url_for('backups.download_backup', filename=backup["filename"]) }}">{{ backup["filename"] }}</a> {{  backup["filesize"] }} Mb</li>
                     {% endfor %}
                     </ul>
                 {% else %}
                     <p>
-                    <strong>{{ _('No backups found.') }}</strong>
+                    <strong>No backups found.</strong>
                     </p>
                 {% endif %}
 
-            <a class="pure-button pure-button-primary" href="{{ url_for('backups.request_backup') }}">{{ _('Create backup') }}</a>
+            <a class="pure-button pure-button-primary" href="{{ url_for('backups.request_backup') }}">Create backup</a>
             {% if available_backups %}
-                <a class="pure-button button-small button-error " href="{{ url_for('backups.remove_backups') }}">{{ _('Remove backups') }}</a>
+                <a class="pure-button button-small button-error " href="{{ url_for('backups.remove_backups') }}">Remove backups</a>
             {% endif %}
         </div>
     </div>

changedetectionio/blueprint/browser_steps/browser_steps.py

@@ -439,7 +439,7 @@ class browsersteps_live_ui(steppable_browser_interface):
             logger.warning("Attempted to get current state after cleanup")
             return (None, None)
 
-        xpath_element_js = importlib.resources.files("changedetectionio.content_fetchers.res").joinpath('xpath_element_scraper.js').read_text(encoding="utf-8")
+        xpath_element_js = importlib.resources.files("changedetectionio.content_fetchers.res").joinpath('xpath_element_scraper.js').read_text()
 
         now = time.time()
         await self.page.wait_for_timeout(1 * 1000)

changedetectionio/blueprint/imports/templates/import.html

@@ -6,9 +6,9 @@
 
     <div class="tabs collapsable">
         <ul>
-            <li class="tab" id=""><a href="#url-list">{{ _('URL List') }}</a></li>
-            <li class="tab"><a href="#distill-io">{{ _('Distill.io') }}</a></li>
-            <li class="tab"><a href="#xlsx">{{ _('.XLSX & Wachete') }}</a></li>
+            <li class="tab" id=""><a href="#url-list">URL List</a></li>
+            <li class="tab"><a href="#distill-io">Distill.io</a></li>
+            <li class="tab"><a href="#xlsx">.XLSX &amp; Wachete</a></li>
         </ul>
     </div>
 
@@ -17,10 +17,11 @@
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="tab-pane-inner" id="url-list">
                 <div class="pure-control-group">
-                        {{ _('Enter one URL per line, and optionally add tags for each URL after a space, delineated by comma (,):') }}
+                        Enter one URL per line, and optionally add tags for each URL after a space, delineated by comma
+                        (,):
                         <br>
-                        <p><strong>{{ _('Example:') }}  </strong><code>https://example.com tag1, tag2, last tag</code></p>
-                        {{ _('URLs which do not pass validation will stay in the textarea.') }}
+                        <p><strong>Example:  </strong><code>https://example.com tag1, tag2, last tag</code></p>
+                        URLs which do not pass validation will stay in the textarea.
                 </div>
                 {{ render_field(form.processor, class="processor") }}
                 
@@ -41,12 +42,12 @@
 
 
                     <div class="pure-control-group">
-                        {{ _('Copy and Paste your Distill.io watch \'export\' file, this should be a JSON file.') }}<br>
-                        {{ _('This is') }} <i>{{ _('experimental') }}</i>, {{ _('supported fields are') }} <code>name</code>, <code>uri</code>, <code>tags</code>, <code>config:selections</code>, {{ _('the rest (including') }} <code>schedule</code>) {{ _('are ignored.') }}
+                        Copy and Paste your Distill.io watch 'export' file, this should be a JSON file.<br>
+                        This is <i>experimental</i>, supported fields are <code>name</code>, <code>uri</code>, <code>tags</code>, <code>config:selections</code>, the rest (including <code>schedule</code>) are ignored.
                         <br>
                         <p>
-                        {{ _('How to export?') }} <a href="https://distill.io/docs/web-monitor/how-export-and-import-monitors/">https://distill.io/docs/web-monitor/how-export-and-import-monitors/</a><br>
-                        {{ _('Be sure to set your default fetcher to Chrome if required.') }}<br>
+                        How to export? <a href="https://distill.io/docs/web-monitor/how-export-and-import-monitors/">https://distill.io/docs/web-monitor/how-export-and-import-monitors/</a><br>
+                        Be sure to set your default fetcher to Chrome if required.<br>
                         </p>
                     </div>
 
@@ -88,32 +89,32 @@
             </fieldset>
                 <div class="pure-control-group">
                 <span class="pure-form-message-inline">
-                    {{ _('Table of custom column and data types mapping for the') }} <strong>{{ _('Custom mapping') }}</strong> {{ _('File mapping type.') }}
+                    Table of custom column and data types mapping for the <strong>Custom mapping</strong> File mapping type.
                 </span>
                     <table style="border: 1px solid #aaa; padding: 0.5rem; border-radius: 4px;">
                         <tr>
-                            <td><strong>{{ _('Column #') }}</strong></td>
+                            <td><strong>Column #</strong></td>
                             {% for n in range(4) %}
                                 <td><input type="number" name="custom_xlsx[col_{{n}}]" style="width: 4rem;" min="1"></td>
                             {%  endfor %}
                         </tr>
                         <tr>
-                            <td><strong>{{ _('Type') }}</strong></td>
+                            <td><strong>Type</strong></td>
                             {% for n in range(4) %}
                                 <td><select name="custom_xlsx[col_type_{{n}}]">
-                                    <option value="" style="color: #aaa"> -- {{ _('none') }} --</option>
-                                    <option value="url">{{ _('URL') }}</option>
-                                    <option value="title">{{ _('Title') }}</option>
-                                    <option value="include_filters">{{ _('CSS/xPath filter') }}</option>
-                                    <option value="tag">{{ _('Group / Tag name(s)') }}</option>
-                                    <option value="interval_minutes">{{ _('Recheck time (minutes)') }}</option>
+                                    <option value="" style="color: #aaa"> -- none --</option>
+                                    <option value="url">URL</option>
+                                    <option value="title">Title</option>
+                                    <option value="include_filters">CSS/xPath filter</option>
+                                    <option value="tag">Group / Tag name(s)</option>
+                                    <option value="interval_minutes">Recheck time (minutes)</option>
                                 </select></td>
                             {%  endfor %}
                         </tr>
                     </table>
                 </div>
             </div>
-            <button type="submit" class="pure-button pure-input-1-2 pure-button-primary">{{ _('Import') }}</button>
+            <button type="submit" class="pure-button pure-input-1-2 pure-button-primary">Import</button>
         </form>
 
     </div>

changedetectionio/blueprint/rss/main_feed.py

@@ -81,7 +81,7 @@ def construct_main_feed_routes(rss_blueprint, datastore):
                 timestamp_from = dates[-2]
                 guid = generate_watch_guid(watch, timestamp_to)
                 # Because we are called via whatever web server, flask should figure out the right path
-                diff_link = {'href': url_for('ui.ui_diff.diff_history_page', uuid=watch['uuid'], _external=True)}
+                diff_link = {'href': url_for('ui.ui_views.diff_history_page', uuid=watch['uuid'], _external=True)}
 
                 # Get template and build notification context
                 n_body_template = get_rss_template(datastore, watch, rss_content_format,

changedetectionio/blueprint/rss/tag.py

@@ -67,7 +67,7 @@ def construct_tag_routes(rss_blueprint, datastore):
                 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)}
+                diff_link = {'href': url_for('ui.ui_views.diff_history_page', uuid=watch['uuid'], _external=True)}
 
                 # Get watch label
                 watch_label = get_watch_label(datastore, watch)

changedetectionio/blueprint/settings/__init__.py

@@ -17,12 +17,6 @@ def construct_blueprint(datastore: ChangeDetectionStore):
     @login_optionally_required
     def settings_page():
         from changedetectionio import forms
-        from changedetectionio.pluggy_interface import (
-            get_plugin_settings_tabs,
-            load_plugin_settings,
-            save_plugin_settings
-        )
-
 
         default = deepcopy(datastore.data['settings'])
         if datastore.proxy_list is not None:
@@ -108,20 +102,6 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                     return redirect(url_for('watchlist.index'))
 
                 datastore.needs_write_urgent = True
-
-                # Also save plugin settings from the same form submission
-                plugin_tabs_list = get_plugin_settings_tabs()
-                for tab in plugin_tabs_list:
-                    plugin_id = tab['plugin_id']
-                    form_class = tab['form_class']
-
-                    # Instantiate plugin form with POST data
-                    plugin_form = form_class(formdata=request.form)
-
-                    # Save plugin settings (validation is optional for plugins)
-                    if plugin_form.data:
-                        save_plugin_settings(datastore.datastore_path, plugin_id, plugin_form.data)
-
                 flash("Settings updated.")
 
             else:
@@ -130,30 +110,8 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         # Convert to ISO 8601 format, all date/time relative events stored as UTC time
         utc_time = datetime.now(ZoneInfo("UTC")).isoformat()
 
-        # Get active plugins
-        from changedetectionio.pluggy_interface import get_active_plugins
-        import sys
-        active_plugins = get_active_plugins()
-        python_version = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
-
-        # Get plugin settings tabs and instantiate forms
-        plugin_tabs = get_plugin_settings_tabs()
-        plugin_forms = {}
-
-        for tab in plugin_tabs:
-            plugin_id = tab['plugin_id']
-            form_class = tab['form_class']
-
-            # Load existing settings
-            settings = load_plugin_settings(datastore.datastore_path, plugin_id)
-
-            # Instantiate the form with existing settings
-            plugin_forms[plugin_id] = form_class(data=settings)
-
         output = render_template("settings.html",
-                                active_plugins=active_plugins,
                                 api_key=datastore.data['settings']['application'].get('api_access_token'),
-                                python_version=python_version,
                                 available_timezones=sorted(available_timezones()),
                                 emailprefix=os.getenv('NOTIFICATION_MAIL_BUTTON_PREFIX', False),
                                 extra_notification_token_placeholder_info=datastore.get_unique_notification_token_placeholders_available(),
@@ -163,8 +121,6 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                                 settings_application=datastore.data['settings']['application'],
                                 timezone_default_config=datastore.data['settings']['application'].get('scheduler_timezone_default'),
                                 utc_time=utc_time,
-                                plugin_tabs=plugin_tabs,
-                                plugin_forms=plugin_forms,
                                 )
 
         return output

changedetectionio/blueprint/settings/templates/notification-log.html

@@ -4,7 +4,7 @@
 <div class="edit-form">
      <div class="inner">
 
-         <h4 style="margin-top: 0px;">{{ _('Notification debug log') }}</h4>
+         <h4 style="margin-top: 0px;">Notification debug log</h4>
                 <div id="notification-error-log">
                 <ul style="font-size: 80%; margin:0px; padding: 0 0 0 7px">
                 {% for log in logs|reverse %}

changedetectionio/blueprint/settings/templates/settings.html

@@ -18,21 +18,15 @@
 <div class="edit-form">
     <div class="tabs collapsable">
         <ul>
-            <li class="tab" id=""><a href="#general">{{ _('General') }}</a></li>
-            <li class="tab"><a href="#notifications">{{ _('Notifications') }}</a></li>
-            <li class="tab"><a href="#fetching">{{ _('Fetching') }}</a></li>
-            <li class="tab"><a href="#filters">{{ _('Global Filters') }}</a></li>
-            <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="#timedate">{{ _('Time & Date') }}</a></li>
-            <li class="tab"><a href="#proxies">{{ _('CAPTCHA & Proxies') }}</a></li>
-            {% if plugin_tabs %}
-                {% for tab in plugin_tabs %}
-            <li class="tab"><a href="#plugin-{{ tab.plugin_id }}">{{ tab.tab_label }}</a></li>
-                {% endfor %}
-            {% endif %}
-            <li class="tab"><a href="#info">{{ _('Info') }}</a></li>
+            <li class="tab" id=""><a href="#general">General</a></li>
+            <li class="tab"><a href="#notifications">Notifications</a></li>
+            <li class="tab"><a href="#fetching">Fetching</a></li>
+            <li class="tab"><a href="#filters">Global Filters</a></li>
+            <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="#timedate">Time &amp Date</a></li>
+            <li class="tab"><a href="#proxies">CAPTCHA &amp; Proxies</a></li>
         </ul>
     </div>
     <div class="box-wrap inner">
@@ -42,12 +36,11 @@
                 <fieldset>
                     <div class="pure-control-group">
                         {{ render_field(form.requests.form.time_between_check, class="time-check-widget") }}
-
-                        <span class="pure-form-message-inline">{{ _('Default recheck time for all watches, current system minimum is') }} <i>{{min_system_recheck_seconds}}</i> {{ _('seconds') }} (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Misc-system-settings#enviroment-variables">{{ _('more info') }}</a>).</span>
+                        <span class="pure-form-message-inline">Default recheck time for all watches, current system minimum is <i>{{min_system_recheck_seconds}}</i> seconds (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Misc-system-settings#enviroment-variables">more info</a>).</span>
                             <div id="time-between-check-schedule">
-                                <!-- Start Time and End Time {{ timezone_default_config }} -->
+                                <!-- Start Time and End Time -->
                                 <div id="limit-between-time">
-                                   {{ render_time_schedule_form(form.requests, available_timezones, timezone_default_config) }}
+                                    {{ render_time_schedule_form(form.requests, available_timezones, timezone_default_config) }}
                                 </div>
                         </div>
                     </div>
@@ -359,51 +352,13 @@ nav
                     </p>
                     {{ render_fieldlist_with_inline_errors(form.requests.form.extra_browsers) }}
                 </div>
-            </div>
-            {% if plugin_tabs %}
-                {% for tab in plugin_tabs %}
-            <div class="tab-pane-inner" id="plugin-{{ tab.plugin_id }}">
-                {% set plugin_form = plugin_forms[tab.plugin_id] %}
-                {% if tab.template_path %}
-                    {# Plugin provides custom template - include it directly (no separate form) #}
-                    {% include tab.template_path with context %}
-                {% else %}
-                    {# Default form rendering - fields only, no submit button #}
-                    <fieldset>
-                        {% for field in plugin_form %}
-                            {% if field.type != 'CSRFToken' and field.type != 'SubmitField' %}
-                        <div class="pure-control-group">
-                                {% if field.type == 'BooleanField' %}
-                            {{ render_checkbox_field(field) }}
-                                {% else %}
-                            {{ render_field(field) }}
-                                {% endif %}
-                        </div>
-                            {% endif %}
-                        {% endfor %}
-                    </fieldset>
-                {% endif %}
-            </div>
-                {% endfor %}
-            {% endif %}
-            <div class="tab-pane-inner" id="info">
-                <p><strong>{{ _('Python version:') }}</strong> {{ python_version }}</p>
-                <p><strong>{{ _('Plugins active:') }}</strong></p>
-                {% if active_plugins %}
-                <ul>
-                    {% for plugin in active_plugins %}
-                    <li><strong>{{ plugin.name }}</strong> - {{ plugin.description }}</li>
-                    {% endfor %}
-                </ul>
-                {% else %}
-                <p>{{ _('No plugins active') }}</p>
-                {% endif %}
+            
             </div>
             <div id="actions">
                 <div class="pure-control-group">
                     {{ render_button(form.save_button) }}
-                    <a href="{{url_for('watchlist.index')}}" class="pure-button button-cancel">{{ _('Back') }}</a>
-                    <a href="{{url_for('ui.clear_all_history')}}" class="pure-button button-error">{{ _('Clear Snapshot History') }}</a>
+                    <a href="{{url_for('watchlist.index')}}" class="pure-button button-cancel">Back</a>
+                    <a href="{{url_for('ui.clear_all_history')}}" class="pure-button button-error">Clear Snapshot History</a>
                 </div>
             </div>
         </form>

changedetectionio/blueprint/tags/templates/edit-tag.html

@@ -24,12 +24,12 @@
 
     <div class="tabs collapsable">
         <ul>
-            <li class="tab" id=""><a href="#general">{{ _('General') }}</a></li>
-            <li class="tab"><a href="#filters-and-triggers">{{ _('Filters & Triggers') }}</a></li>
+            <li class="tab" id=""><a href="#general">General</a></li>
+            <li class="tab"><a href="#filters-and-triggers">Filters &amp; Triggers</a></li>
             {% if extra_tab_content %}
             <li class="tab"><a href="#extras_tab">{{ extra_tab_content }}</a></li>
             {% endif %}
-            <li class="tab"><a href="#notifications">{{ _('Notifications') }}</a></li>
+            <li class="tab"><a href="#notifications">Notifications</a></li>
         </ul>
     </div>
 
@@ -47,10 +47,10 @@
             </div>
 
             <div class="tab-pane-inner" id="filters-and-triggers">
-                <p>{{ _('These settings are') }} <strong><i>{{ _('added') }}</i></strong> {{ _('to any existing watch configurations.') }}</p>
+                <p>These settings are <strong><i>added</i></strong> to any existing watch configurations.</p>
                 {% include "edit/include_subtract.html" %}
                 <div class="text-filtering border-fieldset">
-                    <h3>{{ _('Text filtering') }}</h3>
+                    <h3>Text filtering</h3>
                     {% include "edit/text-options.html" %}
                 </div>
             </div>
@@ -70,18 +70,18 @@
                     <div class="pure-control-group inline-radio">
                       {{ render_checkbox_field(form.notification_screenshot) }}
                         <span class="pure-form-message-inline">
-                            <strong>{{ _('Use with caution!') }}</strong> {{ _('This will easily fill up your email storage quota or flood other storages.') }}
+                            <strong>Use with caution!</strong> This will easily fill up your email storage quota or flood other storages.
                         </span>
                     </div>
                     {% endif %}
                     <div class="field-group" id="notification-field-group">
                         {% if has_default_notification_urls %}
                         <div class="inline-warning">
-                            <img class="inline-warning-icon" src="{{url_for('static_content', group='images', filename='notice.svg')}}" alt="{{ _('Look out!') }}" title="{{ _('Lookout!') }}" >
-                            {{ _('There are') }} <a href="{{ url_for('settings.settings_page')}}#notifications">{{ _('system-wide notification URLs enabled') }}</a>, {{ _('this form will override notification settings for this watch only') }} &dash; {{ _('an empty Notification URL list here will still send notifications.') }}
+                            <img class="inline-warning-icon" src="{{url_for('static_content', group='images', filename='notice.svg')}}" alt="Look out!" title="Lookout!" >
+                            There are <a href="{{ url_for('settings.settings_page')}}#notifications">system-wide notification URLs enabled</a>, this form will override notification settings for this watch only &dash; an empty Notification URL list here will still send notifications.
                         </div>
                         {% endif %}
-                        <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="right: 20px; top: 20px; position: absolute; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">{{ _('Use system defaults') }}</a>
+                        <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="right: 20px; top: 20px; position: absolute; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">Use system defaults</a>
 
                         {{ render_common_settings_form(form, emailprefix, settings_application, extra_notification_token_placeholder_info) }}
                     </div>

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

@@ -2,23 +2,22 @@
 {% block content %}
 {% from '_helpers.html' import render_simple_field, render_field %}
 <script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
-<script src="{{url_for('static_content', group='js', filename='modal.js')}}"></script>
 
 <div class="box">
     <form class="pure-form" action="{{ url_for('tags.form_tag_add') }}" method="POST" id="new-watch-form">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" >
         <fieldset>
-            <legend>{{ _('Add a new organisational tag') }}</legend>
+            <legend>Add a new organisational tag</legend>
             <div id="watch-add-wrapper-zone">
                 <div>
-                    {{ render_simple_field(form.name, placeholder=_("Watch group / tag")) }}
+                    {{ render_simple_field(form.name, placeholder="Watch group / tag") }}
                 </div>
                 <div>
-                    {{ render_simple_field(form.save_button, title=_("Save") ) }}
+                    {{ render_simple_field(form.save_button, title="Save" ) }}
                 </div>
             </div>
             <br>
-            <div style="color: #fff;">{{ _('Groups allows you to manage filters and notifications for multiple watches under a single organisational tag.') }}</div>
+            <div style="color: #fff;">Groups allows you to manage filters and notifications for multiple watches under a single organisational tag.</div>
         </fieldset>
     </form>
     <!-- @todo maybe some overview matrix, 'tick' with which has notification, filter rules etc -->
@@ -28,8 +27,8 @@
             <thead>
             <tr>
                 <th></th>
-                <th>{{ _('# Watches') }}</th>
-                <th>{{ _('Tag / Label name') }}</th>
+                <th># Watches</th>
+                <th>Tag / Label name</th>
                 <th></th>
             </tr>
             </thead>
@@ -39,7 +38,7 @@
             --->
             {% if not available_tags|length %}
             <tr>
-                <td colspan="3">{{ _('No website organisational tags/groups configured') }}</td>
+                <td colspan="3">No website organisational tags/groups configured</td>
             </tr>
             {% endif %}
             {% for uuid, tag in available_tags  %}
@@ -50,24 +49,10 @@
                 <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 button-error"
-                       href="{{ url_for('tags.delete', uuid=uuid) }}"
-                       data-requires-confirm
-                       data-confirm-type="danger"
-                       data-confirm-title="{{ _('Delete Group?') }}"
-                       data-confirm-message="{{ _('<p>Are you sure you want to delete group <strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>', title=tag.title) }}"
-                       data-confirm-button="{{ _('Delete') }}"
-                       title="{{ _('Deletes and removes tag') }}">{{ _('Delete') }}</a>
-                    <a class="pure-button button-warning"
-                       href="{{ url_for('tags.unlink', uuid=uuid) }}"
-                       data-requires-confirm
-                       data-confirm-type="warning"
-                       data-confirm-title="{{ _('Unlink Group?') }}"
-                       data-confirm-message="{{ _('<p>Are you sure you want to unlink all watches from group <strong>%(title)s</strong>?</p><p>The tag will be kept but watches will be removed from it.</p>', title=tag.title) }}"
-                       data-confirm-button="{{ _('Unlink') }}"
-                       title="{{ _('Keep the tag but unlink any watches') }}">{{ _('Unlink') }}</a>
-                    <a href="{{ url_for('rss.rss_tag_feed', tag_uuid=uuid, token=app_rss_token)}}"><img alt="{{ _('RSS Feed for this watch') }}" style="padding-left: 1em;" src="{{url_for('static_content', group='images', filename='generic_feed-icon.svg')}}" height="15"></a>
+                    <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.delete', uuid=uuid) }}" title="Deletes and removes tag">Delete</a>
+                    <a class="pure-button pure-button-primary" href="{{ url_for('tags.unlink', uuid=uuid) }}" title="Keep the tag but unlink any watches">Unlink</a>
+                    <a href="{{ url_for('rss.rss_tag_feed', tag_uuid=uuid, token=app_rss_token)}}"><img alt="RSS Feed for this watch" style="padding-left: 1em;" src="{{url_for('static_content', group='images', filename='generic_feed-icon.svg')}}" height="15"></a>
                 </td>
             </tr>
             {% endfor %}

changedetectionio/blueprint/ui/__init__.py

@@ -6,7 +6,6 @@ from changedetectionio.store import ChangeDetectionStore
 from changedetectionio.blueprint.ui.edit import construct_blueprint as construct_edit_blueprint
 from changedetectionio.blueprint.ui.notification import construct_blueprint as construct_notification_blueprint
 from changedetectionio.blueprint.ui.views import construct_blueprint as construct_views_blueprint
-from changedetectionio.blueprint.ui import diff, preview
 
 def _handle_operations(op, uuids, datastore, worker_handler, update_q, queuedWatchMetaData, watch_check_update, extra_data=None, emit_flash=True):
     from flask import request, flash
@@ -122,13 +121,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_handle
     views_blueprint = construct_views_blueprint(datastore, update_q, queuedWatchMetaData, watch_check_update)
     ui_blueprint.register_blueprint(views_blueprint)
 
-    # Register diff and preview blueprints
-    diff_blueprint = diff.construct_blueprint(datastore)
-    ui_blueprint.register_blueprint(diff_blueprint)
-
-    preview_blueprint = preview.construct_blueprint(datastore)
-    ui_blueprint.register_blueprint(preview_blueprint)
-
     # Import the login decorator
     from changedetectionio.auth_decorator import login_optionally_required
 
@@ -257,7 +249,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, worker_handle
         if i == 0:
             flash("No watches available to recheck.")
 
-        return redirect(url_for('watchlist.index', **({'tag': tag} if tag else {})))
+        return redirect(url_for('watchlist.index'))
 
     @ui_blueprint.route("/form/checkbox-operations", methods=['POST'])
     @login_optionally_required

changedetectionio/blueprint/ui/diff.py

@@ -1,316 +0,0 @@
-from flask import Blueprint, request, redirect, url_for, flash, render_template, make_response, send_from_directory
-
-import re
-import importlib
-from loguru import logger
-from markupsafe import Markup
-
-from changedetectionio.diff import (
-    REMOVED_STYLE, ADDED_STYLE, REMOVED_INNER_STYLE, ADDED_INNER_STYLE,
-    REMOVED_PLACEMARKER_OPEN, REMOVED_PLACEMARKER_CLOSED,
-    ADDED_PLACEMARKER_OPEN, ADDED_PLACEMARKER_CLOSED,
-    CHANGED_PLACEMARKER_OPEN, CHANGED_PLACEMARKER_CLOSED,
-    CHANGED_INTO_PLACEMARKER_OPEN, CHANGED_INTO_PLACEMARKER_CLOSED
-)
-from changedetectionio.store import ChangeDetectionStore
-from changedetectionio.auth_decorator import login_optionally_required
-
-
-def construct_blueprint(datastore: ChangeDetectionStore):
-    diff_blueprint = Blueprint('ui_diff', __name__, template_folder="../ui/templates")
-
-    @diff_blueprint.app_template_filter('diff_unescape_difference_spans')
-    def diff_unescape_difference_spans(content):
-        """Emulate Jinja2's auto-escape, then selectively unescape our diff spans."""
-        from markupsafe import escape
-
-        if not content:
-            return Markup('')
-
-        # Step 1: Escape everything like Jinja2 would (this makes it XSS-safe)
-        escaped_content = escape(str(content))
-
-        # Step 2: Unescape only our exact diff spans generated by apply_html_color_to_body()
-        # Pattern matches the exact structure:
-        # <span style="{STYLE}" role="{ROLE}" aria-label="{LABEL}" title="{TITLE}">
-
-        # Unescape outer span opening tags with full attributes (role, aria-label, title)
-        # Matches removed/added/changed/changed_into spans
-        result = re.sub(
-            rf'&lt;span style=&#34;({re.escape(REMOVED_STYLE)}|{re.escape(ADDED_STYLE)})&#34; '
-            rf'role=&#34;(deletion|insertion|note)&#34; '
-            rf'aria-label=&#34;([^&]+?)&#34; '
-            rf'title=&#34;([^&]+?)&#34;&gt;',
-            r'<span style="\1" role="\2" aria-label="\3" title="\4">',
-            str(escaped_content),
-            flags=re.IGNORECASE
-        )
-
-        # Unescape inner span opening tags (without additional attributes)
-        # This matches the darker background styles for changed parts within lines
-        result = re.sub(
-            rf'&lt;span style=&#34;({re.escape(REMOVED_INNER_STYLE)}|{re.escape(ADDED_INNER_STYLE)})&#34;&gt;',
-            r'<span style="\1">',
-            result,
-            flags=re.IGNORECASE
-        )
-
-        # Unescape closing tags (but only as many as we opened)
-        open_count = result.count('<span style=')
-        close_count = str(escaped_content).count('&lt;/span&gt;')
-
-        # Replace up to the number of spans we opened
-        for _ in range(min(open_count, close_count)):
-            result = result.replace('&lt;/span&gt;', '</span>', 1)
-
-        return Markup(result)
-
-    @diff_blueprint.route("/diff/<string:uuid>", methods=['GET'])
-    @login_optionally_required
-    def diff_history_page(uuid):
-        """
-        Render the history/diff page for a watch.
-
-        This route is processor-aware: it delegates rendering to the processor's
-        difference.py module, allowing different processor types to provide
-        custom visualizations:
-        - text_json_diff: Text/HTML diff with syntax highlighting
-        - restock_diff: Could show price charts and stock history
-        - image_diff: Could show image comparison slider/overlay
-
-        Each processor implements processors/{type}/difference.py::render()
-        If a processor doesn't have a difference module, falls back to text_json_diff.
-        """
-
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        dates = list(watch.history.keys())
-        if not dates or len(dates) < 2:
-            flash("Not enough history (2 snapshots required) to show difference page for this watch.", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's difference module
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.difference')
-
-            # Call the processor's render() function
-            if hasattr(processor_module, 'render'):
-                return processor_module.render(
-                    watch=watch,
-                    datastore=datastore,
-                    request=request,
-                    url_for=url_for,
-                    render_template=render_template,
-                    flash=flash,
-                    redirect=redirect
-                )
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.warning(f"Processor {processor_name} does not have a difference module, falling back to text_json_diff: {e}")
-
-        # Fallback: if processor doesn't have difference module, use text_json_diff as default
-        from changedetectionio.processors.text_json_diff.difference import render as default_render
-        return default_render(
-            watch=watch,
-            datastore=datastore,
-            request=request,
-            url_for=url_for,
-            render_template=render_template,
-            flash=flash,
-            redirect=redirect
-        )
-
-    @diff_blueprint.route("/diff/<string:uuid>/extract", methods=['GET'])
-    @login_optionally_required
-    def diff_history_page_extract_GET(uuid):
-        """
-        Render the data extraction form for a watch.
-
-        This route is processor-aware: it delegates to the processor's
-        extract.py module, allowing different processor types to provide
-        custom extraction interfaces.
-
-        Each processor implements processors/{type}/extract.py::render_form()
-        If a processor doesn't have an extract module, falls back to text_json_diff.
-        """
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's extract module
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.extract')
-
-            # Call the processor's render_form() function
-            if hasattr(processor_module, 'render_form'):
-                return processor_module.render_form(
-                    watch=watch,
-                    datastore=datastore,
-                    request=request,
-                    url_for=url_for,
-                    render_template=render_template,
-                    flash=flash,
-                    redirect=redirect
-                )
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.warning(f"Processor {processor_name} does not have an extract module, falling back to base extractor: {e}")
-
-        # Fallback: if processor doesn't have extract module, use base processors.extract as default
-        from changedetectionio.processors.extract import render_form as default_render_form
-        return default_render_form(
-            watch=watch,
-            datastore=datastore,
-            request=request,
-            url_for=url_for,
-            render_template=render_template,
-            flash=flash,
-            redirect=redirect
-        )
-
-    @diff_blueprint.route("/diff/<string:uuid>/extract", methods=['POST'])
-    @login_optionally_required
-    def diff_history_page_extract_POST(uuid):
-        """
-        Process the data extraction request.
-
-        This route is processor-aware: it delegates to the processor's
-        extract.py module, allowing different processor types to provide
-        custom extraction logic.
-
-        Each processor implements processors/{type}/extract.py::process_extraction()
-        If a processor doesn't have an extract module, falls back to text_json_diff.
-        """
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's extract module
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.extract')
-
-            # Call the processor's process_extraction() function
-            if hasattr(processor_module, 'process_extraction'):
-                return processor_module.process_extraction(
-                    watch=watch,
-                    datastore=datastore,
-                    request=request,
-                    url_for=url_for,
-                    make_response=make_response,
-                    send_from_directory=send_from_directory,
-                    flash=flash,
-                    redirect=redirect
-                )
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.warning(f"Processor {processor_name} does not have an extract module, falling back to base extractor: {e}")
-
-        # Fallback: if processor doesn't have extract module, use base processors.extract as default
-        from changedetectionio.processors.extract import process_extraction as default_process_extraction
-        return default_process_extraction(
-            watch=watch,
-            datastore=datastore,
-            request=request,
-            url_for=url_for,
-            make_response=make_response,
-            send_from_directory=send_from_directory,
-            flash=flash,
-            redirect=redirect
-        )
-
-    @diff_blueprint.route("/diff/<string:uuid>/processor-asset/<string:asset_name>", methods=['GET'])
-    @login_optionally_required
-    def processor_asset(uuid, asset_name):
-        """
-        Serve processor-specific binary assets (images, files, etc.).
-
-        This route is processor-aware: it delegates to the processor's
-        difference.py module, allowing different processor types to serve
-        custom assets without embedding them as base64 in templates.
-
-        This solves memory issues with large binary data (e.g., screenshots)
-        by streaming them as separate HTTP responses instead of embedding
-        in the HTML template.
-
-        Each processor implements processors/{type}/difference.py::get_asset()
-        which returns (binary_data, content_type, cache_control_header).
-
-        Example URLs:
-        - /diff/{uuid}/processor-asset/before
-        - /diff/{uuid}/processor-asset/after
-        - /diff/{uuid}/processor-asset/rendered_diff
-        """
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's difference module
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.difference')
-
-            # Call the processor's get_asset() function
-            if hasattr(processor_module, 'get_asset'):
-                result = processor_module.get_asset(
-                    asset_name=asset_name,
-                    watch=watch,
-                    datastore=datastore,
-                    request=request
-                )
-
-                if result is None:
-                    from flask import abort
-                    abort(404, description=f"Asset '{asset_name}' not found")
-
-                binary_data, content_type, cache_control = result
-
-                response = make_response(binary_data)
-                response.headers['Content-Type'] = content_type
-                if cache_control:
-                    response.headers['Cache-Control'] = cache_control
-                return response
-            else:
-                logger.warning(f"Processor {processor_name} does not implement get_asset()")
-                from flask import abort
-                abort(404, description=f"Processor '{processor_name}' does not support assets")
-
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.warning(f"Processor {processor_name} does not have a difference module: {e}")
-            from flask import abort
-            abort(404, description=f"Processor '{processor_name}' not found")
-
-    return diff_blueprint

changedetectionio/blueprint/ui/edit.py

@@ -1,7 +1,8 @@
+import time
 from copy import deepcopy
 import os
 import importlib.resources
-from flask import Blueprint, request, redirect, url_for, flash, render_template, abort
+from flask import Blueprint, request, redirect, url_for, flash, render_template, make_response, send_from_directory, abort
 from loguru import logger
 from jinja2 import Environment, FileSystemLoader
 
@@ -95,26 +96,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
         form.datastore = datastore
         form.watch = default
 
-        # Load processor-specific config from JSON file for GET requests
-        if request.method == 'GET' and processor_name:
-            try:
-                from changedetectionio.processors.base import difference_detection_processor
-                # Create a processor instance to access config methods
-                processor_instance = difference_detection_processor(datastore, uuid)
-                # Use processor name as filename so each processor keeps its own config
-                config_filename = f'{processor_name}.json'
-                processor_config = processor_instance.get_extra_watch_config(config_filename)
-
-                if processor_config:
-                    # Populate processor-config-* fields from JSON
-                    for config_key, config_value in processor_config.items():
-                        field_name = f'processor_config_{config_key}'
-                        if hasattr(form, field_name):
-                            getattr(form, field_name).data = config_value
-                            logger.debug(f"Loaded processor config from {config_filename}: {field_name} = {config_value}")
-            except Exception as e:
-                logger.warning(f"Failed to load processor config: {e}")
-
         for p in datastore.extra_browsers:
             form.fetch_backend.choices.append(p)
 
@@ -133,6 +114,11 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
 
         if request.method == 'POST' and form.validate():
 
+            # If they changed processor, it makes sense to reset it.
+            if datastore.data['watching'][uuid].get('processor') != form.data.get('processor'):
+                datastore.data['watching'][uuid].clear_watch()
+                flash("Reset watch history due to change of processor")
+
             extra_update_obj = {
                 'consecutive_filter_failures': 0,
                 'last_error' : False
@@ -143,60 +129,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
 
             extra_update_obj['time_between_check'] = form.time_between_check.data
 
-             # Handle processor-config-* fields separately (save to JSON, not datastore)
-            processor_config_data = {}
-            fields_to_remove = []
-            for field_name, field_value in form.data.items():
-                if field_name.startswith('processor_config_'):
-                    config_key = field_name.replace('processor_config_', '')
-                    if field_value:  # Only save non-empty values
-                        processor_config_data[config_key] = field_value
-                    fields_to_remove.append(field_name)
-
-            # Save processor config to JSON file if any config data exists
-            if processor_config_data:
-                try:
-                    processor_name = form.data.get('processor')
-                    # Create a processor instance to access config methods
-                    processor_instance = processors.difference_detection_processor(datastore, uuid)
-                    # Use processor name as filename so each processor keeps its own config
-                    config_filename = f'{processor_name}.json'
-                    processor_instance.update_extra_watch_config(config_filename, processor_config_data)
-                    logger.debug(f"Saved processor config to {config_filename}: {processor_config_data}")
-
-                    # Call optional edit_hook if processor has one
-                    try:
-                        # Try to import the edit_hook module from the processor package
-                        import importlib
-                        edit_hook_module_name = f'changedetectionio.processors.{processor_name}.edit_hook'
-
-                        try:
-                            edit_hook = importlib.import_module(edit_hook_module_name)
-                            logger.debug(f"Found edit_hook module for {processor_name}")
-
-                            if hasattr(edit_hook, 'on_config_save'):
-                                logger.info(f"Calling edit_hook.on_config_save for {processor_name}")
-                                watch_obj = datastore.data['watching'][uuid]
-                                # Call hook and get updated config
-                                updated_config = edit_hook.on_config_save(watch_obj, processor_config_data, datastore)
-                                # Save updated config back to file
-                                processor_instance.update_extra_watch_config(config_filename, updated_config)
-                                logger.info(f"Edit hook updated config: {updated_config}")
-                            else:
-                                logger.debug(f"Edit hook module found but no on_config_save function")
-                        except ModuleNotFoundError:
-                            logger.debug(f"No edit_hook module for processor {processor_name} (this is normal)")
-                    except Exception as hook_error:
-                        logger.error(f"Edit hook error (non-fatal): {hook_error}", exc_info=True)
-
-                except Exception as e:
-                    logger.error(f"Failed to save processor config: {e}")
-
-            # Remove processor-config-* fields from form.data before updating datastore
-            for field_name in fields_to_remove:
-                form.data.pop(field_name, None)
-
-            # Ignore text
+             # Ignore text
             form_ignore_text = form.ignore_text.data
             datastore.data['watching'][uuid]['ignore_text'] = form_ignore_text
 
@@ -273,7 +206,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
 
             # Diff page [edit] link should go back to diff page
             if request.args.get("next") and request.args.get("next") == 'diff':
-                return redirect(url_for('ui.ui_diff.diff_history_page', uuid=uuid))
+                return redirect(url_for('ui.ui_views.diff_history_page', uuid=uuid))
 
             return redirect(url_for('watchlist.index', tag=request.args.get("tag",'')))
 
@@ -290,25 +223,26 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
 
             watch = datastore.data['watching'].get(uuid)
 
+            # if system or watch is configured to need a chrome type browser
+            system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
+            watch_needs_selenium_or_playwright = False
+            if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
+                watch_needs_selenium_or_playwright = True
+
+
             from zoneinfo import available_timezones
 
+            # Only works reliably with Playwright
+
             # Import the global plugin system
-            from changedetectionio.pluggy_interface import collect_ui_edit_stats_extras, get_fetcher_capabilities
-
-            # Get fetcher capabilities instead of hardcoded logic
-            capabilities = get_fetcher_capabilities(watch, datastore)
+            from changedetectionio.pluggy_interface import collect_ui_edit_stats_extras
             app_rss_token = datastore.data['settings']['application'].get('rss_access_token'),
-
-            c = [f"processor-{watch.get('processor')}"]
-            if worker_handler.is_watch_running(uuid):
-                c.append('checking-now')
-
             template_args = {
                 'available_processors': processors.available_processors(),
                 'available_timezones': sorted(available_timezones()),
                 'browser_steps_config': browser_step_ui_config,
                 'emailprefix': os.getenv('NOTIFICATION_MAIL_BUTTON_PREFIX', False),
-                'extra_classes': ' '.join(c),
+                'extra_classes': 'checking-now' if worker_handler.is_watch_running(uuid) else '',
                 'extra_notification_token_placeholder_info': datastore.get_unique_notification_token_placeholders_available(),
                 'extra_processor_config': form.extra_tab_content(),
                 'extra_title': f" - Edit - {watch.label}",
@@ -332,7 +266,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                 'using_global_webdriver_wait': not default['webdriver_delay'],
                 'uuid': uuid,
                 'watch': watch,
-                'capabilities': capabilities
+                'watch_needs_selenium_or_playwright': watch_needs_selenium_or_playwright,
             }
 
             included_content = None
@@ -406,6 +340,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
                     s = re.sub(r'[0-9]+', r'\\d+', s)
                     datastore.data["watching"][uuid]['ignore_text'].append('/' + s + '/')
 
-        return f"<a href={url_for('ui.ui_preview.preview_page', uuid=uuid)}>Click to preview</a>"
+        return f"<a href={url_for('ui.ui_views.preview_page', uuid=uuid)}>Click to preview</a>"
     
     return edit_blueprint

changedetectionio/blueprint/ui/notification.py

@@ -108,7 +108,8 @@ def construct_blueprint(datastore: ChangeDetectionStore):
                 prev_snapshot = watch.get_history_snapshot(timestamp=dates[-2])
                 current_snapshot = watch.get_history_snapshot(timestamp=dates[-1])
 
-            n_object.update(set_basic_notification_vars(current_snapshot=current_snapshot,
+            n_object.update(set_basic_notification_vars(snapshot_contents=snapshot_contents,
+                                                        current_snapshot=current_snapshot,
                                                         prev_snapshot=prev_snapshot,
                                                         watch=watch,
                                                         triggered_text=trigger_text,

changedetectionio/blueprint/ui/preview.py

@@ -1,200 +0,0 @@
-from flask import Blueprint, request, url_for, flash, render_template, redirect
-import time
-from loguru import logger
-
-from changedetectionio.store import ChangeDetectionStore
-from changedetectionio.auth_decorator import login_optionally_required
-from changedetectionio import html_tools
-
-def construct_blueprint(datastore: ChangeDetectionStore):
-    preview_blueprint = Blueprint('ui_preview', __name__, template_folder="../ui/templates")
-
-    @preview_blueprint.route("/preview/<string:uuid>", methods=['GET'])
-    @login_optionally_required
-    def preview_page(uuid):
-        """
-        Render the preview page for a watch.
-
-        This route is processor-aware: it delegates rendering to the processor's
-        preview.py module, allowing different processor types to provide
-        custom visualizations:
-        - text_json_diff: Text preview with syntax highlighting
-        - image_ssim_diff: Image preview with proper rendering
-        - restock_diff: Could show latest price/stock data
-
-        Each processor implements processors/{type}/preview.py::render()
-        If a processor doesn't have a preview module, falls back to default text preview.
-        """
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's preview module
-            import importlib
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.preview')
-
-            # Call the processor's render() function
-            if hasattr(processor_module, 'render'):
-                return processor_module.render(
-                    watch=watch,
-                    datastore=datastore,
-                    request=request,
-                    url_for=url_for,
-                    render_template=render_template,
-                    flash=flash,
-                    redirect=redirect
-                )
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.debug(f"Processor {processor_name} does not have a preview module, using default preview: {e}")
-
-        # Fallback: if processor doesn't have preview module, use default text preview
-        content = []
-        versions = []
-        timestamp = None
-
-        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
-
-        is_html_webdriver = False
-        if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
-            is_html_webdriver = True
-
-        triggered_line_numbers = []
-        ignored_line_numbers = []
-        blocked_line_numbers = []
-
-        if datastore.data['watching'][uuid].history_n == 0 and (watch.get_error_text() or watch.get_error_snapshot()):
-            flash("Preview unavailable - No fetch/check completed or triggers not reached", "error")
-        else:
-            # So prepare the latest preview or not
-            preferred_version = request.args.get('version')
-            versions = list(watch.history.keys())
-            timestamp = versions[-1]
-            if preferred_version and preferred_version in versions:
-                timestamp = preferred_version
-
-            try:
-                versions = list(watch.history.keys())
-                content = watch.get_history_snapshot(timestamp=timestamp)
-
-                triggered_line_numbers = html_tools.strip_ignore_text(content=content,
-                                                                      wordlist=watch.get('trigger_text'),
-                                                                      mode='line numbers'
-                                                                      )
-                ignored_line_numbers = html_tools.strip_ignore_text(content=content,
-                                                                      wordlist=watch.get('ignore_text'),
-                                                                      mode='line numbers'
-                                                                      )
-                blocked_line_numbers = html_tools.strip_ignore_text(content=content,
-                                                                      wordlist=watch.get("text_should_not_be_present"),
-                                                                      mode='line numbers'
-                                                                      )
-            except Exception as e:
-                content.append({'line': f"File doesnt exist or unable to read timestamp {timestamp}", 'classes': ''})
-
-        from changedetectionio.pluggy_interface import get_fetcher_capabilities
-        capabilities = get_fetcher_capabilities(watch, datastore)
-
-        output = render_template("preview.html",
-                                 capabilities=capabilities,
-                                 content=content,
-                                 current_diff_url=watch['url'],
-                                 current_version=timestamp,
-                                 extra_stylesheets=extra_stylesheets,
-                                 extra_title=f" - Diff - {watch.label} @ {timestamp}",
-                                 highlight_ignored_line_numbers=ignored_line_numbers,
-                                 highlight_triggered_line_numbers=triggered_line_numbers,
-                                 highlight_blocked_line_numbers=blocked_line_numbers,
-                                 history_n=watch.history_n,
-                                 is_html_webdriver=is_html_webdriver,
-                                 last_error=watch['last_error'],
-                                 last_error_screenshot=watch.get_error_snapshot(),
-                                 last_error_text=watch.get_error_text(),
-                                 screenshot=watch.get_screenshot(),
-                                 uuid=uuid,
-                                 versions=versions,
-                                 watch=watch,
-                                 )
-
-        return output
-
-    @preview_blueprint.route("/preview/<string:uuid>/processor-asset/<string:asset_name>", methods=['GET'])
-    @login_optionally_required
-    def processor_asset(uuid, asset_name):
-        """
-        Serve processor-specific binary assets for preview (images, files, etc.).
-
-        This route is processor-aware: it delegates to the processor's
-        preview.py module, allowing different processor types to serve
-        custom assets without embedding them as base64 in templates.
-
-        This solves memory issues with large binary data by streaming them
-        as separate HTTP responses instead of embedding in the HTML template.
-
-        Each processor implements processors/{type}/preview.py::get_asset()
-        which returns (binary_data, content_type, cache_control_header).
-
-        Example URLs:
-        - /preview/{uuid}/processor-asset/screenshot?version=123456789
-        """
-        from flask import make_response
-
-        # More for testing, possible to return the first/only
-        if uuid == 'first':
-            uuid = list(datastore.data['watching'].keys()).pop()
-
-        try:
-            watch = datastore.data['watching'][uuid]
-        except KeyError:
-            flash("No history found for the specified link, bad link?", "error")
-            return redirect(url_for('watchlist.index'))
-
-        # Get the processor type for this watch
-        processor_name = watch.get('processor', 'text_json_diff')
-
-        try:
-            # Try to import the processor's preview module
-            import importlib
-            processor_module = importlib.import_module(f'changedetectionio.processors.{processor_name}.preview')
-
-            # Call the processor's get_asset() function
-            if hasattr(processor_module, 'get_asset'):
-                result = processor_module.get_asset(
-                    asset_name=asset_name,
-                    watch=watch,
-                    datastore=datastore,
-                    request=request
-                )
-
-                if result is None:
-                    from flask import abort
-                    abort(404, description=f"Asset '{asset_name}' not found")
-
-                binary_data, content_type, cache_control = result
-
-                response = make_response(binary_data)
-                response.headers['Content-Type'] = content_type
-                if cache_control:
-                    response.headers['Cache-Control'] = cache_control
-                return response
-            else:
-                logger.warning(f"Processor {processor_name} does not implement get_asset()")
-                from flask import abort
-                abort(404, description=f"Processor '{processor_name}' does not support assets")
-
-        except (ImportError, ModuleNotFoundError) as e:
-            logger.warning(f"Processor {processor_name} does not have a preview module: {e}")
-            from flask import abort
-            abort(404, description=f"Processor '{processor_name}' not found")
-
-    return preview_blueprint

changedetectionio/blueprint/ui/templates/clear_all_history.html

@@ -9,12 +9,13 @@
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" >
       <fieldset>
         <div class="pure-control-group">
-          {{ _('This will remove version history (snapshots) for ALL watches, but keep your list of URLs!') }} <br />
-          {{ _('You may like to use the') }} <strong>{{ _('BACKUP') }}</strong> {{ _('link first.') }}<br />
+          This will remove version history (snapshots) for ALL watches, but keep
+          your list of URLs! <br />
+          You may like to use the <strong>BACKUP</strong> link first.<br />
         </div>
         <br />
         <div class="pure-control-group">
-          <label for="confirmtext">{{ _('Confirmation text') }}</label>
+          <label for="confirmtext">Confirmation text</label>
           <input
             type="text"
             id="confirmtext"
@@ -24,19 +25,20 @@
             size="10"
           />
           <span class="pure-form-message-inline"
-            >{{ _('Type in the word') }} <strong>{{ _('clear') }}</strong> {{ _('to confirm that you understand.') }}</span
+            >Type in the word <strong>clear</strong> to confirm that you
+            understand.</span
           >
         </div>
         <br />
         <div class="pure-control-group">
           <button type="submit" class="pure-button pure-button-primary">
-            {{ _('Clear History!') }}
+            Clear History!
           </button>
         </div>
         <br />
         <div class="pure-control-group">
           <a href="{{url_for('watchlist.index')}}" class="pure-button button-cancel"
-            >{{ _('Cancel') }}</a
+            >Cancel</a
           >
         </div>
       </fieldset>

changedetectionio/blueprint/ui/templates/diff-offscreen-options.html

@@ -1,12 +0,0 @@
-<ul id="highlightSnippetActions">
-    <li>
-        <button class="pure-button pure-button-primary" onclick="diffToJpeg()" title="{{ _('Share diff as image') }}">{{ _('Share as Image') }}</button>
-    </li>
-    <li>
-        <a class="pure-button pure-button-primary" data-mode="exact" href="javascript:void(0);">{{ _('Ignore any lines matching') }}</a>
-    </li>
-    <li>
-        <a class="pure-button pure-button-primary" data-mode="digit-regex" href="javascript:void(0);" >{{ _('Ignore any lines matching excluding digits') }}</a>
-    </li>
-</ul>
-

changedetectionio/blueprint/ui/templates/diff.html

@@ -1,166 +0,0 @@
-{% extends 'base.html' %}
-{% from '_helpers.html' import render_field, render_checkbox_field, render_button %}
-{% block content %}
-<script>
-    const screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid)}}";
-    {% if last_error_screenshot %}
-    const error_screenshot_url="{{url_for('static_content', group='screenshot', filename=uuid, error_screenshot=1) }}";
-    {% endif %}
-
-    const highlight_submit_ignore_url="{{url_for('ui.ui_edit.highlight_submit_ignore_url', uuid=uuid)}}";
-    const watch_url= {{watch_a.link|tojson}};
-
-    // Initial scroll position: if set, scroll to this line number in #difference on page load
-    const initialScrollToLineNumber = {{ initial_scroll_line_number|default('null') }};
-</script>
-<script src="https://cdn.jsdelivr.net/npm/html2canvas@1.4.1/dist/html2canvas.min.js"></script>
-<script src="{{url_for('static_content', group='js', filename='plugins.js')}}"></script>
-<script src="https://cdn.jsdelivr.net/npm/piexifjs@1.0.6/piexif.min.js"></script>
-<script src="{{url_for('static_content', group='js', filename='snippet-to-image.js')}}"></script>
-<script src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>
-
-
-<div id="settings">
-    <form class="pure-form " action="{{ url_for("ui.ui_diff.diff_history_page", uuid=uuid) }}" method="GET" id="diff-form">
-        <fieldset class="diff-fieldset">
-            {% if versions|length >= 1 %}
-                <span style="white-space: nowrap;">
-                <label id="change-from" for="diff-from-version" class="from-to-label">{{ _('From') }}</label>
-                <select id="diff-from-version" name="from_version" class="needs-localtime">
-                    {%- for version in versions|reverse -%}
-                        <option value="{{ version }}" {% if version== from_version %} selected="" {% endif %}>
-                            {{ version }}{#{% if loop.index == 2 %} (Previous){% endif %}#}
-                        </option>
-                    {%- endfor -%}
-                </select>
-                </span>
-                <span style="white-space: nowrap;">
-                <label id="change-to" for="diff-to-version" class="from-to-label">{{ _('To') }}</label>
-                <select id="diff-to-version" name="to_version" class="needs-localtime">
-                    {%- for version in versions|reverse -%}
-                        <option value="{{ version }}" {% if version== to_version %} selected="" {% endif %}>
-                            {{ version }}{#{% if loop.first %} (Current){% endif %}#}
-                        </option>
-                    {%- endfor -%}
-                </select>
-                </span>
-                {#<button type="submit" class="pure-button pure-button-primary reset-margin">Go</button>#}
-            {% endif %}
-        </fieldset>
-        <fieldset id="diff-style">
-            <span>
-                <label for="diffWords" class="pure-checkbox">
-                <input type="radio" name="type" id="diffWords" value="diffWords" {% if diff_prefs.type == 'diffWords' %}checked=""{% endif %}> {{ _('Words') }}</label>
-            </span>
-            <span>
-                <label for="diffLines" class="pure-checkbox">
-                <input type="radio" name="type" id="diffLines" value="diffLines" {% if diff_prefs.type == 'diffLines' %}checked=""{% endif %}> {{ _('Lines') }}</label>
-            </span>
-            <span>
-                <label for="ignoreWhitespace" class="pure-checkbox" id="label-diff-ignorewhitespace">
-                <input type="checkbox" id="ignoreWhitespace" name="ignoreWhitespace" {% if diff_prefs.ignoreWhitespace %}checked=""{% endif %}> {{ _('Ignore Whitespace') }}</label>
-            </span>
-            <span>
-                <label for="changesOnly" class="pure-checkbox" id="label-diff-changes">
-                <input type="checkbox" id="changesOnly" name="changesOnly" {% if diff_prefs.changesOnly %}checked=""{% endif %}> {{ _('Same/non-changed') }}</label>
-            </span>
-            <span>
-                <label for="removed" class="pure-checkbox" id="label-diff-removed">
-                <input type="checkbox" id="removed" name="removed" {% if diff_prefs.removed %}checked=""{% endif %}> {{ _('Removed') }}</label>
-            </span>
-            <span>
-                <label for="added" class="pure-checkbox" id="label-diff-added">
-                <input type="checkbox" id="added" name="added" {% if diff_prefs.added %}checked=""{% endif %}> {{ _('Added') }}</label>
-            </span>
-            <span>
-                <label for="replaced" class="pure-checkbox" id="label-diff-replaced">
-                <input type="checkbox" id="replaced"  name="replaced" {% if diff_prefs.replaced %}checked=""{% endif %}> {{ _('Replaced') }}</label>
-            </span>
-        </fieldset>
-        {%- if versions|length >= 2 -%}
-            <div id="keyboard-nav">
-                <strong>{{ _('Keyboard:') }} </strong>
-                <a href="" class="pure-button pure-button-primary" id="btn-previous"> &larr; {{ _('Previous') }}</a>
-                &nbsp; <a class="pure-button pure-button-primary" id="btn-next" href=""> &rarr; {{ _('Next') }}</a>
-            </div>
-        {%- endif -%}
-    </form>
-</div>
-
-<div id="diff-jump">
-    <a id="jump-next-diff" title="{{ _('Jump to next difference') }}">{{ _('Jump') }}</a>
-</div>
-
-<script src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script>
-<div class="tabs">
-    <ul>
-        {% if last_error_text %}<li class="tab" id="error-text-tab"><a href="#error-text">{{ _('Error Text') }}</a></li> {% endif %}
-        {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="#error-screenshot">{{ _('Error Screenshot') }}</a></li> {% endif %}
-        <li class="tab" id="text-tab"><a href="#text">{{ _('Text') }}</a></li>
-        <li class="tab" id="screenshot-tab"><a href="#screenshot">{{ _('Current screenshot') }}</a></li>
-        <li class="tab" id="extract-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page_extract_GET', uuid=uuid)}}">{{ _('Extract Data') }}</a></li>
-    </ul>
-</div>
-
-<div id="diff-ui">
-    <div class="tab-pane-inner" id="error-text">
-        <div class="snapshot-age error">{{watch_a.error_text_ctime|format_seconds_ago}} {{ _('seconds ago.') }}</div>
-        <pre>
-            {{ last_error_text }}
-        </pre>
-    </div>
-
-    <div class="tab-pane-inner" id="error-screenshot">
-        <div class="snapshot-age error">{{watch_a.snapshot_error_screenshot_ctime|format_seconds_ago}} {{ _('seconds ago') }}</div>
-        <img id="error-screenshot-img"  style="max-width: 80%" alt="{{ _('Current error-ing screenshot from most recent request') }}" >
-    </div>
-
-    <div class="tab-pane-inner" id="text">
-    {%- if (content | default('')).split('\n') | length > 100 -%}
-        <div id="cell-diff-jump-visualiser"  style="user-select: none;">
-            {%- for cell in diff_cell_grid -%}
-            <div{% if cell.class %} class="{{ cell.class }}"{% endif %}></div>
-            {%- endfor -%}
-        </div>
-    {%- endif -%}
-        {%- if password_enabled_and_share_is_off -%}
-            <div class="tip">{{ _('Pro-tip: You can enable') }} <strong>{{ _('"share access when password is enabled"') }}</strong> {{ _('from settings.') }}
-            </div>
-        {%- endif -%}
-        <div id="text-diff-heading-area"  style="user-select: none;">
-            <div class="snapshot-age"><span>{{ from_version|format_timestamp_timeago }}</span>
-                {%- if note -%}<span class="note"><strong>{{ note }}</strong></span>{%- endif -%}
-                <a href="{{ url_for("ui.ui_preview.preview_page", uuid=uuid) }}">{{ _('Goto single snapshot') }}</a>
-            </div>
-        </div>
-        <pre id="difference" style="border-left: 2px solid #ddd;">{{ content| diff_unescape_difference_spans }}</pre>
-    <div id="diff-visualiser-area-after" style="user-select: none;">
-        <strong>{{ _('Tip:') }}</strong> {{ _('Highlight text to share or add to ignore lists.') }}
-    </div>
-    </div>
-
-    <div class="tab-pane-inner" id="screenshot">
-         <div class="tip">
-             {{ _('For now, Differences are performed on text, not graphically, only the latest screenshot is available.') }}
-         </div>
-         {% if is_html_webdriver %}
-           {% if screenshot %}
-            <div class="snapshot-age">{{watch_a.snapshot_screenshot_ctime|format_timestamp_timeago}}</div>
-            <img style="max-width: 80%" id="screenshot-img" alt="{{ _('Current screenshot from most recent request') }}" >
-           {% else %}
-              {{ _('No screenshot available just yet! Try rechecking the page.') }}
-           {% endif %}
-         {% else %}
-           <strong>{{ _('Screenshot requires Playwright/WebDriver enabled') }}</strong>
-         {% endif %}
-     </div>
-
-</div>
-
-<script>
-    const newest_version_timestamp = {{newest_version_timestamp}};
-</script>
-<script src="{{url_for('static_content', group='js', filename='diff-render.js')}}"></script>
-
-
-{% endblock %}

changedetectionio/blueprint/ui/templates/edit.html

@@ -1,13 +1,12 @@
 {% extends 'base.html' %}
 {% block content %}
-{% from '_helpers.html' import render_field, render_checkbox_field, render_button, render_time_schedule_form, playwright_warning, only_playwright_type_watches_warning, highlight_trigger_ignored_explainer, render_conditions_fieldlist_of_formfields_as_table, render_ternary_field %}
+{% from '_helpers.html' import render_field, render_checkbox_field, render_button, render_time_schedule_form, playwright_warning, only_playwright_type_watches_warning, render_conditions_fieldlist_of_formfields_as_table, render_ternary_field %}
 {% from '_common_fields.html' import render_common_settings_form %}
 <script src="{{url_for('static_content', group='js', filename='tabs.js')}}" defer></script>
 <script src="{{url_for('static_content', group='js', filename='vis.js')}}" defer></script>
 <script src="{{url_for('static_content', group='js', filename='global-settings.js')}}" defer></script>
 <script src="{{url_for('static_content', group='js', filename='scheduler.js')}}" defer></script>
 <script src="{{url_for('static_content', group='js', filename='conditions.js')}}" defer></script>
-<script src="{{url_for('static_content', group='js', filename='modal.js')}}"></script>
 
 
 <script>
@@ -44,20 +43,20 @@
 
     <div class="tabs collapsable">
         <ul>
-            <li class="tab"><a href="#general">{{ _('General') }}</a></li>
-            <li class="tab"><a href="#request">{{ _('Request') }}</a></li>
+            <li class="tab"><a href="#general">General</a></li>
+            <li class="tab"><a href="#request">Request</a></li>
             {% if extra_tab_content %}
             <li class="tab"><a href="#extras_tab">{{ extra_tab_content }}</a></li>
             {% endif %}
-            <li class="tab"><a id="browsersteps-tab" href="#browser-steps">{{ _('Browser Steps') }}</a></li>
+            <li class="tab"><a id="browsersteps-tab" href="#browser-steps">Browser Steps</a></li>
         <!-- should goto extra forms? -->
-            {% if watch['processor'] == 'text_json_diff' or watch['processor'] == 'image_ssim_diff' %}
-            <li class="tab"><a id="visualselector-tab" href="#visualselector">{{ _('Visual Filter Selector') }}</a></li>
-            <li class="tab" id="filters-and-triggers-tab"><a href="#filters-and-triggers">{{ _('Filters & Triggers') }}</a></li>
-            <li class="tab" id="conditions-tab"><a href="#conditions">{{ _('Conditions') }}</a></li>
+            {% if watch['processor'] == 'text_json_diff' %}
+            <li class="tab"><a id="visualselector-tab" href="#visualselector">Visual Filter Selector</a></li>
+            <li class="tab" id="filters-and-triggers-tab"><a href="#filters-and-triggers">Filters &amp; Triggers</a></li>
+            <li class="tab" id="conditions-tab"><a href="#conditions">Conditions</a></li>
             {% endif %}
-            <li class="tab"><a href="#notifications">{{ _('Notifications') }}</a></li>
-            <li class="tab"><a href="#stats">{{ _('Stats') }}</a></li>
+            <li class="tab"><a href="#notifications">Notifications</a></li>
+            <li class="tab"><a href="#stats">Stats</a></li>
         </ul>
     </div>
 
@@ -70,19 +69,19 @@
                 <fieldset>
                     <div class="pure-control-group">
                         {{ render_field(form.url, placeholder="https://...", required=true, class="m-d") }}
-                        <div class="pure-form-message">{{ _('Some sites use JavaScript to create the content, for this you should') }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Fetching-pages-with-WebDriver">{{ _('use the Chrome/WebDriver Fetcher') }}</a></div>
-                        <div class="pure-form-message">{{ _('Variables are supported in the URL') }} (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">{{ _('help and examples here') }}</a>).</div>
+                        <div class="pure-form-message">Some sites use JavaScript to create the content, for this you should <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Fetching-pages-with-WebDriver">use the Chrome/WebDriver Fetcher</a></div>
+                        <div class="pure-form-message">Variables are supported in the URL (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">help and examples here</a>).</div>
                     </div>
                     <div class="pure-control-group">
                         {{ render_field(form.tags) }}
-                        <span class="pure-form-message-inline">{{ _('Organisational tag/group name used in the main listing page') }}</span>
+                        <span class="pure-form-message-inline">Organisational tag/group name used in the main listing page</span>
                     </div>
                     <div class="pure-control-group inline-radio">
                         {{ render_field(form.processor) }}
                     </div>
                     <div class="pure-control-group">
                         {{ render_field(form.title, class="m-d", placeholder=watch.label) }}
-                        <span class="pure-form-message-inline">{{ _('Automatically uses the page title if found, you can also use your own title/description here') }}</span>
+                        <span class="pure-form-message-inline">Automatically uses the page title if found, you can also use your own title/description here</span>
                     </div>
                     <div class="pure-control-group time-between-check border-fieldset">
 
@@ -92,7 +91,7 @@
                             {{ render_field(form.time_between_check, class="time-check-widget") }}
 
                             <span class="pure-form-message-inline">
-                             {{ _('The interval/amount of time between each check.') }}
+                             The interval/amount of time between each check.
                             </span>
                         </div>
                         <div id="time-between-check-schedule">
@@ -107,7 +106,7 @@
                     <div class="pure-control-group">
                         {{ render_checkbox_field(form.filter_failure_notification_send) }}
                         <span class="pure-form-message-inline">
-                         {{ _('Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and your filter will not work anymore.') }}
+                         Sends a notification when the filter can no longer be seen on the page, good for knowing when the page changed and your filter will not work anymore.
                         </span>
                     </div>
                     <div class="pure-control-group">
@@ -120,17 +119,17 @@
                     <div class="pure-control-group inline-radio">
                         {{ render_field(form.fetch_backend, class="fetch-backend") }}
                         <span class="pure-form-message-inline">
-                            <p>{{ _('Use the') }} <strong>{{ _('Basic') }}</strong> {{ _('method (default) where your watched site doesn\'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>
-                            {{ _('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>
+                            <p>Use the <strong>Basic</strong> method (default) where your watched site doesn'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>
+                            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>
                         </span>
                     </div>
                 {% if form.proxy %}
                     <div class="pure-control-group inline-radio">
-                          <div>{{ form.proxy.label }} <a href="" id="check-all-proxies" class="pure-button button-secondary button-xsmall" >{{ _('Check/Scan all') }}</a></div>
+                          <div>{{ form.proxy.label }} <a href="" id="check-all-proxies" class="pure-button button-secondary button-xsmall" >Check/Scan all</a></div>
                           <div>{{ form.proxy(class="fetch-backend-proxy") }}</div>
                         <span class="pure-form-message-inline">
-                        {{ _('Choose a proxy for this watch') }}
+                        Choose a proxy for this watch
                         </span>
                     </div>
                 {% endif %}
@@ -140,29 +139,31 @@
                     <div class="pure-control-group">
                         {{ render_field(form.webdriver_delay) }}
                         <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.
                             {% if using_global_webdriver_wait %}
-                            <br><strong>{{ _('Using the current global default settings') }}</strong>
+                            <br><strong>Using the current global default settings</strong>
                             {% endif %}
                         </div>
                     </div>
                     <div class="pure-control-group">
-                        <a class="pure-button button-secondary button-xsmall show-advanced">{{ _('Show advanced options') }}</a>
+                        <a class="pure-button button-secondary button-xsmall show-advanced">Show advanced options</a>
                     </div>
                     <div class="advanced-options"  style="display: none;">
                         {{ render_field(form.webdriver_js_execute_code) }}
                         <div class="pure-form-message-inline">
-                            {{ _('Run this code before performing change detection, handy for filling in fields and other actions') }} <a
-                                href="https://github.com/dgtlmoon/changedetection.io/wiki/Run-JavaScript-before-change-detection">{{ _('More help and examples here') }}</a>
+                            Run this code before performing change detection, handy for filling in fields and other
+                            actions <a
+                                href="https://github.com/dgtlmoon/changedetection.io/wiki/Run-JavaScript-before-change-detection">More
+                            help and examples here</a>
                         </div>
                     </div>
                 </fieldset>
                 <!-- html requests always -->
                 <fieldset data-visible-for="fetch_backend=html_requests">
                     <div class="pure-control-group">
-                        <a class="pure-button button-secondary button-xsmall show-advanced">{{ _('Show advanced options') }}</a>
+                        <a class="pure-button button-secondary button-xsmall show-advanced">Show advanced options</a>
                     </div>
                     <div class="advanced-options"  style="display: none;">
                         <div class="pure-control-group" id="request-method">
@@ -177,7 +178,7 @@
    \"year\":{% now 'Europe/Berlin', '%Y' %}
 }") }}
                         </div>
-                        <div class="pure-form-message">{{ _('Variables are supported in the request body') }} (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">{{ _('help and examples here') }}</a>).</div>
+                        <div class="pure-form-message">Variables are supported in the request body (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">help and examples here</a>).</div>
                     </div>
                 </fieldset>
             <!-- hmm -->
@@ -186,15 +187,15 @@
 Cookie: foobar
 User-Agent: wonderbra 1.0
 Math: {{ 1 + 1 }}") }}
-                        <div class="pure-form-message">{{ _('Variables are supported in the request header values') }} (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">{{ _('help and examples here') }}</a>).</div>
+                        <div class="pure-form-message">Variables are supported in the request header values (<a href="https://github.com/dgtlmoon/changedetection.io/wiki/Handling-variables-in-the-watched-URL">help and examples here</a>).</div>
                         <div class="pure-form-message-inline">
                             {% if has_extra_headers_file %}
-                                <strong>{{ _('Alert! Extra headers file found and will be added to this watch!') }}</strong>
+                                <strong>Alert! Extra headers file found and will be added to this watch!</strong>
                             {% else %}
-                                {{ _('Headers can be also read from a file in your data-directory') }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Adding-headers-from-an-external-file">{{ _('Read more here') }}</a>
+                                Headers can be also read from a file in your data-directory <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Adding-headers-from-an-external-file">Read more here</a>
                             {% endif %}
                             <br>
-                            ({{ _('Not supported by Selenium browser') }})
+                            (Not supported by Selenium browser)
                         </div>
                     </div>
             <fieldset data-visible-for="fetch_backend=html_requests fetch_backend=html_webdriver" >
@@ -205,8 +206,9 @@ Math: {{ 1 + 1 }}") }}
             </div>
 
             <div class="tab-pane-inner" id="browser-steps">
-            {% if capabilities.supports_browser_steps %}
-               {% if visual_selector_data_ready %}
+            {% if watch_needs_selenium_or_playwright %}
+                {# Only works with playwright #}
+                {% if system_has_playwright_configured %}
                 <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">
@@ -218,19 +220,19 @@ Math: {{ 1 + 1 }}") }}
 
                         <!---  Do this later -->
                         <div class="checkbox" style="display: none;">
-                            <input type=checkbox id="include_text_elements" > <label for="include_text_elements">{{ _('Turn on text finder') }}</label>
+                            <input type=checkbox id="include_text_elements" > <label for="include_text_elements">Turn on text finder</label>
                         </div>
 
-                        <div id="loading-status-text" style="display: none;">{{ _('Please wait, first browser step can take a little time to load..') }}<div class="spinner"></div></div>
+                        <div id="loading-status-text" style="display: none;">Please wait, first browser step can take a little time to load..<div class="spinner"></div></div>
                         <div class="flex-wrapper" >
 
                             <div id="browser-steps-ui" class="noselect">
                                 <div class="noselect"  id="browsersteps-selector-wrapper" style="width: 100%">
                                     <span class="loader" >
                                         <span id="browsersteps-click-start">
-                                            <h2 >{{ _('Click here to Start') }}</h2>
+                                            <h2 >Click here to Start</h2>
                                             <svg style="height: 3.5rem;" version="1.1" viewBox="0 0 32 32"  xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="start"/><g id="play_x5F_alt"><path d="M16,0C7.164,0,0,7.164,0,16s7.164,16,16,16s16-7.164,16-16S24.836,0,16,0z M10,24V8l16.008,8L10,24z" style="fill: var(--color-grey-400);"/></g></svg><br>
-                                            {{ _('Please allow 10-15 seconds for the browser to connect.') }}<br>
+                                            Please allow 10-15 seconds for the browser to connect.<br>
                                         </span>
                                         <div class="spinner"  style="display: none;"></div>
                                     </span>
@@ -239,20 +241,22 @@ Math: {{ 1 + 1 }}") }}
                                 </div>
                             </div>
                             <div id="browser-steps-fieldlist" >
-                                <span id="browser-seconds-remaining">{{ _('Press "Play" to start.') }}</span> <span style="font-size: 80%;"> (<a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/pull/478/files#diff-1a79d924d1840c485238e66772391268a89c95b781d69091384cf1ea1ac146c9R4">?</a>) </span>
+                                <span id="browser-seconds-remaining">Press "Play" to start.</span> <span style="font-size: 80%;"> (<a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/pull/478/files#diff-1a79d924d1840c485238e66772391268a89c95b781d69091384cf1ea1ac146c9R4">?</a>) </span>
                                 {{ render_field(form.browser_steps) }}
                             </div>
                         </div>
                     </div>
                 </fieldset>
                 {% else %}
-                    <strong>{{ _('Visual Selector data is not ready, watch needs to be checked atleast once.') }}</strong>
+                    {# it's configured to use selenium or chrome but system says its not configured #}
+                    {{ playwright_warning() }}
+                    {% if system_has_webdriver_configured %}
+                        <strong>Selenium/Webdriver cant be used here because it wont fetch screenshots reliably.</strong>
+                    {% endif %}
                 {% endif %}
             {% else %}
-                <p>
-                    <strong>{{ _('Sorry, this functionality only works with fetchers that support interactive Javascript (so far only Playwright based fetchers)') }}<br>
-                    {{ _('You need to') }} <a href="#request">{{ _('Set the fetch method') }}</a> {{ _('to one that supports interactive Javascript.') }}</strong>
-                </p>
+                {# "This functionality needs chrome.." #}
+                {{ only_playwright_type_watches_warning() }}
             {% endif %}
             </div>
 
@@ -262,28 +266,28 @@ Math: {{ 1 + 1 }}") }}
                     <div  class="pure-control-group inline-radio">
                       {{ render_ternary_field(form.notification_muted, BooleanField=true) }}
                     </div>
-                    {% if capabilities.supports_screenshots %}
+                    {% if watch_needs_selenium_or_playwright %}
                     <div class="pure-control-group inline-radio">
                       {{ render_checkbox_field(form.notification_screenshot) }}
                         <span class="pure-form-message-inline">
-                            <strong>{{ _('Use with caution!') }}</strong> {{ _('This will easily fill up your email storage quota or flood other storages.') }}
+                            <strong>Use with caution!</strong> This will easily fill up your email storage quota or flood other storages.
                         </span>
                     </div>
                     {% endif %}
                     <div class="field-group" id="notification-field-group">
                         {% if has_default_notification_urls %}
                         <div class="inline-warning">
-                            <img class="inline-warning-icon" src="{{url_for('static_content', group='images', filename='notice.svg')}}" alt="{{ _('Look out!') }}" title="{{ _('Lookout!') }}" >
-                            {{ _('There are') }} <a href="{{ url_for('settings.settings_page')}}#notifications">{{ _('system-wide notification URLs enabled') }}</a>, {{ _('this form will override notification settings for this watch only') }} &dash; {{ _('an empty Notification URL list here will still send notifications.') }}
+                            <img class="inline-warning-icon" src="{{url_for('static_content', group='images', filename='notice.svg')}}" alt="Look out!" title="Lookout!" >
+                            There are <a href="{{ url_for('settings.settings_page')}}#notifications">system-wide notification URLs enabled</a>, this form will override notification settings for this watch only &dash; an empty Notification URL list here will still send notifications.
                         </div>
                         {% endif %}
-                        <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="right: 20px; top: 20px; position: absolute; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">{{ _('Use system defaults') }}</a>
+                        <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="right: 20px; top: 20px; position: absolute; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">Use system defaults</a>
                         {{ render_common_settings_form(form, emailprefix, settings_application, extra_notification_token_placeholder_info) }}
                     </div>
                 </fieldset>
             </div>
 
-            {% if watch['processor'] == 'text_json_diff' or watch['processor'] == 'image_ssim_diff' %}
+            {% if watch['processor'] == 'text_json_diff' %}
 
             <div class="tab-pane-inner" id="conditions">
                     <script>
@@ -294,23 +298,23 @@ Math: {{ 1 + 1 }}") }}
                     {{ render_conditions_fieldlist_of_formfields_as_table(form.conditions) }}
                     <div class="pure-form-message-inline">
 
-                        <p id="verify-state-text">{{ _('Use the verify (✓) button to test if a condition passes against the current snapshot.') }}</p>
-                       {{ _('Read a quick tutorial about') }} <a href="https://changedetection.io/tutorial/conditional-actions-web-page-changes">{{ _('using conditional web page changes here') }}</a>.<br>
+                        <p id="verify-state-text">Use the verify (✓) button to test if a condition passes against the current snapshot.</p>
+                       Read a quick tutorial about <a href="https://changedetection.io/tutorial/conditional-actions-web-page-changes">using conditional web page changes here</a>.<br>
                     </div>
                 </div>
             </div>
             <div class="tab-pane-inner" id="filters-and-triggers">
-                <span id="activate-text-preview" class="pure-button pure-button-primary button-xsmall">{{ _('Activate preview') }}</span>
+                <span id="activate-text-preview" class="pure-button pure-button-primary button-xsmall">Activate preview</span>
               <div>
               <div id="edit-text-filter">
                     <div class="pure-control-group" id="pro-tips">
-                            <strong>{{ _('Pro-tips:') }}</strong><br>
+                            <strong>Pro-tips:</strong><br>
                             <ul>
                                 <li>
-                                    {{ _('Use the preview page to see your filters and triggers highlighted.') }}
+                                    Use the preview page to see your filters and triggers highlighted.
                                 </li>
                                 <li>
-                                    {{ _('Some sites use JavaScript to create the content, for this you should') }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Fetching-pages-with-WebDriver">{{ _('use the Chrome/WebDriver Fetcher') }}</a>
+                                    Some sites use JavaScript to create the content, for this you should <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Fetching-pages-with-WebDriver">use the Chrome/WebDriver Fetcher</a>
                                 </li>
                             </ul>
                     </div>
@@ -318,51 +322,50 @@ Math: {{ 1 + 1 }}") }}
 {% include "edit/include_subtract.html" %}
                 <div class="text-filtering border-fieldset">
                 <fieldset class="pure-group" id="text-filtering-type-options">
-                    <h3>{{ _('Text filtering') }}</h3>
-                        {{ _('Limit trigger/ignore/block/extract to;') }}<br>
+                    <h3>Text filtering</h3>
+                        Limit trigger/ignore/block/extract to;<br>
                         {{ render_checkbox_field(form.filter_text_added) }}
                         {{ render_checkbox_field(form.filter_text_replaced) }}
                         {{ render_checkbox_field(form.filter_text_removed) }}
-                    <span class="pure-form-message-inline">{{ _('Note: Depending on the length and similarity of the text on each line, the algorithm may consider an') }} <strong>{{ _('addition') }}</strong> {{ _('instead of') }} <strong>{{ _('replacement') }}</strong> {{ _('for example.') }}</span><br>
-                    <span class="pure-form-message-inline">&nbsp;{{ _('So it\'s always better to select') }} <strong>{{ _('Added') }}</strong>+<strong>{{ _('Replaced') }}</strong> {{ _('when you\'re interested in new content.') }}</span><br>
-                    <span class="pure-form-message-inline">&nbsp;{{ _('When content is merely moved in a list, it will also trigger an') }} <strong>{{ _('addition') }}</strong>, {{ _('consider enabling') }} <code><strong>{{ _('Only trigger when unique lines appear') }}</strong></code></span>
+                    <span class="pure-form-message-inline">Note: Depending on the length and similarity of the text on each line, the algorithm may consider an <strong>addition</strong> instead of <strong>replacement</strong> for example.</span><br>
+                    <span class="pure-form-message-inline">&nbsp;So it's always better to select <strong>Added</strong>+<strong>Replaced</strong> when you're interested in new content.</span><br>
+                    <span class="pure-form-message-inline">&nbsp;When content is merely moved in a list, it will also trigger an <strong>addition</strong>, consider enabling <code><strong>Only trigger when unique lines appear</strong></code></span>
                 </fieldset>
                 <fieldset class="pure-control-group">
                     {{ render_checkbox_field(form.check_unique_lines) }}
-                    <span class="pure-form-message-inline">{{ _('Good for websites that just move the content around, and you want to know when NEW content is added, compares new lines against all history for this watch.') }}</span>
+                    <span class="pure-form-message-inline">Good for websites that just move the content around, and you want to know when NEW content is added, compares new lines against all history for this watch.</span>
                 </fieldset>
                 <fieldset class="pure-control-group">
                     {{ render_checkbox_field(form.remove_duplicate_lines) }}
-                    <span class="pure-form-message-inline">{{ _('Remove duplicate lines of text') }}</span>
+                    <span class="pure-form-message-inline">Remove duplicate lines of text</span>
                 </fieldset>
                 <fieldset class="pure-control-group">
                     {{ render_checkbox_field(form.sort_text_alphabetically) }}
-                    <span class="pure-form-message-inline">{{ _('Helps reduce changes detected caused by sites shuffling lines around, combine with') }} <i>{{ _('check unique lines') }}</i> {{ _('below.') }}</span>
+                    <span class="pure-form-message-inline">Helps reduce changes detected caused by sites shuffling lines around, combine with <i>check unique lines</i> below.</span>
                 </fieldset>
                 <fieldset class="pure-control-group">
                     {{ render_checkbox_field(form.trim_text_whitespace) }}
-                    <span class="pure-form-message-inline">{{ _('Remove any whitespace before and after each line of text') }}</span>
+                    <span class="pure-form-message-inline">Remove any whitespace before and after each line of text</span>
                 </fieldset>
                 {% include "edit/text-options.html" %}
                 </div>
               </div>
               <div id="text-preview" style="display: none;" >
-                <script>
-                    const preview_text_edit_filters_url="{{url_for('ui.ui_edit.watch_get_preview_rendered', uuid=uuid)}}";
-                </script>
-                <br>
-                {#<div id="text-preview-controls"><span id="text-preview-refresh" class="pure-button button-xsmall">Refresh</span></div>#}
-                <div class="minitabs-wrapper">
-                  <div class="minitabs-content">
-                      <div id="text-preview-inner" class="monospace-preview">
-                          <p>{{ _('Loading...') }}</p>
+                    <script>
+                        const preview_text_edit_filters_url="{{url_for('ui.ui_edit.watch_get_preview_rendered', uuid=uuid)}}";
+                    </script>
+                    <br>
+                    {#<div id="text-preview-controls"><span id="text-preview-refresh" class="pure-button button-xsmall">Refresh</span></div>#}
+                    <div class="minitabs-wrapper">
+                      <div class="minitabs-content">
+                          <div id="text-preview-inner" class="monospace-preview">
+                              <p>Loading...</p>
+                          </div>
+                          <div id="text-preview-before-inner" style="display: none;" class="monospace-preview">
+                              <p>Loading...</p>
+                          </div>
                       </div>
-                      <div id="text-preview-before-inner" style="display: none;" class="monospace-preview">
-                          <p>{{ _('Loading...') }}</p>
-                      </div>
-                  </div>
-                </div>
-                {{ highlight_trigger_ignored_explainer() }}
+                    </div>
             </div>
           </div>
         </div>
@@ -374,55 +377,41 @@ Math: {{ 1 + 1 }}") }}
             {{ extra_form_content|safe }}
             </div>
         {% endif %}
-            {% if watch['processor'] == 'text_json_diff' or watch['processor'] == 'image_ssim_diff' %}
+            {% if watch['processor'] == 'text_json_diff' %}
             <div class="tab-pane-inner visual-selector-ui" id="visualselector">
                 <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">
-                        {% if capabilities.supports_screenshots and capabilities.supports_xpath_element_data %}
-                            {% if visual_selector_data_ready %}
-                                <span class="pure-form-message-inline" id="visual-selector-heading">
-                                    {{ _('The Visual Selector tool lets you select the') }} <i>{{ _('text') }}</i> {{ _('elements that will be used for the change detection. It automatically fills-in the filters in the "CSS/JSONPath/JQ/XPath Filters" box of the') }} <a href="#filters-and-triggers">{{ _('Filters & Triggers') }}</a> {{ _('tab. Use') }} <strong>{{ _('Shift+Click') }}</strong> {{ _('to select multiple items.') }}
-                                </span>
+                        {% if watch_needs_selenium_or_playwright %}
+                            {% if system_has_playwright_configured %}
+                            <span class="pure-form-message-inline" id="visual-selector-heading">
+                                The Visual Selector tool lets you select the <i>text</i> elements that will be used for the change detection. It automatically fills-in the filters in the "CSS/JSONPath/JQ/XPath Filters" box of the <a href="#filters-and-triggers">Filters & Triggers</a> tab. Use <strong>Shift+Click</strong> to select multiple items.
+                            </span>
 
-                                {% if watch['processor'] == 'image_ssim_diff' %}
-                                <div id="selection-mode-controls" style="margin: 10px 0; padding: 10px; background: var(--color-background-tab); border-radius: 5px;">
-                                    <label style="font-weight: 600; margin-right: 15px;">{{ _('Selection Mode:') }}</label>
-                                    <label style="margin-right: 15px;">
-                                        <input type="radio" name="selector-mode" value="element" style="margin-right: 5px;">
-                                        {{ _('Select by element') }}
-                                    </label>
-                                    <label>
-                                        <input type="radio" name="selector-mode" value="draw" checked style="margin-right: 5px;">
-                                        {{ _('Draw area') }}
-                                    </label>
-                                    {{ render_field(form.processor_config_bounding_box) }}
-                                    {{ render_field(form.processor_config_selection_mode) }}
-                                </div>
-                                {% endif %}
-
-                                <div id="selector-header">
-                                    <a id="clear-selector" class="pure-button button-secondary button-xsmall" style="font-size: 70%">{{ _('Clear selection') }}</a>
-                                    <!-- visual selector IMG will try to load, it will either replace this or on error replace it with some handy text -->
-                                    <i class="fetching-update-notice" style="font-size: 80%;">{{ _('One moment, fetching screenshot and element information..') }}</i>
-                                </div>
-                                <div id="selector-wrapper" style="display: none">
-                                    <!-- request the screenshot and get the element offset info ready -->
-                                    <!-- use img src ready load to know everything is ready to map out -->
-                                    <!-- @todo: maybe something interesting like a field to select 'elements that contain text... and their parents n' -->
-                                    <img id="selector-background" >
-                                    <canvas id="selector-canvas"></canvas>
-                                </div>
-                                <div id="selector-current-xpath" style="overflow-x: hidden"><strong>{{ _('Currently:') }}</strong>&nbsp;<span class="text">{{ _('Loading...') }}</span></div>
-                            {%  else %}
-                                <strong>{{ _('Visual Selector data is not ready, watch needs to be checked atleast once.') }}</strong>
-                            {%  endif %}
+                            <div id="selector-header">
+                                <a id="clear-selector" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Clear selection</a>
+                                <!-- visual selector IMG will try to load, it will either replace this or on error replace it with some handy text -->
+                                <i class="fetching-update-notice" style="font-size: 80%;">One moment, fetching screenshot and element information..</i>
+                            </div>
+                            <div id="selector-wrapper" style="display: none">
+                                <!-- request the screenshot and get the element offset info ready -->
+                                <!-- use img src ready load to know everything is ready to map out -->
+                                <!-- @todo: maybe something interesting like a field to select 'elements that contain text... and their parents n' -->
+                                <img id="selector-background" >
+                                <canvas id="selector-canvas"></canvas>
+                            </div>
+                            <div id="selector-current-xpath" style="overflow-x: hidden"><strong>Currently:</strong>&nbsp;<span class="text">Loading...</span></div>
+                        {% else %}
+                            {# The watch needed chrome but system says that playwright is not ready #}
+                            {{ playwright_warning() }}
+                        {% endif %}
+                            {% if system_has_webdriver_configured %}
+                                <strong>Selenium/Webdriver cant be used here because it wont fetch screenshots reliably.</strong>
+                            {% endif %}
                     {% else %}
-                        <p>
-                            <strong>{{ _('Sorry, this functionality only works with fetchers that support Javascript and screenshots (such as playwright etc).') }}<br>
-                            {{ _('You need to') }} <a href="#request">{{ _('Set the fetch method') }}</a> {{ _('to one that supports Javascript and screenshots.') }}</strong>
-                        </p>
+                        {# "This functionality needs chrome.." #}
+                        {{ only_playwright_type_watches_warning() }}
                     {% endif %}
                     </div>
                 </fieldset>
@@ -438,27 +427,27 @@ Math: {{ 1 + 1 }}") }}
                     <table class="pure-table" id="stats-table">
                         <tbody>
                         <tr>
-                            <td>{{ _('Check count') }}</td>
+                            <td>Check count</td>
                             <td>{{ "{:,}".format( watch.check_count) }}</td>
                         </tr>
                         <tr>
-                            <td>{{ _('Consecutive filter failures') }}</td>
+                            <td>Consecutive filter failures</td>
                             <td>{{ "{:,}".format( watch.consecutive_filter_failures) }}</td>
                         </tr>
                         <tr>
-                            <td>{{ _('History length') }}</td>
+                            <td>History length</td>
                             <td>{{ "{:,}".format(watch.history|length) }}</td>
                         </tr>
                         <tr>
-                            <td>{{ _('Last fetch duration') }}</td>
+                            <td>Last fetch duration</td>
                             <td>{{ watch.fetch_time }}s</td>
                         </tr>
                         <tr>
-                            <td>{{ _('Notification alert count') }}</td>
+                            <td>Notification alert count</td>
                             <td>{{ watch.notification_alert_count }}</td>
                         </tr>
                         <tr>
-                            <td>{{ _('Server type reply') }}</td>
+                            <td>Server type reply</td>
                             <td>{{ watch.get('remote_server_reply') }}</td>
                         </tr>
                         </tbody>
@@ -472,7 +461,7 @@ Math: {{ 1 + 1 }}") }}
 
                     {% if watch.history_n %}
                         <p>
-                             <a href="{{url_for('ui.ui_edit.watch_get_latest_html', uuid=uuid)}}" class="pure-button button-small">{{ _('Download latest HTML snapshot') }}</a>
+                             <a href="{{url_for('ui.ui_edit.watch_get_latest_html', uuid=uuid)}}" class="pure-button button-small">Download latest HTML snapshot</a>
                         </p>
                     {% endif %}
 
@@ -482,22 +471,12 @@ Math: {{ 1 + 1 }}") }}
                 <div class="pure-control-group">
                     {{ render_button(form.save_button) }}
                     <a href="{{url_for('ui.form_delete', uuid=uuid)}}"
-                       class="pure-button button-error"
-                       data-requires-confirm
-                       data-confirm-type="danger"
-                       data-confirm-title="{{ _('Delete Watch?') }}"
-                       data-confirm-message="<p>{{ _('Are you sure you want to delete the watch for:') }}</p><p><strong>{{ watch.get('url', 'this watch') }}</strong></p><p>{{ _('This action cannot be undone.') }}</p>"
-                       data-confirm-button="{{ _('Delete') }}">{{ _('Delete') }}</a>
+                       class="pure-button button-error ">Delete</a>
                     {% if watch.history_n %}<a href="{{url_for('ui.clear_watch_history', uuid=uuid)}}"
-                       class="pure-button button-error"
-                       data-requires-confirm
-                       data-confirm-type="warning"
-                       data-confirm-title="{{ _('Clear History?') }}"
-                       data-confirm-message="<p>{{ _('Are you sure you want to clear all history for:') }}</p><p><strong>{{ watch.get('url', 'this watch') }}</strong></p><p>{{ _('This will remove all snapshots and previous versions. This action cannot be undone.') }}</p>"
-                       data-confirm-button="{{ _('Clear History') }}">{{ _('Clear History') }}</a>{% endif %}
+                       class="pure-button button-error">Clear History</a>{% endif %}
                     <a href="{{url_for('ui.form_clone', uuid=uuid)}}"
-                       class="pure-button">{{ _('Clone & Edit') }}</a>
-                 <a href="{{ url_for('rss.rss_single_watch', uuid=uuid, token=app_rss_token)}}"><img alt="{{ _('RSS Feed for this watch') }}" style="padding: .5em 1em;" src="{{url_for('static_content', group='images', filename='generic_feed-icon.svg')}}" height="15"></a>
+                       class="pure-button">Clone &amp; Edit</a>
+                 <a href="{{ url_for('rss.rss_single_watch', uuid=uuid, token=app_rss_token)}}"><img alt="RSS Feed for this watch" style="padding: .5em 1em;" src="{{url_for('static_content', group='images', filename='generic_feed-icon.svg')}}" height="15"></a>
                 </div>
             </div>
         </form>

changedetectionio/blueprint/ui/views.py

@@ -1,11 +1,207 @@
-from flask import Blueprint, request, redirect, url_for, flash
+from flask import Blueprint, request, redirect, url_for, flash, render_template, make_response, send_from_directory, abort
+import os
+import time
+from loguru import logger
+
 from changedetectionio.store import ChangeDetectionStore
 from changedetectionio.auth_decorator import login_optionally_required
+from changedetectionio import html_tools
 from changedetectionio import worker_handler
 
-
 def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMetaData, watch_check_update):
     views_blueprint = Blueprint('ui_views', __name__, template_folder="../ui/templates")
+    
+    @views_blueprint.route("/preview/<string:uuid>", methods=['GET'])
+    @login_optionally_required
+    def preview_page(uuid):
+        content = []
+        versions = []
+        timestamp = None
+
+        # More for testing, possible to return the first/only
+        if uuid == 'first':
+            uuid = list(datastore.data['watching'].keys()).pop()
+
+        try:
+            watch = datastore.data['watching'][uuid]
+        except KeyError:
+            flash("No history found for the specified link, bad link?", "error")
+            return redirect(url_for('watchlist.index'))
+
+        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
+        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
+
+        is_html_webdriver = False
+        if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
+            is_html_webdriver = True
+        triggered_line_numbers = []
+        if datastore.data['watching'][uuid].history_n == 0 and (watch.get_error_text() or watch.get_error_snapshot()):
+            flash("Preview unavailable - No fetch/check completed or triggers not reached", "error")
+        else:
+            # So prepare the latest preview or not
+            preferred_version = request.args.get('version')
+            versions = list(watch.history.keys())
+            timestamp = versions[-1]
+            if preferred_version and preferred_version in versions:
+                timestamp = preferred_version
+
+            try:
+                versions = list(watch.history.keys())
+                content = watch.get_history_snapshot(timestamp=timestamp)
+
+                triggered_line_numbers = html_tools.strip_ignore_text(content=content,
+                                                                      wordlist=watch['trigger_text'],
+                                                                      mode='line numbers'
+                                                                      )
+
+            except Exception as e:
+                content.append({'line': f"File doesnt exist or unable to read timestamp {timestamp}", 'classes': ''})
+
+        output = render_template("preview.html",
+                                 content=content,
+                                 current_version=timestamp,
+                                 history_n=watch.history_n,
+                                 extra_stylesheets=extra_stylesheets,
+                                 extra_title=f" - Diff - {watch.label} @ {timestamp}",
+                                 triggered_line_numbers=triggered_line_numbers,
+                                 current_diff_url=watch['url'],
+                                 screenshot=watch.get_screenshot(),
+                                 watch=watch,
+                                 uuid=uuid,
+                                 is_html_webdriver=is_html_webdriver,
+                                 last_error=watch['last_error'],
+                                 last_error_text=watch.get_error_text(),
+                                 last_error_screenshot=watch.get_error_snapshot(),
+                                 versions=versions
+                                )
+
+        return output
+
+    @views_blueprint.route("/diff/<string:uuid>", methods=['POST'])
+    @login_optionally_required
+    def diff_history_page_build_report(uuid):
+        from changedetectionio import forms
+
+        # More for testing, possible to return the first/only
+        if uuid == 'first':
+            uuid = list(datastore.data['watching'].keys()).pop()
+
+        try:
+            watch = datastore.data['watching'][uuid]
+        except KeyError:
+            flash("No history found for the specified link, bad link?", "error")
+            return redirect(url_for('watchlist.index'))
+
+        # For submission of requesting an extract
+        extract_form = forms.extractDataForm(formdata=request.form,
+                                             data={'extract_regex': request.form.get('extract_regex', '')}
+                                             )
+        if not extract_form.validate():
+            flash("An error occurred, please see below.", "error")
+            return _render_diff_template(uuid, extract_form)
+
+        else:
+            extract_regex = request.form.get('extract_regex', '').strip()
+            output = watch.extract_regex_from_all_history(extract_regex)
+            if output:
+                watch_dir = os.path.join(datastore.datastore_path, uuid)
+                response = make_response(send_from_directory(directory=watch_dir, path=output, as_attachment=True))
+                response.headers['Content-type'] = 'text/csv'
+                response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
+                response.headers['Pragma'] = 'no-cache'
+                response.headers['Expires'] = "0"
+                return response
+
+            flash('No matches found while scanning all of the watch history for that RegEx.', 'error')
+        return redirect(url_for('ui.ui_views.diff_history_page', uuid=uuid) + '#extract')
+
+    def _render_diff_template(uuid, extract_form=None):
+        """Helper function to render the diff template with all required data"""
+        from changedetectionio import forms
+
+        # More for testing, possible to return the first/only
+        if uuid == 'first':
+            uuid = list(datastore.data['watching'].keys()).pop()
+
+        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
+        try:
+            watch = datastore.data['watching'][uuid]
+        except KeyError:
+            flash("No history found for the specified link, bad link?", "error")
+            return redirect(url_for('watchlist.index'))
+
+        # Use provided form or create a new one
+        if extract_form is None:
+            extract_form = forms.extractDataForm(formdata=request.form,
+                                                 data={'extract_regex': request.form.get('extract_regex', '')}
+                                                 )
+
+        history = watch.history
+        dates = list(history.keys())
+
+        # If a "from_version" was requested, then find it (or the closest one)
+        # Also set "from version" to be the closest version to the one that was last viewed.
+
+        best_last_viewed_timestamp = watch.get_from_version_based_on_last_viewed
+        from_version_timestamp = best_last_viewed_timestamp if best_last_viewed_timestamp else dates[-2]
+        from_version = request.args.get('from_version', from_version_timestamp )
+
+        # Use the current one if nothing was specified
+        to_version = request.args.get('to_version', str(dates[-1]))
+
+        try:
+            to_version_file_contents = watch.get_history_snapshot(timestamp=to_version)
+        except Exception as e:
+            logger.error(f"Unable to read watch history to-version for version {to_version}: {str(e)}")
+            to_version_file_contents = f"Unable to read to-version at {to_version}.\n"
+
+        try:
+            from_version_file_contents = watch.get_history_snapshot(timestamp=from_version)
+        except Exception as e:
+            logger.error(f"Unable to read watch history from-version for version {from_version}: {str(e)}")
+            from_version_file_contents = f"Unable to read to-version {from_version}.\n"
+
+        screenshot_url = watch.get_screenshot()
+
+        system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
+
+        is_html_webdriver = False
+        if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
+            is_html_webdriver = True
+
+        password_enabled_and_share_is_off = False
+        if datastore.data['settings']['application'].get('password') or os.getenv("SALTED_PASS", False):
+            password_enabled_and_share_is_off = not datastore.data['settings']['application'].get('shared_diff_access')
+
+        datastore.set_last_viewed(uuid, time.time())
+
+        return render_template("diff.html",
+                                 current_diff_url=watch['url'],
+                                 from_version=str(from_version),
+                                 to_version=str(to_version),
+                                 extra_stylesheets=extra_stylesheets,
+                                 extra_title=f" - Diff - {watch.label}",
+                                 extract_form=extract_form,
+                                 is_html_webdriver=is_html_webdriver,
+                                 last_error=watch['last_error'],
+                                 last_error_screenshot=watch.get_error_snapshot(),
+                                 last_error_text=watch.get_error_text(),
+                                 left_sticky=True,
+                                 newest=to_version_file_contents,
+                                 newest_version_timestamp=dates[-1],
+                                 password_enabled_and_share_is_off=password_enabled_and_share_is_off,
+                                 from_version_file_contents=from_version_file_contents,
+                                 to_version_file_contents=to_version_file_contents,
+                                 screenshot=screenshot_url,
+                                 uuid=uuid,
+                                 versions=dates, # All except current/last
+                                 watch_a=watch
+                                 )
+
+    @views_blueprint.route("/diff/<string:uuid>", methods=['GET'])
+    @login_optionally_required
+    def diff_history_page(uuid):
+        return _render_diff_template(uuid)
 
     @views_blueprint.route("/form/add/quickwatch", methods=['POST'])
     @login_optionally_required

changedetectionio/blueprint/watchlist/__init__.py

@@ -6,7 +6,6 @@ from flask_login import current_user
 from flask_paginate import Pagination, get_page_parameter
 
 from changedetectionio import forms
-from changedetectionio import processors
 from changedetectionio.store import ChangeDetectionStore
 from changedetectionio.auth_decorator import login_optionally_required
 
@@ -91,9 +90,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
             hosted_sticky=os.getenv("SALTED_PASS", False) == False,
             now_time_server=round(time.time()),
             pagination=pagination,
-            processor_badge_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],
             search_q=request.args.get('q', '').strip(),
             sort_attribute=request.args.get('sort') if request.args.get('sort') else request.cookies.get('sort'),

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

@@ -3,7 +3,6 @@
 {%- from '_helpers.html' import render_simple_field, render_field, render_nolabel_field, sort_by_title -%}
 <script src="{{url_for('static_content', group='js', filename='jquery-3.6.0.min.js')}}"></script>
 <script src="{{url_for('static_content', group='js', filename='watch-overview.js')}}" defer></script>
-<script src="{{url_for('static_content', group='js', filename='modal.js')}}"></script>
 <script>let nowtimeserver={{ now_time_server }};</script>
 <script>let favicon_baseURL="{{ url_for('static_content', group='favicon', filename="PLACEHOLDER")}}";</script>
 <script>
@@ -19,20 +18,17 @@ document.addEventListener('DOMContentLoaded', function() {
     background-repeat: no-repeat;
     transition: background-size 0.9s ease
 }
-
-/* Auto-generated processor badge colors */
-{{ processor_badge_css|safe }}
 </style>
 <div class="box" id="form-quick-watch-add">
 
     <form class="pure-form" action="{{ url_for('ui.ui_views.form_quick_watch_add', tag=active_tag_uuid) }}" method="POST" id="new-watch-form">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" >
         <fieldset>
-            <legend>{{ _('Add a new web page change detection watch') }}</legend>
+            <legend>Add a new web page change detection watch</legend>
             <div id="watch-add-wrapper-zone">
                     {{ render_nolabel_field(form.url, placeholder="https://...", required=true) }}
-                    {{ render_nolabel_field(form.watch_submit_button, title=_("Watch this URL!") ) }}
-                    {{ render_nolabel_field(form.edit_and_watch_submit_button, title=_("Edit first then Watch") ) }}
+                    {{ render_nolabel_field(form.watch_submit_button, title="Watch this URL!" ) }}
+                    {{ 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") }}
@@ -42,7 +38,7 @@ document.addEventListener('DOMContentLoaded', function() {
             </div>
 
         </fieldset>
-        <span style="color:#eee; font-size: 80%;"><img alt="{{ _('Create a shareable link') }}" style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread-white.svg')}}" > {{ _("Tip: You can also add 'shared' watches.") }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Sharing-a-Watch">{{ _('More info') }}</a></span>
+        <span style="color:#eee; font-size: 80%;"><img alt="Create a shareable link" style="height: 1em;display:inline-block;" src="{{url_for('static_content', group='images', filename='spread-white.svg')}}" > Tip: You can also add 'shared' watches. <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Sharing-a-Watch">More info</a></span>
     </form>
 </div>
 <div class="box">
@@ -50,34 +46,24 @@ document.addEventListener('DOMContentLoaded', function() {
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" >
     <input type="hidden" id="op_extradata" name="op_extradata" value="" >
     <div id="checkbox-operations">
-        <button class="pure-button button-secondary button-xsmall"  name="op" value="pause"><i data-feather="pause" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Pause') }}</button>
-        <button class="pure-button button-secondary button-xsmall"  name="op" value="unpause"><i data-feather="play" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('UnPause') }}</button>
-        <button class="pure-button button-secondary button-xsmall"  name="op" value="mute"><i data-feather="volume-x" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Mute') }}</button>
-        <button class="pure-button button-secondary button-xsmall"  name="op" value="unmute"><i data-feather="volume-2" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('UnMute') }}</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="recheck"><i data-feather="refresh-cw" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Recheck') }}</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="assign-tag" id="checkbox-assign-tag"><i data-feather="tag" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Tag') }}</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="mark-viewed"><i data-feather="eye" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Mark viewed') }}</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="notification-default"><i data-feather="bell" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Use default notification') }}</button>
-        <button class="pure-button button-secondary button-xsmall" name="op" value="clear-errors"><i data-feather="x-circle" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Clear errors') }}</button>
-        <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="clear-history"
-                       data-requires-confirm
-                       data-confirm-type="danger"
-                       data-confirm-title="{{ _('Clear Histories') }}"
-                       data-confirm-message="{{ _('<p>Are you sure you want to clear history for the selected items?</p><p>This action cannot be undone.</p>') }}"
-                       data-confirm-button="{{ _('OK') }}"><i data-feather="trash-2" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Clear/reset history') }}</button>
-        <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="delete"
-                       data-requires-confirm
-                       data-confirm-type="danger"
-                       data-confirm-title="{{ _('Delete Watches?') }}"
-                       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>
+        <button class="pure-button button-secondary button-xsmall"  name="op" value="pause"><i data-feather="pause" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Pause</button>
+        <button class="pure-button button-secondary button-xsmall"  name="op" value="unpause"><i data-feather="play" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>UnPause</button>
+        <button class="pure-button button-secondary button-xsmall"  name="op" value="mute"><i data-feather="volume-x" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Mute</button>
+        <button class="pure-button button-secondary button-xsmall"  name="op" value="unmute"><i data-feather="volume-2" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>UnMute</button>
+        <button class="pure-button button-secondary button-xsmall" name="op" value="recheck"><i data-feather="refresh-cw" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Recheck</button>
+        <button class="pure-button button-secondary button-xsmall" name="op" value="assign-tag" id="checkbox-assign-tag"><i data-feather="tag" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Tag</button>
+        <button class="pure-button button-secondary button-xsmall" name="op" value="mark-viewed"><i data-feather="eye" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Mark viewed</button>
+        <button class="pure-button button-secondary button-xsmall" name="op" value="notification-default"><i data-feather="bell" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Use default notification</button>
+        <button class="pure-button button-secondary button-xsmall" name="op" value="clear-errors"><i data-feather="x-circle" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Clear errors</button>
+        <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="clear-history"><i data-feather="trash-2" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>Clear/reset history</button>
+        <button class="pure-button button-secondary button-xsmall" style="background: #dd4242;" name="op" value="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 -%}
-    {%- if search_q -%}<div id="search-result-info">{{ _('Searching') }} "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
+    {%- if search_q -%}<div id="search-result-info">Searching "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
     <div>
-        <a href="{{url_for('watchlist.index')}}" class="pure-button button-tag {{'active' if not active_tag_uuid }}">{{ _('All') }}</a>
+        <a href="{{url_for('watchlist.index')}}" class="pure-button button-tag {{'active' if not active_tag_uuid }}">All</a>
 
     <!-- tag list -->
     {%- for uuid, tag in tags -%}
@@ -115,19 +101,19 @@ document.addEventListener('DOMContentLoaded', function() {
                     &nbsp;
                     <a class="{{ 'active '+link_order if sort_attribute == 'notification_muted' else 'inactive' }}" href="{{url_for('watchlist.index', sort='notification_muted', order=link_order, tag=active_tag_uuid)}}"><i data-feather="volume-2" style="vertical-align: bottom; width: 14px; height: 14px;  margin-right: 4px;"></i><span class='arrow {{link_order}}'></span></a>
                 </th>
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'label' else 'inactive' }}" href="{{url_for('watchlist.index', sort='label', order=link_order, tag=active_tag_uuid)}}">{{ _('Website') }} <span class='arrow {{link_order}}'></span></a></th>
+                <th><a class="{{ 'active '+link_order if sort_attribute == 'label' else 'inactive' }}" href="{{url_for('watchlist.index', sort='label', order=link_order, tag=active_tag_uuid)}}">Website <span class='arrow {{link_order}}'></span></a></th>
              {%- if any_has_restock_price_processor -%}
-                <th>{{ _('Restock & Price') }}</th>
+                <th>Restock &amp; Price</th>
              {%- endif -%}
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_checked' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_checked', order=link_order, tag=active_tag_uuid)}}"><span class="hide-on-mobile">{{ _('Last') }}</span> {{ _('Checked') }} <span class='arrow {{link_order}}'></span></a></th>
-                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_changed' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_changed', order=link_order, tag=active_tag_uuid)}}"><span class="hide-on-mobile">{{ _('Last') }}</span> {{ _('Changed') }} <span class='arrow {{link_order}}'></span></a></th>
+                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_checked' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_checked', order=link_order, tag=active_tag_uuid)}}"><span class="hide-on-mobile">Last</span> Checked <span class='arrow {{link_order}}'></span></a></th>
+                <th><a class="{{ 'active '+link_order if sort_attribute == 'last_changed' else 'inactive' }}" href="{{url_for('watchlist.index', sort='last_changed', order=link_order, tag=active_tag_uuid)}}"><span class="hide-on-mobile">Last</span> Changed <span class='arrow {{link_order}}'></span></a></th>
                 <th class="empty-cell"></th>
             </tr>
             </thead>
             <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 website 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 -%}
 
@@ -181,14 +167,14 @@ document.addEventListener('DOMContentLoaded', function() {
                             {% endif %}
                            <a class="external" target="_blank" rel="noopener" href="{{ watch.link.replace('source:','') }}">&nbsp;</a>
                         </span>
-                            <div class="error-text" style="display:none;">{{ watch.compile_error_texts(has_proxies=datastore.proxy_list)|safe }}</div>
+                            <div class="error-text" style="display:none;">{{ watch.compile_error_texts(has_proxies=datastore.proxy_list) }}</div>
                             {%- if watch['processor'] == 'text_json_diff'  -%}
                                 {%- if watch['has_ldjson_price_data'] and not watch['track_ldjson_price_data']  -%}
                                 <div class="ldjson-price-track-offer">Switch to Restock & Price watch mode? <a href="{{url_for('price_data_follower.accept', uuid=watch.uuid)}}" class="pure-button button-xsmall">Yes</a> <a href="{{url_for('price_data_follower.reject', uuid=watch.uuid)}}" class="">No</a></div>
                                 {%- endif -%}
                             {%- endif -%}
-                            {%- if watch['processor'] and watch['processor'] in processor_badge_texts -%}
-                                <span class="processor-badge processor-badge-{{ watch['processor'] }}" title="{{ processor_descriptions.get(watch['processor'], watch['processor']) }}">{{ processor_badge_texts[watch['processor']] }}</span>
+                            {%- if watch['processor'] == 'restock_diff' -%}
+                                <span class="tracking-ldjson-price-data" title="Automatically following embedded price information"><img src="{{url_for('static_content', group='images', filename='price-tag-icon.svg')}}"  class="status-icon price-follow-tag-icon" > Price</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>
@@ -196,9 +182,11 @@ document.addEventListener('DOMContentLoaded', function() {
                         </div>
                     <div class="status-icons">
                             <a class="link-spread" href="{{url_for('ui.form_share_put_watch', uuid=watch.uuid)}}"><img src="{{url_for('static_content', group='images', filename='spread.svg')}}" class="status-icon icon icon-spread" title="Create a link to share watch config with others" ></a>
-                            {%- set effective_fetcher = watch.get_fetch_backend if watch.get_fetch_backend != "system" else system_default_fetcher -%}
-                            {%- if effective_fetcher and ("html_webdriver" in effective_fetcher or "html_" in effective_fetcher or "extra_browser_" in effective_fetcher) -%}
-                                {{ effective_fetcher|fetcher_status_icons }}
+                            {%- if watch.get_fetch_backend == "html_webdriver"
+                                 or ( watch.get_fetch_backend == "system" and system_default_fetcher == 'html_webdriver'  )
+                                 or "extra_browser_" in watch.get_fetch_backend
+                            -%}
+                            <img class="status-icon" src="{{url_for('static_content', group='images', filename='google-chrome-icon.png')}}" alt="Using a Chrome browser" title="Using a Chrome browser" >
                             {%- endif -%}
                             {%- if watch.is_pdf  -%}<img class="status-icon" src="{{url_for('static_content', group='images', filename='pdf-icon.svg')}}" alt="Converting PDF to text" >{%- endif -%}
                             {%- if watch.has_browser_steps -%}<img class="status-icon status-browsersteps" src="{{url_for('static_content', group='images', filename='steps.svg')}}" alt="Browser Steps is enabled" >{%- endif -%}
@@ -210,20 +198,20 @@ document.addEventListener('DOMContentLoaded', function() {
                 <td class="restock-and-price">
                     {%- if watch['processor'] == 'restock_diff'  -%}
                         {%- if watch.has_restock_info -%}
-                            <span class="restock-label {{'in-stock' if watch['restock']['in_stock'] else 'not-in-stock' }}" title="{{ _('Detecting restock and price') }}">
+                            <span class="restock-label {{'in-stock' if watch['restock']['in_stock'] else 'not-in-stock' }}" title="Detecting restock and price">
                                 <!-- maybe some object watch['processor'][restock_diff] or.. -->
-                                 {%- if watch['restock']['in_stock']-%}  {{ _('In stock') }} {%- else-%}  {{ _('Not in stock') }} {%- endif -%}
+                                 {%- if watch['restock']['in_stock']-%}  In stock {%- else-%}  Not in stock {%- endif -%}
                             </span>
                         {%- endif -%}
 
                         {%- if watch.get('restock') and watch['restock']['price'] != None -%}
                             {%- if watch['restock']['price'] != None -%}
-                                <span class="restock-label price" title="{{ _('Price') }}">
-                                {{ watch['restock']['price']|format_number_locale if watch['restock'].get('price') else '' }} {{ watch['restock'].get('currency','') }}
+                                <span class="restock-label price" title="Price">
+                                {{ watch['restock']['price']|format_number_locale }} {{ watch['restock']['currency'] }}
                                 </span>
                             {%- endif -%}
                         {%- elif not watch.has_restock_info -%}
-                            <span class="restock-label error">{{ _('No information') }}</span>
+                            <span class="restock-label error">No information</span>
                         {%- endif -%}
                     {%- endif -%}
                 </td>
@@ -231,24 +219,24 @@ document.addEventListener('DOMContentLoaded', function() {
             {#last_checked becomes fetch-start-time#}
                 <td class="last-checked" data-timestamp="{{ watch.last_checked }}" data-fetchduration={{ watch.fetch_time }} data-eta_complete="{{ watch.last_checked+watch.fetch_time }}" >
                     <div class="spinner-wrapper" style="display:none;" >
-                        <span class="spinner"></span><span class="status-text">&nbsp;{{ _('Checking now') }}</span>
+                        <span class="spinner"></span><span>&nbsp;Checking now</span>
                     </div>
                     <span class="innertext">{{watch|format_last_checked_time|safe}}</span>
                 </td>
                 <td class="last-changed" data-timestamp="{{ watch.last_changed }}">{%- if watch.history_n >=2 and watch.last_changed >0 -%}
                     {{watch.last_changed|format_timestamp_timeago}}
                     {%- else -%}
-                    {{ _('Not yet') }}
+                    Not yet
                     {%- endif -%}
                 </td>
                 <td class="buttons">
                     <div>
                     {%- set target_attr = ' target="' ~ watch.uuid ~ '"' if datastore.data['settings']['application']['ui'].get('open_diff_in_new_tab') else '' -%}
-                    <a href="" class="already-in-queue-button recheck pure-button pure-button-primary" style="display: none;" disabled="disabled">{{ _('Queued') }}</a>
-                    <a href="{{ url_for('ui.form_watch_checknow', uuid=watch.uuid, tag=request.args.get('tag')) }}" data-op='recheck' class="ajax-op recheck pure-button pure-button-primary">{{ _('Recheck') }}</a>
-                    <a href="{{ url_for('ui.ui_edit.edit_page', uuid=watch.uuid, tag=active_tag_uuid)}}#general" class="pure-button pure-button-primary">{{ _('Edit') }}</a>
-                    <a href="{{ url_for('ui.ui_diff.diff_history_page', uuid=watch.uuid)}}" {{target_attr}} class="pure-button pure-button-primary history-link" style="display: none;">{{ _('History') }}</a>
-                    <a href="{{ url_for('ui.ui_preview.preview_page', uuid=watch.uuid)}}" {{target_attr}} class="pure-button pure-button-primary preview-link" style="display: none;">{{ _('Preview') }}</a>
+                    <a href="" class="already-in-queue-button recheck pure-button pure-button-primary" style="display: none;" disabled="disabled">Queued</a>
+                    <a href="{{ url_for('ui.form_watch_checknow', uuid=watch.uuid, tag=request.args.get('tag')) }}" data-op='recheck' class="ajax-op recheck pure-button pure-button-primary">Recheck</a>
+                    <a href="{{ url_for('ui.ui_edit.edit_page', uuid=watch.uuid, tag=active_tag_uuid)}}#general" class="pure-button pure-button-primary">Edit</a>
+                    <a href="{{ url_for('ui.ui_views.diff_history_page', uuid=watch.uuid)}}" {{target_attr}} class="pure-button pure-button-primary history-link" style="display: none;">History</a>
+                    <a href="{{ url_for('ui.ui_views.preview_page', uuid=watch.uuid)}}" {{target_attr}} class="pure-button pure-button-primary preview-link" style="display: none;">Preview</a>
                     </div>
                 </td>
             </tr>
@@ -257,21 +245,22 @@ document.addEventListener('DOMContentLoaded', function() {
         </table>
         <ul id="post-list-buttons">
             <li id="post-list-with-errors" style="display: none;" >
-                <a href="{{url_for('watchlist.index', with_errors=1, tag=request.args.get('tag')) }}" class="pure-button button-tag button-error">{{ _('With errors') }} ({{ errored_count }})</a>
+                <a href="{{url_for('watchlist.index', with_errors=1, tag=request.args.get('tag')) }}" class="pure-button button-tag button-error">With errors ({{ errored_count }})</a>
             </li>
             <li id="post-list-mark-views" style="display: none;" >
-                <a href="{{url_for('ui.mark_all_viewed',with_errors=request.args.get('with_errors',0)) }}" class="pure-button button-tag " id="mark-all-viewed">{{ _('Mark all viewed') }}</a>
+                <a href="{{url_for('ui.mark_all_viewed',with_errors=request.args.get('with_errors',0)) }}" class="pure-button button-tag " id="mark-all-viewed">Mark all viewed</a>
             </li>
         {%-  if active_tag_uuid -%}
             <li id="post-list-mark-views-tag">
-                <a href="{{url_for('ui.mark_all_viewed', tag=active_tag_uuid) }}" class="pure-button button-tag " id="mark-all-viewed">{{ _("Mark all viewed in '%(title)s'", title=active_tag.title) }}</a>
+                <a href="{{url_for('ui.mark_all_viewed', tag=active_tag_uuid) }}" class="pure-button button-tag " id="mark-all-viewed">Mark all viewed in '{{active_tag.title}}'</a>
             </li>
         {%-  endif -%}
             <li id="post-list-unread" style="display: none;" >
-                <a href="{{url_for('watchlist.index', unread=1, tag=request.args.get('tag')) }}" class="pure-button button-tag">{{ _('Unread') }} (<span id="unread-tab-counter">{{ unread_changes_count }}</span>)</a>
+                <a href="{{url_for('watchlist.index', unread=1, tag=request.args.get('tag')) }}" class="pure-button button-tag">Unread (<span id="unread-tab-counter">{{ unread_changes_count }}</span>)</a>
             </li>
             <li>
-               <a href="{{ url_for('ui.form_watch_checknow', tag=active_tag_uuid, with_errors=request.args.get('with_errors',0)) }}" class="pure-button button-tag" id="recheck-all">{{ _('Recheck all') }} {% if active_tag_uuid %}  {{ _("in '%(title)s'", title=active_tag.title) }}{%endif%}</a>
+               <a href="{{ url_for('ui.form_watch_checknow', tag=active_tag_uuid, with_errors=request.args.get('with_errors',0)) }}" class="pure-button button-tag" id="recheck-all">Recheck
+                all {% if active_tag_uuid %}  in '{{active_tag.title}}'{%endif%}</a>
             </li>
             <li>
                 <a href="{{ url_for('rss.feed', tag=active_tag_uuid, token=app_rss_token)}}"><img alt="RSS Feed" id="feed-icon" src="{{url_for('static_content', group='images', filename='generic_feed-icon.svg')}}" height="15"></a>

changedetectionio/conditions/plugins/levenshtein_plugin.py

@@ -1,7 +1,3 @@
-"""
-Levenshtein distance and similarity plugin for text change detection.
-Provides metrics for measuring text similarity between snapshots.
-"""
 import pluggy
 from loguru import logger
 

changedetectionio/conditions/plugins/wordcount_plugin.py

@@ -1,7 +1,3 @@
-"""
-Word count plugin for content analysis.
-Provides word count metrics for snapshot content.
-"""
 import pluggy
 from loguru import logger
 

changedetectionio/content_fetchers/__init__.py

@@ -7,9 +7,6 @@ import os
 # Visual Selector scraper - 'Button' is there because some sites have <button>OUT OF STOCK</button>.
 visualselector_xpath_selectors = 'div,span,form,table,tbody,tr,td,a,p,ul,li,h1,h2,h3,h4,header,footer,section,article,aside,details,main,nav,section,summary,button'
 
-# Import hookimpl from centralized pluggy interface
-from changedetectionio.pluggy_interface import hookimpl
-
 SCREENSHOT_MAX_HEIGHT_DEFAULT = 20000
 SCREENSHOT_DEFAULT_QUALITY = 40
 
@@ -21,9 +18,7 @@ SCREENSHOT_MAX_TOTAL_HEIGHT = int(os.getenv("SCREENSHOT_MAX_HEIGHT", SCREENSHOT_
 # The size at which we will switch to stitching method, when below this (and
 # MAX_TOTAL_HEIGHT which can be set by a user) we will use the default
 # screenshot method.
-# Increased from 8000 to 10000 for better performance (fewer chunks = faster)
-# Most modern GPUs support 16384x16384 textures, so 1280x10000 is safe
-SCREENSHOT_SIZE_STITCH_THRESHOLD = int(os.getenv("SCREENSHOT_CHUNK_HEIGHT", 10000))
+SCREENSHOT_SIZE_STITCH_THRESHOLD = 8000
 
 # available_fetchers() will scan this implementation looking for anything starting with html_
 # this information is used in the form selections
@@ -40,54 +35,17 @@ def available_fetchers():
     # See the if statement at the bottom of this file for how we switch between playwright and webdriver
     import inspect
     p = []
-
-    # Get built-in fetchers (but skip plugin fetchers that were added via setattr)
     for name, obj in inspect.getmembers(sys.modules[__name__], inspect.isclass):
         if inspect.isclass(obj):
             # @todo html_ is maybe better as fetcher_ or something
             # In this case, make sure to edit the default one in store.py and fetch_site_status.py
             if name.startswith('html_'):
-                # Skip plugin fetchers that were already registered
-                if name not in _plugin_fetchers:
-                    t = tuple([name, obj.fetcher_description])
-                    p.append(t)
-
-    # Get plugin fetchers from cache (already loaded at module init)
-    for name, fetcher_class in _plugin_fetchers.items():
-        if hasattr(fetcher_class, 'fetcher_description'):
-            t = tuple([name, fetcher_class.fetcher_description])
-            p.append(t)
-        else:
-            logger.warning(f"Plugin fetcher '{name}' does not have fetcher_description attribute")
+                t = tuple([name, obj.fetcher_description])
+                p.append(t)
 
     return p
 
 
-def get_plugin_fetchers():
-    """Load and return all plugin fetchers from the centralized plugin manager."""
-    from changedetectionio.pluggy_interface import plugin_manager
-
-    fetchers = {}
-    try:
-        # Call the register_content_fetcher hook from all registered plugins
-        results = plugin_manager.hook.register_content_fetcher()
-        for result in results:
-            if result:
-                name, fetcher_class = result
-                fetchers[name] = fetcher_class
-                # Register in current module so hasattr() checks work
-                setattr(sys.modules[__name__], name, fetcher_class)
-                logger.info(f"Registered plugin fetcher: {name} - {getattr(fetcher_class, 'fetcher_description', 'No description')}")
-    except Exception as e:
-        logger.error(f"Error loading plugin fetchers: {e}")
-
-    return fetchers
-
-
-# Initialize plugins at module load time
-_plugin_fetchers = get_plugin_fetchers()
-
-
 # Decide which is the 'real' HTML webdriver, this is more a system wide config
 # rather than site-specific.
 use_playwright_as_chrome_fetcher = os.getenv('PLAYWRIGHT_DRIVER_URL', False)
@@ -104,8 +62,3 @@ else:
     logger.debug("Falling back to selenium as fetcher")
     from .webdriver_selenium import fetcher as html_webdriver
 
-
-# Register built-in fetchers as plugins after all imports are complete
-from changedetectionio.pluggy_interface import register_builtin_fetchers
-register_builtin_fetchers()
-

changedetectionio/content_fetchers/base.py

@@ -51,7 +51,6 @@ class Fetcher():
     favicon_blob = None
     instock_data = None
     instock_data_js = ""
-    screenshot_format = None
     status_code = None
     webdriver_js_execute_code = None
     xpath_data = None
@@ -65,35 +64,6 @@ class Fetcher():
     # Time ONTOP of the system defined env minimum time
     render_extract_delay = 0
 
-    # Fetcher capability flags - subclasses should override these
-    # These indicate what features the fetcher supports
-    supports_browser_steps = False      # Can execute browser automation steps
-    supports_screenshots = False        # Can capture page screenshots
-    supports_xpath_element_data = False # Can extract xpath element positions/data for visual selector
-
-    def __init__(self, **kwargs):
-        if kwargs and 'screenshot_format' in kwargs:
-            self.screenshot_format = kwargs.get('screenshot_format')
-
-
-    @classmethod
-    def get_status_icon_data(cls):
-        """Return data for status icon to display in the watch overview.
-
-        This method can be overridden by subclasses to provide custom status icons.
-
-        Returns:
-            dict or None: Dictionary with icon data:
-                {
-                    'filename': 'icon-name.svg',  # Icon filename
-                    'alt': 'Alt text',            # Alt attribute
-                    'title': 'Tooltip text',      # Title attribute
-                    'style': 'height: 1em;'       # Optional inline CSS
-                }
-                Or None if no icon
-        """
-        return None
-
     def clear_content(self):
         """
         Explicitly clear all content from memory to free up heap space.
@@ -122,13 +92,12 @@ class Fetcher():
                   request_method=None,
                   timeout=None,
                   url=None,
-                  watch_uuid=None,
                   ):
         # Should set self.error, self.status_code and self.content
         pass
 
     @abstractmethod
-    async def quit(self, watch=None):
+    def quit(self, watch=None):
         return
 
     @abstractmethod

changedetectionio/content_fetchers/playwright.py

@@ -9,10 +9,10 @@ from changedetectionio.content_fetchers import SCREENSHOT_MAX_HEIGHT_DEFAULT, vi
 from changedetectionio.content_fetchers.base import Fetcher, manage_user_agent
 from changedetectionio.content_fetchers.exceptions import PageUnloadable, Non200ErrorCodeReceived, EmptyReply, ScreenshotUnavailable
 
-async def capture_full_page_async(page, screenshot_format='JPEG'):
+async def capture_full_page_async(page):
     import os
     import time
-    import multiprocessing
+    from multiprocessing import Process, Pipe
 
     start = time.time()
 
@@ -26,20 +26,8 @@ async def capture_full_page_async(page, screenshot_format='JPEG'):
     step_size = SCREENSHOT_SIZE_STITCH_THRESHOLD # Size that won't cause GPU to overflow
     screenshot_chunks = []
     y = 0
-    elements_locked = False
 
     if page_height > page.viewport_size['height']:
-
-        # Lock all element dimensions BEFORE screenshot to prevent CSS media queries from resizing
-        # capture_full_page_async() changes viewport height which triggers @media (min-height) rules
-        lock_elements_js_path = os.path.join(os.path.dirname(__file__), 'res', 'lock-elements-sizing.js')
-        with open(lock_elements_js_path, 'r') as f:
-            lock_elements_js = f.read()
-        await page.evaluate(lock_elements_js)
-        elements_locked = True
-
-        logger.debug("Element dimensions locked before screenshot capture")
-
         if page_height < step_size:
             step_size = page_height # Incase page is bigger than default viewport but smaller than proposed step size
         logger.debug(f"Setting bigger viewport to step through large page width W{page.viewport_size['width']}xH{step_size} because page_height > viewport_size")
@@ -47,68 +35,36 @@ async def capture_full_page_async(page, screenshot_format='JPEG'):
         await page.set_viewport_size({'width': page.viewport_size['width'], 'height': step_size})
 
     # Capture screenshots in chunks up to the max total height
-    # Use PNG for better quality (no compression artifacts), JPEG for smaller size
-    screenshot_type = screenshot_format.lower() if screenshot_format else 'jpeg'
-    # PNG should use quality 100, JPEG uses configurable quality
-    screenshot_quality = 100 if screenshot_type == 'png' else int(os.getenv("SCREENSHOT_QUALITY", 72))
-
     while y < min(page_height, SCREENSHOT_MAX_TOTAL_HEIGHT):
-        # Only scroll if not at the top (y > 0)
-        if y > 0:
-            await page.evaluate(f"window.scrollTo(0, {y})")
-
-        # Request GC only before screenshot (not 3x per chunk)
         await page.request_gc()
-
-        screenshot_kwargs = {
-            'type': screenshot_type,
-            'full_page': False
-        }
-        # Only pass quality parameter for jpeg (PNG doesn't support it in Playwright)
-        if screenshot_type == 'jpeg':
-            screenshot_kwargs['quality'] = screenshot_quality
-
-        screenshot_chunks.append(await page.screenshot(**screenshot_kwargs))
+        await page.evaluate(f"window.scrollTo(0, {y})")
+        await page.request_gc()
+        screenshot_chunks.append(await page.screenshot(
+            type="jpeg",
+            full_page=False,
+            quality=int(os.getenv("SCREENSHOT_QUALITY", 72))
+        ))
         y += step_size
+        await page.request_gc()
 
     # Restore original viewport size
     await page.set_viewport_size({'width': original_viewport['width'], 'height': original_viewport['height']})
 
-    # Unlock element dimensions if they were locked
-    if elements_locked:
-        unlock_elements_js_path = os.path.join(os.path.dirname(__file__), 'res', 'unlock-elements-sizing.js')
-        with open(unlock_elements_js_path, 'r') as f:
-            unlock_elements_js = f.read()
-        await page.evaluate(unlock_elements_js)
-        logger.debug("Element dimensions unlocked after screenshot capture")
-
     # If we have multiple chunks, stitch them together
     if len(screenshot_chunks) > 1:
+        from changedetectionio.content_fetchers.screenshot_handler import stitch_images_worker
         logger.debug(f"Screenshot stitching {len(screenshot_chunks)} chunks together")
-
-        # For small number of chunks (2-3), stitch inline to avoid multiprocessing overhead
-        # Only use separate process for many chunks (4+) to avoid blocking the event loop
-        if len(screenshot_chunks) <= 3:
-            from changedetectionio.content_fetchers.screenshot_handler import stitch_images_inline
-            screenshot = stitch_images_inline(screenshot_chunks, page_height, SCREENSHOT_MAX_TOTAL_HEIGHT)
-        else:
-            # Use separate process for many chunks to avoid blocking
-            # Always use spawn for thread safety - consistent behavior in tests and production
-            from changedetectionio.content_fetchers.screenshot_handler import stitch_images_worker
-            ctx = multiprocessing.get_context('spawn')
-            parent_conn, child_conn = ctx.Pipe()
-            p = ctx.Process(target=stitch_images_worker, args=(child_conn, screenshot_chunks, page_height, SCREENSHOT_MAX_TOTAL_HEIGHT))
-            p.start()
-            screenshot = parent_conn.recv_bytes()
-            p.join()
-            # Explicit cleanup
-            del p
-            del parent_conn, child_conn
-
+        parent_conn, child_conn = Pipe()
+        p = Process(target=stitch_images_worker, args=(child_conn, screenshot_chunks, page_height, SCREENSHOT_MAX_TOTAL_HEIGHT))
+        p.start()
+        screenshot = parent_conn.recv_bytes()
+        p.join()
         logger.debug(
             f"Screenshot (chunked/stitched) - Page height: {page_height} Capture height: {SCREENSHOT_MAX_TOTAL_HEIGHT} - Stitched together in {time.time() - start:.2f}s")
         # Explicit cleanup
         del screenshot_chunks
+        del p
+        del parent_conn, child_conn
         screenshot_chunks = None
         return screenshot
 
@@ -133,22 +89,8 @@ class fetcher(Fetcher):
 
     proxy = None
 
-    # Capability flags
-    supports_browser_steps = True
-    supports_screenshots = True
-    supports_xpath_element_data = True
-
-    @classmethod
-    def get_status_icon_data(cls):
-        """Return Chrome browser icon data for Playwright fetcher."""
-        return {
-            'filename': 'google-chrome-icon.png',
-            'alt': 'Using a Chrome browser',
-            'title': 'Using a Chrome browser'
-        }
-
-    def __init__(self, proxy_override=None, custom_browser_connection_url=None, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, proxy_override=None, custom_browser_connection_url=None):
+        super().__init__()
 
         self.browser_type = os.getenv("PLAYWRIGHT_BROWSER_TYPE", 'chromium').strip('"')
 
@@ -183,7 +125,7 @@ class fetcher(Fetcher):
 
     async def screenshot_step(self, step_n=''):
         super().screenshot_step(step_n=step_n)
-        screenshot = await capture_full_page_async(page=self.page, screenshot_format=self.screenshot_format)
+        screenshot = await capture_full_page_async(page=self.page)
 
 
         if self.browser_steps_screenshot_path is not None:
@@ -209,10 +151,8 @@ class fetcher(Fetcher):
                   request_body=None,
                   request_headers=None,
                   request_method=None,
-                  screenshot_format=None,
                   timeout=None,
                   url=None,
-                  watch_uuid=None,
                   ):
 
         from playwright.async_api import async_playwright
@@ -304,7 +244,7 @@ class fetcher(Fetcher):
                     logger.error(f"Error fetching FavIcon info {str(e)}, continuing.")
 
             if self.status_code != 200 and not ignore_status_codes:
-                screenshot = await capture_full_page_async(self.page, screenshot_format=self.screenshot_format)
+                screenshot = await capture_full_page_async(self.page)
                 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:
@@ -353,7 +293,7 @@ class fetcher(Fetcher):
             # acceptable screenshot quality here
             try:
                 # 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)
+                self.screenshot = await capture_full_page_async(page=self.page)
 
             except Exception as e:
                 # It's likely the screenshot was too long/big and something crashed
@@ -390,17 +330,4 @@ class fetcher(Fetcher):
                 browser = None
 
 
-# Plugin registration for built-in fetcher
-class PlaywrightFetcherPlugin:
-    """Plugin class that registers the Playwright fetcher as a built-in plugin."""
-
-    def register_content_fetcher(self):
-        """Register the Playwright fetcher"""
-        return ('html_webdriver', fetcher)
-
-
-# Create module-level instance for plugin registration
-playwright_plugin = PlaywrightFetcherPlugin()
-
-
 

changedetectionio/content_fetchers/puppeteer.py

@@ -20,10 +20,10 @@ from changedetectionio.content_fetchers.exceptions import PageUnloadable, Non200
 # 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
-async def capture_full_page(page, screenshot_format='JPEG'):
+async def capture_full_page(page):
     import os
     import time
-    import multiprocessing
+    from multiprocessing import Process, Pipe
 
     start = time.time()
 
@@ -41,25 +41,11 @@ async def capture_full_page(page, screenshot_format='JPEG'):
     # which will significantly increase the IO size between the server and client, it's recommended to use the lowest
     # acceptable screenshot quality here
 
-    # Use PNG for better quality (no compression artifacts), JPEG for smaller size
-    screenshot_type = screenshot_format.lower() if screenshot_format else 'jpeg'
-    # PNG should use quality 100, JPEG uses configurable quality
-    screenshot_quality = 100 if screenshot_type == 'png' else int(os.getenv("SCREENSHOT_QUALITY", 72))
 
     step_size = SCREENSHOT_SIZE_STITCH_THRESHOLD # Something that will not cause the GPU to overflow when taking the screenshot
     screenshot_chunks = []
     y = 0
-    elements_locked = False
     if page_height > page.viewport['height']:
-        # Lock all element dimensions BEFORE screenshot to prevent CSS media queries from resizing
-        # capture_full_page() changes viewport height which triggers @media (min-height) rules
-        lock_elements_js_path = os.path.join(os.path.dirname(__file__), 'res', 'lock-elements-sizing.js')
-        with open(lock_elements_js_path, 'r') as f:
-            lock_elements_js = f.read()
-        await page.evaluate(lock_elements_js)
-        elements_locked = True
-        logger.debug("Element dimensions locked before screenshot capture")
-
         if page_height < step_size:
             step_size = page_height # Incase page is bigger than default viewport but smaller than proposed step size
         await page.setViewport({'width': page.viewport['width'], 'height': step_size})
@@ -74,34 +60,18 @@ async def capture_full_page(page, screenshot_format='JPEG'):
             y
         )
 
-        screenshot_kwargs = {
-            'type_': screenshot_type,
-            'fullPage': False
-        }
-        # PNG doesn't support quality parameter in Puppeteer
-        if screenshot_type == 'jpeg':
-            screenshot_kwargs['quality'] = screenshot_quality
-
-        screenshot_chunks.append(await page.screenshot(**screenshot_kwargs))
+        screenshot_chunks.append(await page.screenshot(type_='jpeg',
+                                                       fullPage=False,
+                                                       quality=int(os.getenv("SCREENSHOT_QUALITY", 72))))
         y += step_size
 
     await page.setViewport({'width': original_viewport['width'], 'height': original_viewport['height']})
 
-    # Unlock element dimensions if they were locked
-    if elements_locked:
-        unlock_elements_js_path = os.path.join(os.path.dirname(__file__), 'res', 'unlock-elements-sizing.js')
-        with open(unlock_elements_js_path, 'r') as f:
-            unlock_elements_js = f.read()
-        await page.evaluate(unlock_elements_js)
-        logger.debug("Element dimensions unlocked after screenshot capture")
-
     if len(screenshot_chunks) > 1:
-        # Always use spawn for thread safety - consistent behavior in tests and production
         from changedetectionio.content_fetchers.screenshot_handler import stitch_images_worker
         logger.debug(f"Screenshot stitching {len(screenshot_chunks)} chunks together")
-        ctx = multiprocessing.get_context('spawn')
-        parent_conn, child_conn = ctx.Pipe()
-        p = ctx.Process(target=stitch_images_worker, args=(child_conn, screenshot_chunks, page_height, SCREENSHOT_MAX_TOTAL_HEIGHT))
+        parent_conn, child_conn = Pipe()
+        p = Process(target=stitch_images_worker, args=(child_conn, screenshot_chunks, page_height, SCREENSHOT_MAX_TOTAL_HEIGHT))
         p.start()
         screenshot = parent_conn.recv_bytes()
         p.join()
@@ -123,27 +93,13 @@ class fetcher(Fetcher):
     if os.getenv("PLAYWRIGHT_DRIVER_URL"):
         fetcher_description += " via '{}'".format(os.getenv("PLAYWRIGHT_DRIVER_URL"))
 
-    browser = None
     browser_type = ''
     command_executor = ''
+
     proxy = None
 
-    # Capability flags
-    supports_browser_steps = True
-    supports_screenshots = True
-    supports_xpath_element_data = True
-
-    @classmethod
-    def get_status_icon_data(cls):
-        """Return Chrome browser icon data for Puppeteer fetcher."""
-        return {
-            'filename': 'google-chrome-icon.png',
-            'alt': 'Using a Chrome browser',
-            'title': 'Using a Chrome browser'
-        }
-
-    def __init__(self, proxy_override=None, custom_browser_connection_url=None, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, proxy_override=None, custom_browser_connection_url=None):
+        super().__init__()
 
         if custom_browser_connection_url:
             self.browser_connection_is_custom = True
@@ -172,20 +128,21 @@ class fetcher(Fetcher):
                 proxy_url += f"{parsed.hostname}{port}{parsed.path}{q}"
                 self.browser_connection_url += f"{r}--proxy-server={proxy_url}"
 
-    async def quit(self, watch=None):
-        try:
-            await self.page.close()
-            del self.page
-        except Exception as e:
-            pass
-
-        try:
-            await self.browser.close()
-            del self.browser
-        except Exception as e:
-            pass
-
-        logger.info("Cleanup puppeteer complete.")
+    # def screenshot_step(self, step_n=''):
+    #     screenshot = self.page.screenshot(type='jpeg', full_page=True, quality=85)
+    #
+    #     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)
+    #
+    # def save_step_html(self, step_n):
+    #     content = self.page.content()
+    #     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') as f:
+    #         f.write(content)
 
     async def fetch_page(self,
                          current_include_filters,
@@ -196,10 +153,8 @@ class fetcher(Fetcher):
                          request_body,
                          request_headers,
                          request_method,
-                         screenshot_format,
                          timeout,
                          url,
-                         watch_uuid
                          ):
         import re
         self.delete_browser_steps_screenshots()
@@ -215,9 +170,9 @@ class fetcher(Fetcher):
         # Connect directly using the specified browser_ws_endpoint
         # @todo timeout
         try:
-            self.browser = await pyppeteer_instance.connect(browserWSEndpoint=self.browser_connection_url,
-                                                            ignoreHTTPSErrors=True
-                                                            )
+            browser = await pyppeteer_instance.connect(browserWSEndpoint=self.browser_connection_url,
+                                                       ignoreHTTPSErrors=True
+                                                       )
         except websockets.exceptions.InvalidStatusCode as e:
             raise BrowserConnectError(msg=f"Error while trying to connect the browser, Code {e.status_code} (check your access, whitelist IP, password etc)")
         except websockets.exceptions.InvalidURI:
@@ -226,7 +181,7 @@ class fetcher(Fetcher):
             raise BrowserConnectError(msg=f"Error connecting to the browser - Exception '{str(e)}'")
 
         # more reliable is to just request a new page
-        self.page = await self.browser.newPage()
+        self.page = await browser.newPage()
         
         # Add console handler to capture console.log from favicon fetcher
         #self.page.on('console', lambda msg: logger.debug(f"Browser console [{msg.type}]: {msg.text}"))
@@ -241,6 +196,7 @@ class fetcher(Fetcher):
                     "height": int(match.group(2))
                 })
                 logger.debug(f"Puppeteer viewport size {self.page.viewport}")
+
         try:
             from pyppeteerstealth import inject_evasions_into_page
         except ImportError:
@@ -285,47 +241,33 @@ class fetcher(Fetcher):
         #            browsersteps_interface = steppable_browser_interface()
         #            browsersteps_interface.page = self.page
 
-        # Enable Network domain to detect when first bytes arrive
-        await self.page._client.send('Network.enable')
+        async def handle_frame_navigation(event):
+            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}"))
-
-        # Listen for first response to trigger frame handler setup
-        self.page._client.on('Network.responseReceived', setup_frame_handlers_on_first_response)
+        self.page._client.on('Page.frameStartedNavigating', lambda event: asyncio.create_task(handle_frame_navigation(event)))
+        self.page._client.on('Page.frameStartedLoading', lambda event: asyncio.create_task(handle_frame_navigation(event)))
+        self.page._client.on('Page.frameStoppedLoading', lambda event: logger.debug(f"Frame stopped loading: {event}"))
 
         response = None
         attempt=0
         while not response:
             logger.debug(f"Attempting page fetch {url} attempt {attempt}")
-            response = await self.page.goto(url, timeout=0)
+            response = await self.page.goto(url)
             await asyncio.sleep(1 + extra_wait)
             if response:
                 break
             if not response:
                 logger.warning("Page did not fetch! trying again!")
             if response is None and attempt>=2:
-                logger.warning(f"Content Fetcher > Response object was none (as in, the response from the browser was empty, not just the content) exiting attempt {attempt}")
+                await self.page.close()
+                await browser.close()
+                logger.warning(f"Content Fetcher > Response object was none (as in, the response from the browser was empty, not just the content) exiting attmpt {attempt}")
                 raise EmptyReply(url=url, status_code=None)
             attempt+=1
 
@@ -337,6 +279,8 @@ class fetcher(Fetcher):
         except Exception as e:
             logger.warning("Got exception when running evaluate on custom JS code")
             logger.error(str(e))
+            await self.page.close()
+            await browser.close()
             # This can be ok, we will try to grab what we could retrieve
             raise PageUnloadable(url=url, status_code=None, message=str(e))
 
@@ -346,6 +290,8 @@ class fetcher(Fetcher):
             # https://github.com/dgtlmoon/changedetection.io/discussions/2122#discussioncomment-8241962
             logger.critical(f"Response from the browser/Playwright did not have a status_code! Response follows.")
             logger.critical(response)
+            await self.page.close()
+            await browser.close()
             raise PageUnloadable(url=url, status_code=None, message=str(e))
 
         if fetch_favicon:
@@ -355,7 +301,7 @@ class fetcher(Fetcher):
                 logger.error(f"Error fetching FavIcon info {str(e)}, continuing.")
 
         if self.status_code != 200 and not ignore_status_codes:
-            screenshot = await capture_full_page(page=self.page, screenshot_format=self.screenshot_format)
+            screenshot = await capture_full_page(page=self.page)
 
             raise Non200ErrorCodeReceived(url=url, status_code=self.status_code, screenshot=screenshot)
 
@@ -363,6 +309,8 @@ class fetcher(Fetcher):
 
         if not empty_pages_are_a_change and len(content.strip()) == 0:
             logger.error("Content Fetcher > Content was empty (empty_pages_are_a_change is False), closing browsers")
+            await self.page.close()
+            await browser.close()
             raise EmptyReply(url=url, status_code=response.status)
 
         # Run Browser Steps here
@@ -380,12 +328,6 @@ class fetcher(Fetcher):
             await self.page.evaluate(f"var include_filters=''")
 
         MAX_TOTAL_HEIGHT = int(os.getenv("SCREENSHOT_MAX_HEIGHT", SCREENSHOT_MAX_HEIGHT_DEFAULT))
-
-        self.content = await self.page.content
-
-        # Now take screenshot (scrolling may trigger layout changes, but measurements are already captured)
-        logger.debug(f"Screenshot format {self.screenshot_format}")
-        self.screenshot = await capture_full_page(page=self.page, screenshot_format=self.screenshot_format)
         self.xpath_data = await self.page.evaluate(XPATH_ELEMENT_JS, {
             "visualselector_xpath_selectors": visualselector_xpath_selectors,
             "max_height": MAX_TOTAL_HEIGHT
@@ -393,10 +335,17 @@ class fetcher(Fetcher):
         if not self.xpath_data:
             raise Exception(f"Content Fetcher > xPath scraper failed. Please report this URL so we can fix it :)")
 
-
         self.instock_data = await self.page.evaluate(INSTOCK_DATA_JS)
 
+        self.content = await self.page.content
+
+        self.screenshot = await capture_full_page(page=self.page)
+
         # It's good to log here in the case that the browser crashes on shutting down but we still get the data we need
+        logger.success(f"Fetching '{url}' complete, closing page")
+        await self.page.close()
+        logger.success(f"Fetching '{url}' complete, closing browser")
+        await browser.close()
         logger.success(f"Fetching '{url}' complete, exiting puppeteer fetch.")
 
     async def main(self, **kwargs):
@@ -411,10 +360,8 @@ class fetcher(Fetcher):
                   request_body=None,
                   request_headers=None,
                   request_method=None,
-                  screenshot_format=None,
                   timeout=None,
                   url=None,
-                  watch_uuid=None,
                   ):
 
         #@todo make update_worker async which could run any of these content_fetchers within memory and time constraints
@@ -431,24 +378,9 @@ class fetcher(Fetcher):
                 request_body=request_body,
                 request_headers=request_headers,
                 request_method=request_method,
-                screenshot_format=None,
                 timeout=timeout,
                 url=url,
-                watch_uuid=watch_uuid,
             ), timeout=max_time
             )
         except asyncio.TimeoutError:
             raise (BrowserFetchTimedOut(msg=f"Browser connected but was unable to process the page in {max_time} seconds."))
-
-
-# Plugin registration for built-in fetcher
-class PuppeteerFetcherPlugin:
-    """Plugin class that registers the Puppeteer fetcher as a built-in plugin."""
-
-    def register_content_fetcher(self):
-        """Register the Puppeteer fetcher"""
-        return ('html_webdriver', fetcher)
-
-
-# Create module-level instance for plugin registration
-puppeteer_plugin = PuppeteerFetcherPlugin()

changedetectionio/content_fetchers/requests.py

@@ -1,9 +1,7 @@
 from loguru import logger
 import hashlib
 import os
-import re
 import asyncio
-from functools import partial
 from changedetectionio import strtobool
 from changedetectionio.content_fetchers.exceptions import BrowserStepsInUnsupportedFetcher, EmptyReply, Non200ErrorCodeReceived
 from changedetectionio.content_fetchers.base import Fetcher
@@ -13,8 +11,8 @@ from changedetectionio.content_fetchers.base import Fetcher
 class fetcher(Fetcher):
     fetcher_description = "Basic fast Plaintext/HTTP Client"
 
-    def __init__(self, proxy_override=None, custom_browser_connection_url=None, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, proxy_override=None, custom_browser_connection_url=None):
+        super().__init__()
         self.proxy_override = proxy_override
         # browser_connection_url is none because its always 'launched locally'
 
@@ -27,9 +25,7 @@ class fetcher(Fetcher):
             ignore_status_codes=False,
             current_include_filters=None,
             is_binary=False,
-            empty_pages_are_a_change=False,
-            watch_uuid=None,
-            ):
+            empty_pages_are_a_change=False):
         """Synchronous version of run - the original requests implementation"""
 
         import chardet
@@ -80,22 +76,9 @@ class fetcher(Fetcher):
         if not is_binary:
             # Don't run this for PDF (and requests identified as binary) takes a _long_ time
             if not r.headers.get('content-type') or not 'charset=' in r.headers.get('content-type'):
-                # For XML/RSS feeds, check the XML declaration for encoding attribute
-                # This is more reliable than chardet which can misdetect UTF-8 as MacRoman
-                content_type = r.headers.get('content-type', '').lower()
-                if 'xml' in content_type or 'rss' in content_type:
-                    # Look for <?xml version="1.0" encoding="UTF-8"?>
-                    xml_encoding_match = re.search(rb'<\?xml[^>]+encoding=["\']([^"\']+)["\']', r.content[:200])
-                    if xml_encoding_match:
-                        r.encoding = xml_encoding_match.group(1).decode('ascii')
-                    else:
-                        # Default to UTF-8 for XML if no encoding found
-                        r.encoding = 'utf-8'
-                else:
-                    # For other content types, use chardet
-                    encoding = chardet.detect(r.content)['encoding']
-                    if encoding:
-                        r.encoding = encoding
+                encoding = chardet.detect(r.content)['encoding']
+                if encoding:
+                    r.encoding = encoding
 
         self.headers = r.headers
 
@@ -121,12 +104,6 @@ class fetcher(Fetcher):
 
         self.raw_content = r.content
 
-        # If the content is an image, set it as screenshot for SSIM/visual comparison
-        content_type = r.headers.get('content-type', '').lower()
-        if 'image/' in content_type:
-            self.screenshot = r.content
-            logger.debug(f"Image content detected ({content_type}), set as screenshot for comparison")
-
     async def run(self,
                   fetch_favicon=True,
                   current_include_filters=None,
@@ -136,10 +113,8 @@ class fetcher(Fetcher):
                   request_body=None,
                   request_headers=None,
                   request_method=None,
-                  screenshot_format=None,
                   timeout=None,
                   url=None,
-                  watch_uuid=None,
                   ):
         """Async wrapper that runs the synchronous requests code in a thread pool"""
         
@@ -157,12 +132,11 @@ class fetcher(Fetcher):
                 ignore_status_codes=ignore_status_codes,
                 current_include_filters=current_include_filters,
                 is_binary=is_binary,
-                empty_pages_are_a_change=empty_pages_are_a_change,
-                watch_uuid=watch_uuid,
+                empty_pages_are_a_change=empty_pages_are_a_change
             )
         )
 
-    async def quit(self, watch=None):
+    def quit(self, watch=None):
 
         # In case they switched to `requests` fetcher from something else
         # Then the screenshot could be old, in any case, it's not used here.
@@ -175,15 +149,3 @@ class fetcher(Fetcher):
                 except Exception as e:
                     logger.warning(f"Failed to unlink screenshot: {screenshot} - {e}")
 
-
-# Plugin registration for built-in fetcher
-class RequestsFetcherPlugin:
-    """Plugin class that registers the requests fetcher as a built-in plugin."""
-
-    def register_content_fetcher(self):
-        """Register the requests fetcher"""
-        return ('html_requests', fetcher)
-
-
-# Create module-level instance for plugin registration
-requests_plugin = RequestsFetcherPlugin()

changedetectionio/content_fetchers/res/lock-elements-sizing.js

@@ -1,93 +0,0 @@
-/**
- * Lock Element Dimensions for Screenshot Capture
- *
- * THE PROBLEM:
- * When taking full-page screenshots of tall pages, Chrome/Puppeteer/Playwright need to:
- * 1. Temporarily change the viewport height to a large value (e.g., 800px → 3809px)
- * 2. Take screenshots in chunks while scrolling
- * 3. Stitch the chunks together
- *
- * However, changing the viewport height triggers CSS media queries like:
- *   @media (min-height: 860px) { .ad { height: 250px; } }
- *
- * This causes elements (especially ads) to resize during screenshot capture, creating a mismatch:
- * - Screenshot shows element at NEW size (after media query triggered)
- * - xpath element coordinates measured at OLD size (before viewport change)
- * - Visual selector overlays don't align with screenshot
- *
- * EXAMPLE BUG:
- * - Initial viewport: 1280x800, ad height: 138px, article position: 279px ✓
- * - Viewport changes to 1280x3809 for screenshot
- * - Media query triggers: ad expands to 250px
- * - All content below shifts down by 112px (250-138)
- * - Article now at position: 391px (279+112)
- * - But xpath data says 279px → 112px mismatch! ✗
- *
- * THE SOLUTION:
- * Before changing viewport, lock ALL element dimensions with !important inline styles.
- * Inline styles with !important override media query CSS, preventing layout changes.
- *
- * WHAT THIS SCRIPT DOES:
- * 1. Iterates through every element on the page
- * 2. Captures current computed dimensions (width, height)
- * 3. Sets inline styles with !important to freeze those dimensions
- * 4. Disables ResizeObserver API (for JS-based resizing)
- * 5. When viewport changes for screenshot, media queries can't resize anything
- * 6. Layout remains consistent → xpath coordinates match screenshot ✓
- *
- * USAGE:
- * Execute this script BEFORE calling capture_full_page() / screenshot functions.
- * The page must be fully loaded and settled at its initial viewport size.
- * No need to restore state afterward - page is closed after screenshot.
- *
- * PERFORMANCE:
- * - Iterates all DOM elements (can be 1000s on complex pages)
- * - Typically completes in 50-200ms
- * - One-time cost before screenshot, well worth it for coordinate accuracy
- *
- * @see https://github.com/dgtlmoon/changedetection.io/issues/XXXX
- */
-
-(() => {
-    // Store original styles in a global WeakMap for later restoration
-    window.__elementSizingRestore = new WeakMap();
-
-    // Lock ALL element dimensions to prevent media query layout changes
-    document.querySelectorAll('*').forEach(el => {
-        const computed = window.getComputedStyle(el);
-        const rect = el.getBoundingClientRect();
-
-        // Save original inline style values BEFORE locking
-        const properties = ['height', 'min-height', 'max-height', 'width', 'min-width', 'max-width'];
-        const originalStyles = {};
-        properties.forEach(prop => {
-            originalStyles[prop] = {
-                value: el.style.getPropertyValue(prop),
-                priority: el.style.getPropertyPriority(prop)
-            };
-        });
-        window.__elementSizingRestore.set(el, originalStyles);
-
-        // Lock dimensions with !important to override media queries
-        if (rect.height > 0) {
-            el.style.setProperty('height', computed.height, 'important');
-            el.style.setProperty('min-height', computed.height, 'important');
-            el.style.setProperty('max-height', computed.height, 'important');
-        }
-        if (rect.width > 0) {
-            el.style.setProperty('width', computed.width, 'important');
-            el.style.setProperty('min-width', computed.width, 'important');
-            el.style.setProperty('max-width', computed.width, 'important');
-        }
-    });
-
-    // Also disable ResizeObserver for JS-based resizing
-    window.ResizeObserver = class {
-        constructor() {}
-        observe() {}
-        unobserve() {}
-        disconnect() {}
-    };
-
-    console.log('✓ Element dimensions locked to prevent media query changes during screenshot');
-})();

changedetectionio/content_fetchers/res/unlock-elements-sizing.js

@@ -1,52 +0,0 @@
-/**
- * Unlock Element Dimensions After Screenshot Capture
- *
- * This script removes the inline !important styles that were applied by lock-elements-sizing.js
- * and restores elements to their original state using the WeakMap created during locking.
- *
- * USAGE:
- * Execute this script AFTER completing screenshot capture and restoring the viewport.
- * This allows the page to return to its normal responsive behavior.
- *
- * WHAT THIS SCRIPT DOES:
- * 1. Iterates through every element that was locked
- * 2. Reads original style values from the global WeakMap
- * 3. Restores original inline styles (or removes them if they weren't set originally)
- * 4. Cleans up the WeakMap
- *
- * @see lock-elements-sizing.js for the locking mechanism
- */
-
-(() => {
-    // Check if the restore map exists
-    if (!window.__elementSizingRestore) {
-        console.log('⚠ Element sizing restore map not found - elements may not have been locked');
-        return;
-    }
-
-    // Restore all locked dimension styles to their original state
-    document.querySelectorAll('*').forEach(el => {
-        const originalStyles = window.__elementSizingRestore.get(el);
-
-        if (originalStyles) {
-            const properties = ['height', 'min-height', 'max-height', 'width', 'min-width', 'max-width'];
-
-            properties.forEach(prop => {
-                const original = originalStyles[prop];
-
-                if (original.value) {
-                    // Restore original value with original priority
-                    el.style.setProperty(prop, original.value, original.priority || '');
-                } else {
-                    // Was not set originally, so remove it
-                    el.style.removeProperty(prop);
-                }
-            });
-        }
-    });
-
-    // Clean up the global WeakMap
-    delete window.__elementSizingRestore;
-
-    console.log('✓ Element dimensions unlocked - page restored to original state');
-})();

changedetectionio/content_fetchers/screenshot_handler.py

@@ -8,90 +8,14 @@ from loguru import logger
 
 from changedetectionio.content_fetchers import SCREENSHOT_MAX_HEIGHT_DEFAULT, SCREENSHOT_DEFAULT_QUALITY
 
-# Cache font to avoid loading on every stitch
-_cached_font = None
-
-def _get_caption_font():
-    """Get or create cached font for caption text."""
-    global _cached_font
-    if _cached_font is None:
-        from PIL import ImageFont
-        try:
-            _cached_font = ImageFont.truetype("arial.ttf", 35)
-        except IOError:
-            _cached_font = ImageFont.load_default()
-    return _cached_font
-
-
-def stitch_images_inline(chunks_bytes, original_page_height, capture_height):
-    """
-    Stitch image chunks together inline (no multiprocessing).
-    Optimized for small number of chunks (2-3) to avoid process creation overhead.
-
-    Args:
-        chunks_bytes: List of JPEG image bytes
-        original_page_height: Original page height in pixels
-        capture_height: Maximum capture height
-
-    Returns:
-        bytes: Stitched JPEG image
-    """
-    import os
-    import io
-    from PIL import Image, ImageDraw
-
-    # Load images from byte chunks
-    images = [Image.open(io.BytesIO(b)) for b in chunks_bytes]
-    total_height = sum(im.height for im in images)
-    max_width = max(im.width for im in images)
-
-    # Create stitched image
-    stitched = Image.new('RGB', (max_width, total_height))
-    y_offset = 0
-    for im in images:
-        stitched.paste(im, (0, y_offset))
-        y_offset += im.height
-        im.close()  # Close immediately after pasting
-
-    # Draw caption only if page was trimmed
-    if original_page_height > capture_height:
-        draw = ImageDraw.Draw(stitched)
-        caption_text = f"WARNING: Screenshot was {original_page_height}px but trimmed to {capture_height}px because it was too long"
-        padding = 10
-        font = _get_caption_font()
-
-        bbox = draw.textbbox((0, 0), caption_text, font=font)
-        text_width = bbox[2] - bbox[0]
-        text_height = bbox[3] - bbox[1]
-
-        # Draw white background rectangle
-        draw.rectangle([(0, 0), (max_width, text_height + 2 * padding)], fill=(255, 255, 255))
-
-        # Draw text centered
-        text_x = (max_width - text_width) // 2
-        draw.text((text_x, padding), caption_text, font=font, fill=(255, 0, 0))
-
-    # Encode to JPEG
-    output = io.BytesIO()
-    stitched.save(output, format="JPEG", quality=int(os.getenv("SCREENSHOT_QUALITY", SCREENSHOT_DEFAULT_QUALITY)), optimize=True)
-    result = output.getvalue()
-
-    # Cleanup
-    stitched.close()
-
-    return result
-
 
 def stitch_images_worker(pipe_conn, chunks_bytes, original_page_height, capture_height):
-    """
-    Stitch image chunks together in a separate process.
-    Used for large number of chunks (4+) to avoid blocking the main event loop.
-    """
     import os
     import io
     from PIL import Image, ImageDraw, ImageFont
 
     try:
+
         # Load images from byte chunks
         images = [Image.open(io.BytesIO(b)) for b in chunks_bytes]
         total_height = sum(im.height for im in images)
@@ -103,17 +27,21 @@ def stitch_images_worker(pipe_conn, chunks_bytes, original_page_height, capture_
         for im in images:
             stitched.paste(im, (0, y_offset))
             y_offset += im.height
-            im.close()  # Close immediately after pasting
 
-        # Draw caption only if page was trimmed
+        # Draw caption on top (overlaid, not extending canvas)
+        draw = ImageDraw.Draw(stitched)
+
         if original_page_height > capture_height:
-            draw = ImageDraw.Draw(stitched)
             caption_text = f"WARNING: Screenshot was {original_page_height}px but trimmed to {capture_height}px because it was too long"
             padding = 10
+            font_size = 35
+            font_color = (255, 0, 0)
+            background_color = (255, 255, 255)
 
-            # Try to load font
+
+            # Try to load a proper font
             try:
-                font = ImageFont.truetype("arial.ttf", 35)
+                font = ImageFont.truetype("arial.ttf", font_size)
             except IOError:
                 font = ImageFont.load_default()
 
@@ -121,16 +49,19 @@ def stitch_images_worker(pipe_conn, chunks_bytes, original_page_height, capture_
             text_width = bbox[2] - bbox[0]
             text_height = bbox[3] - bbox[1]
 
-            # Draw white background rectangle
-            draw.rectangle([(0, 0), (max_width, text_height + 2 * padding)], fill=(255, 255, 255))
+            # Draw white rectangle background behind text
+            rect_top = 0
+            rect_bottom = text_height + 2 * padding
+            draw.rectangle([(0, rect_top), (max_width, rect_bottom)], fill=background_color)
 
-            # Draw text centered
+            # Draw text centered horizontally, 10px padding from top of the rectangle
             text_x = (max_width - text_width) // 2
-            draw.text((text_x, padding), caption_text, font=font, fill=(255, 0, 0))
+            text_y = padding
+            draw.text((text_x, text_y), caption_text, font=font, fill=font_color)
 
-        # Encode and send image with optimization
+        # Encode and send image
         output = io.BytesIO()
-        stitched.save(output, format="JPEG", quality=int(os.getenv("SCREENSHOT_QUALITY", SCREENSHOT_DEFAULT_QUALITY)), optimize=True)
+        stitched.save(output, format="JPEG", quality=int(os.getenv("SCREENSHOT_QUALITY", SCREENSHOT_DEFAULT_QUALITY)))
         pipe_conn.send_bytes(output.getvalue())
 
         stitched.close()

changedetectionio/content_fetchers/webdriver_selenium.py

@@ -14,22 +14,8 @@ class fetcher(Fetcher):
     proxy = None
     proxy_url = None
 
-    # Capability flags
-    supports_browser_steps = True
-    supports_screenshots = True
-    supports_xpath_element_data = True
-
-    @classmethod
-    def get_status_icon_data(cls):
-        """Return Chrome browser icon data for WebDriver fetcher."""
-        return {
-            'filename': 'google-chrome-icon.png',
-            'alt': 'Using a Chrome browser',
-            'title': 'Using a Chrome browser'
-        }
-
-    def __init__(self, proxy_override=None, custom_browser_connection_url=None, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, proxy_override=None, custom_browser_connection_url=None):
+        super().__init__()
         from urllib.parse import urlparse
         from selenium.webdriver.common.proxy import Proxy
 
@@ -69,10 +55,8 @@ class fetcher(Fetcher):
                   request_body=None,
                   request_headers=None,
                   request_method=None,
-                  screenshot_format=None,
                   timeout=None,
                   url=None,
-                  watch_uuid=None,
                   ):
 
         import asyncio
@@ -147,21 +131,7 @@ class fetcher(Fetcher):
                 time.sleep(int(os.getenv("WEBDRIVER_DELAY_BEFORE_CONTENT_READY", 5)) + self.render_extract_delay)
                 self.content = driver.page_source
                 self.headers = {}
-
-                # Selenium always captures as PNG, convert to JPEG if needed
-                screenshot_png = driver.get_screenshot_as_png()
-
-                # Convert to JPEG if requested (for smaller file size)
-                if self.screenshot_format and self.screenshot_format.upper() == 'JPEG':
-                    from PIL import Image
-                    import io
-                    img = Image.open(io.BytesIO(screenshot_png))
-                    jpeg_buffer = io.BytesIO()
-                    img.save(jpeg_buffer, format='JPEG', quality=int(os.getenv("SCREENSHOT_QUALITY", 72)))
-                    self.screenshot = jpeg_buffer.getvalue()
-                    img.close()
-                else:
-                    self.screenshot = screenshot_png
+                self.screenshot = driver.get_screenshot_as_png()
             except Exception as e:
                 driver.quit()
                 raise e
@@ -171,16 +141,3 @@ class fetcher(Fetcher):
         # Run the selenium operations in a thread pool to avoid blocking the event loop
         loop = asyncio.get_event_loop()
         await loop.run_in_executor(None, _run_sync)
-
-
-# Plugin registration for built-in fetcher
-class WebDriverSeleniumFetcherPlugin:
-    """Plugin class that registers the WebDriver Selenium fetcher as a built-in plugin."""
-
-    def register_content_fetcher(self):
-        """Register the WebDriver Selenium fetcher"""
-        return ('html_webdriver', fetcher)
-
-
-# Create module-level instance for plugin registration
-webdriver_selenium_plugin = WebDriverSeleniumFetcherPlugin()

changedetectionio/diff.py

@@ -0,0 +1,130 @@
+import difflib
+from typing import List, Iterator, Union
+
+# https://github.com/dgtlmoon/changedetection.io/issues/821#issuecomment-1241837050
+#HTML_ADDED_STYLE = "background-color: #d2f7c2; color: #255d00;"
+#HTML_CHANGED_INTO_STYLE = "background-color: #dafbe1; color: #116329;"
+#HTML_CHANGED_STYLE = "background-color: #ffd6cc; color: #7a2000;"
+#HTML_REMOVED_STYLE = "background-color: #ffebe9; color: #82071e;"
+
+# @todo - In the future we can make this configurable
+HTML_ADDED_STYLE = "background-color: #eaf2c2; color: #406619"
+HTML_REMOVED_STYLE = "background-color: #fadad7; color: #b30000"
+HTML_CHANGED_STYLE = HTML_REMOVED_STYLE
+HTML_CHANGED_INTO_STYLE = HTML_ADDED_STYLE
+
+
+# These get set to html or telegram type or discord compatible or whatever in handler.py
+# Something that cant get escaped to HTML by accident
+REMOVED_PLACEMARKER_OPEN = '@removed_PLACEMARKER_OPEN'
+REMOVED_PLACEMARKER_CLOSED = '@removed_PLACEMARKER_CLOSED'
+
+ADDED_PLACEMARKER_OPEN = '@added_PLACEMARKER_OPEN'
+ADDED_PLACEMARKER_CLOSED = '@added_PLACEMARKER_CLOSED'
+
+CHANGED_PLACEMARKER_OPEN = '@changed_PLACEMARKER_OPEN'
+CHANGED_PLACEMARKER_CLOSED = '@changed_PLACEMARKER_CLOSED'
+
+CHANGED_INTO_PLACEMARKER_OPEN = '@changed_into_PLACEMARKER_OPEN'
+CHANGED_INTO_PLACEMARKER_CLOSED = '@changed_into_PLACEMARKER_CLOSED'
+
+def same_slicer(lst: List[str], start: int, end: int) -> List[str]:
+    """Return a slice of the list, or a single element if start == end."""
+    return lst[start:end] if start != end else [lst[start]]
+
+def customSequenceMatcher(
+    before: List[str],
+    after: List[str],
+    include_equal: bool = False,
+    include_removed: bool = True,
+    include_added: bool = True,
+    include_replaced: bool = True,
+    include_change_type_prefix: bool = True
+) -> Iterator[List[str]]:
+    """
+    Compare two sequences and yield differences based on specified parameters.
+
+    Args:
+        before (List[str]): Original sequence
+        after (List[str]): Modified sequence
+        include_equal (bool): Include unchanged parts
+        include_removed (bool): Include removed parts
+        include_added (bool): Include added parts
+        include_replaced (bool): Include replaced parts
+        include_change_type_prefix (bool): Add prefixes to indicate change types
+    Yields:
+        List[str]: Differences between sequences
+    """
+    cruncher = difflib.SequenceMatcher(isjunk=lambda x: x in " \t", a=before, b=after)
+
+
+
+    for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
+        if include_equal and tag == 'equal':
+            yield before[alo:ahi]
+        elif include_removed and tag == 'delete':
+            if include_change_type_prefix:
+                yield [f'{REMOVED_PLACEMARKER_OPEN}{line}{REMOVED_PLACEMARKER_CLOSED}' for line in same_slicer(before, alo, ahi)]
+            else:
+                yield same_slicer(before, alo, ahi)
+        elif include_replaced and tag == 'replace':
+            if include_change_type_prefix:
+                yield [f'{CHANGED_PLACEMARKER_OPEN}{line}{CHANGED_PLACEMARKER_CLOSED}' for line in same_slicer(before, alo, ahi)] + \
+                      [f'{CHANGED_INTO_PLACEMARKER_OPEN}{line}{CHANGED_INTO_PLACEMARKER_CLOSED}' for line in same_slicer(after, blo, bhi)]
+            else:
+                yield same_slicer(before, alo, ahi) + same_slicer(after, blo, bhi)
+        elif include_added and tag == 'insert':
+            if include_change_type_prefix:
+                yield [f'{ADDED_PLACEMARKER_OPEN}{line}{ADDED_PLACEMARKER_CLOSED}' for line in same_slicer(after, blo, bhi)]
+            else:
+                yield same_slicer(after, blo, bhi)
+
+
+def render_diff(
+    previous_version_file_contents: str,
+    newest_version_file_contents: str,
+    include_equal: bool = False,
+    include_removed: bool = True,
+    include_added: bool = True,
+    include_replaced: bool = True,
+    line_feed_sep: str = "\n",
+    include_change_type_prefix: bool = True,
+    patch_format: bool = False
+) -> str:
+    """
+    Render the difference between two file contents.
+
+    Args:
+        previous_version_file_contents (str): Original file contents
+        newest_version_file_contents (str): Modified file contents
+        include_equal (bool): Include unchanged parts
+        include_removed (bool): Include removed parts
+        include_added (bool): Include added parts
+        include_replaced (bool): Include replaced parts
+        line_feed_sep (str): Separator for lines in output
+        include_change_type_prefix (bool): Add prefixes to indicate change types
+        patch_format (bool): Use patch format for output
+    Returns:
+        str: Rendered difference
+    """
+    newest_lines = [line.rstrip() for line in newest_version_file_contents.splitlines()]
+    previous_lines = [line.rstrip() for line in previous_version_file_contents.splitlines()] if previous_version_file_contents else []
+
+    if patch_format:
+        patch = difflib.unified_diff(previous_lines, newest_lines)
+        return line_feed_sep.join(patch)
+
+    rendered_diff = customSequenceMatcher(
+        before=previous_lines,
+        after=newest_lines,
+        include_equal=include_equal,
+        include_removed=include_removed,
+        include_added=include_added,
+        include_replaced=include_replaced,
+        include_change_type_prefix=include_change_type_prefix
+    )
+
+    def flatten(lst: List[Union[str, List[str]]]) -> str:
+        return line_feed_sep.join(flatten(x) if isinstance(x, list) else x for x in lst)
+
+    return flatten(rendered_diff)

changedetectionio/diff/__init__.py

@@ -1,479 +0,0 @@
-"""
-Diff rendering module for change detection.
-
-This module provides functions for rendering differences between text content,
-with support for various output formats and tokenization strategies.
-"""
-
-import difflib
-from typing import List, Iterator, Union
-from loguru import logger
-import diff_match_patch as dmp_module
-import re
-import time
-
-from .tokenizers import TOKENIZERS, tokenize_words_and_html
-
-# Remember! gmail, outlook etc dont support <style> must be inline.
-# Gmail: strips <ins> and <del> tags entirely.
-# This is for the WHOLE line background style
-REMOVED_STYLE = "background-color: #fadad7; color: #b30000;"
-ADDED_STYLE = "background-color: #eaf2c2; color: #406619;"
-HTML_REMOVED_STYLE = REMOVED_STYLE  # Export alias for handler.py
-HTML_ADDED_STYLE = ADDED_STYLE      # Export alias for handler.py
-
-# Darker backgrounds for nested highlighting (changed parts within lines)
-REMOVED_INNER_STYLE = "background-color: #ff867a; color: #111;"
-ADDED_INNER_STYLE = "background-color: #b2e841; color: #444;"
-HTML_CHANGED_STYLE = REMOVED_STYLE
-HTML_CHANGED_INTO_STYLE = ADDED_STYLE
-
-# Placemarker constants - these get replaced by apply_service_tweaks() in handler.py
-# Something that cant get escaped to HTML by accident
-REMOVED_PLACEMARKER_OPEN = '@removed_PLACEMARKER_OPEN'
-REMOVED_PLACEMARKER_CLOSED = '@removed_PLACEMARKER_CLOSED'
-
-ADDED_PLACEMARKER_OPEN = '@added_PLACEMARKER_OPEN'
-ADDED_PLACEMARKER_CLOSED = '@added_PLACEMARKER_CLOSED'
-
-CHANGED_PLACEMARKER_OPEN = '@changed_PLACEMARKER_OPEN'
-CHANGED_PLACEMARKER_CLOSED = '@changed_PLACEMARKER_CLOSED'
-
-CHANGED_INTO_PLACEMARKER_OPEN = '@changed_into_PLACEMARKER_OPEN'
-CHANGED_INTO_PLACEMARKER_CLOSED = '@changed_into_PLACEMARKER_CLOSED'
-
-# Compiled regex patterns for performance
-WHITESPACE_NORMALIZE_RE = re.compile(r'\s+')
-
-
-def render_inline_word_diff(before_line: str, after_line: str, ignore_junk: bool = False, markdown_style: str = None, tokenizer: str = 'words_and_html') -> tuple[str, bool]:
-    """
-    Render word-level differences between two lines inline using diff-match-patch library.
-
-    Args:
-        before_line: Original line text
-        after_line: Modified line text
-        ignore_junk: Ignore whitespace-only changes
-        markdown_style: Unused (kept for backwards compatibility)
-        tokenizer: Name of tokenizer to use from TOKENIZERS registry (default: 'words_and_html')
-
-    Returns:
-        tuple[str, bool]: (diff output with inline word-level highlighting, has_changes flag)
-    """
-    # Normalize whitespace if ignore_junk is enabled
-    if ignore_junk:
-        # Normalize whitespace: replace multiple spaces/tabs with single space
-        before_normalized = WHITESPACE_NORMALIZE_RE.sub(' ', before_line)
-        after_normalized = WHITESPACE_NORMALIZE_RE.sub(' ', after_line)
-    else:
-        before_normalized = before_line
-        after_normalized = after_line
-
-    # Use diff-match-patch with word-level tokenization
-    # Strategy: Use linesToChars to treat words as atomic units
-    dmp = dmp_module.diff_match_patch()
-
-    # Get the tokenizer function from the registry
-    tokenizer_func = TOKENIZERS.get(tokenizer, tokenize_words_and_html)
-
-    # Tokenize both lines using the selected tokenizer
-    before_tokens = tokenizer_func(before_normalized)
-    after_tokens = tokenizer_func(after_normalized or ' ')
-
-    # Create mappings for linesToChars (using it for word-mode)
-    # Join tokens with newline so each "line" is a token
-    before_text = '\n'.join(before_tokens)
-    after_text = '\n'.join(after_tokens)
-
-    # Use linesToChars for word-mode diffing
-    lines_result = dmp.diff_linesToChars(before_text, after_text)
-    line_before, line_after, line_array = lines_result
-
-    # Perform diff on the encoded strings
-    diffs = dmp.diff_main(line_before, line_after, False)
-
-    # Convert back to original text
-    dmp.diff_charsToLines(diffs, line_array)
-
-    # Remove the newlines we added for tokenization
-    diffs = [(op, text.replace('\n', '')) for op, text in diffs]
-
-    # DON'T apply semantic cleanup here - it would break token boundaries
-    # (e.g., "63" -> "66" would become "6" + "3" vs "6" + "6")
-    # We want to preserve the tokenizer's word boundaries
-
-    # Check if there are any changes
-    has_changes = any(op != 0 for op, _ in diffs)
-
-    if ignore_junk and not has_changes:
-        return after_line, False
-
-    # Check if the whole line is replaced (no unchanged content)
-    whole_line_replaced = not any(op == 0 and text.strip() for op, text in diffs)
-
-    # Build the output using placemarkers
-    # When whole line is replaced, wrap entire removed content once and entire added content once
-    if whole_line_replaced:
-        removed_tokens = []
-        added_tokens = []
-
-        for op, text in diffs:
-            if op == 0:  # Equal (e.g., whitespace tokens in common positions)
-                # Include in both removed and added to preserve spacing
-                removed_tokens.append(text)
-                added_tokens.append(text)
-            elif op == -1:  # Deletion
-                removed_tokens.append(text)
-            elif op == 1:  # Insertion
-                added_tokens.append(text)
-
-        # Join all tokens and wrap the entire string once for removed, once for added
-        result_parts = []
-
-        if removed_tokens:
-            removed_full = ''.join(removed_tokens).rstrip()
-            trailing_removed = ''.join(removed_tokens)[len(removed_full):] if len(''.join(removed_tokens)) > len(removed_full) else ''
-            result_parts.append(f'{CHANGED_PLACEMARKER_OPEN}{removed_full}{CHANGED_PLACEMARKER_CLOSED}{trailing_removed}')
-
-        if added_tokens:
-            if result_parts:  # Add newline between removed and added
-                result_parts.append('\n')
-            added_full = ''.join(added_tokens).rstrip()
-            trailing_added = ''.join(added_tokens)[len(added_full):] if len(''.join(added_tokens)) > len(added_full) else ''
-            result_parts.append(f'{CHANGED_INTO_PLACEMARKER_OPEN}{added_full}{CHANGED_INTO_PLACEMARKER_CLOSED}{trailing_added}')
-
-        return ''.join(result_parts), has_changes
-    else:
-        # Inline changes within the line
-        result_parts = []
-        for op, text in diffs:
-            if op == 0:  # Equal
-                result_parts.append(text)
-            elif op == 1:  # Insertion
-                # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
-                content = text.rstrip()
-                trailing = text[len(content):] if len(text) > len(content) else ''
-                if content:
-                    result_parts.append(f'{ADDED_PLACEMARKER_OPEN}{content}{ADDED_PLACEMARKER_CLOSED}{trailing}')
-                else:
-                    result_parts.append(trailing)
-            elif op == -1:  # Deletion
-                # Don't wrap empty content (e.g., whitespace-only tokens after rstrip)
-                content = text.rstrip()
-                trailing = text[len(content):] if len(text) > len(content) else ''
-                if content:
-                    result_parts.append(f'{REMOVED_PLACEMARKER_OPEN}{content}{REMOVED_PLACEMARKER_CLOSED}{trailing}')
-                else:
-                    result_parts.append(trailing)
-
-        return ''.join(result_parts), has_changes
-
-
-def render_nested_line_diff(before_line: str, after_line: str, ignore_junk: bool = False, tokenizer: str = 'words_and_html') -> tuple[str, str, bool]:
-    """
-    Render line-level differences with nested highlighting for changed parts.
-
-    Returns two separate lines:
-    - Before line: light red background with dark red on removed parts
-    - After line: light green background with dark green on added parts
-
-    Args:
-        before_line: Original line text
-        after_line: Modified line text
-        ignore_junk: Ignore whitespace-only changes
-        tokenizer: Name of tokenizer to use from TOKENIZERS registry
-
-    Returns:
-        tuple[str, str, bool]: (before_with_highlights, after_with_highlights, has_changes)
-    """
-    # Normalize whitespace if ignore_junk is enabled
-    if ignore_junk:
-        before_normalized = WHITESPACE_NORMALIZE_RE.sub(' ', before_line)
-        after_normalized = WHITESPACE_NORMALIZE_RE.sub(' ', after_line)
-    else:
-        before_normalized = before_line
-        after_normalized = after_line
-
-    # Use diff-match-patch with word-level tokenization
-    dmp = dmp_module.diff_match_patch()
-
-    # Get the tokenizer function from the registry
-    tokenizer_func = TOKENIZERS.get(tokenizer, tokenize_words_and_html)
-
-    # Tokenize both lines
-    before_tokens = tokenizer_func(before_normalized)
-    after_tokens = tokenizer_func(after_normalized or ' ')
-
-    # Create mappings for linesToChars
-    before_text = '\n'.join(before_tokens)
-    after_text = '\n'.join(after_tokens)
-
-    # Use linesToChars for word-mode diffing
-    lines_result = dmp.diff_linesToChars(before_text, after_text)
-    line_before, line_after, line_array = lines_result
-
-    # Perform diff on the encoded strings
-    diffs = dmp.diff_main(line_before, line_after, False)
-
-    # Convert back to original text
-    dmp.diff_charsToLines(diffs, line_array)
-
-    # Remove the newlines we added for tokenization
-    diffs = [(op, text.replace('\n', '')) for op, text in diffs]
-
-    # DON'T apply semantic cleanup here - it would break token boundaries
-    # (e.g., "63" -> "66" would become "6" + "3" vs "6" + "6")
-    # We want to preserve the tokenizer's word boundaries
-
-    # Check if there are any changes
-    has_changes = any(op != 0 for op, _ in diffs)
-
-    if ignore_junk and not has_changes:
-        return before_line, after_line, False
-
-    # Build the before line (with nested highlighting for removed parts)
-    before_parts = []
-    for op, text in diffs:
-        if op == 0:  # Equal
-            before_parts.append(text)
-        elif op == -1:  # Deletion (in before)
-            before_parts.append(f'<span style="{REMOVED_INNER_STYLE}">{text}</span>')
-        # Skip insertions (op == 1) for the before line
-
-    before_content = ''.join(before_parts)
-
-    # Build the after line (with nested highlighting for added parts)
-    after_parts = []
-    for op, text in diffs:
-        if op == 0:  # Equal
-            after_parts.append(text)
-        elif op == 1:  # Insertion (in after)
-            after_parts.append(f'<span style="{ADDED_INNER_STYLE}">{text}</span>')
-        # Skip deletions (op == -1) for the after line
-
-    after_content = ''.join(after_parts)
-
-    # Wrap content with placemarkers (inner HTML highlighting is preserved)
-    before_html = f'{CHANGED_PLACEMARKER_OPEN}{before_content}{CHANGED_PLACEMARKER_CLOSED}'
-    after_html = f'{CHANGED_INTO_PLACEMARKER_OPEN}{after_content}{CHANGED_INTO_PLACEMARKER_CLOSED}'
-
-    return before_html, after_html, has_changes
-
-
-def same_slicer(lst: List[str], start: int, end: int) -> List[str]:
-    """Return a slice of the list, or a single element if start == end."""
-    return lst[start:end] if start != end else [lst[start]]
-
-def customSequenceMatcher(
-    before: List[str],
-    after: List[str],
-    include_equal: bool = False,
-    include_removed: bool = True,
-    include_added: bool = True,
-    include_replaced: bool = True,
-    include_change_type_prefix: bool = True,
-    word_diff: bool = False,
-    context_lines: int = 0,
-    case_insensitive: bool = False,
-    ignore_junk: bool = False,
-    tokenizer: str = 'words_and_html'
-) -> Iterator[List[str]]:
-    """
-    Compare two sequences and yield differences based on specified parameters.
-
-    Args:
-        before (List[str]): Original sequence
-        after (List[str]): Modified sequence
-        include_equal (bool): Include unchanged parts
-        include_removed (bool): Include removed parts
-        include_added (bool): Include added parts
-        include_replaced (bool): Include replaced parts
-        include_change_type_prefix (bool): Add prefixes to indicate change types
-        word_diff (bool): Use word-level diffing for replaced lines (controls inline rendering)
-        context_lines (int): Number of unchanged lines to show around changes (like grep -C)
-        case_insensitive (bool): Perform case-insensitive comparison
-        ignore_junk (bool): Ignore whitespace-only changes
-        tokenizer (str): Name of tokenizer to use from TOKENIZERS registry (default: 'words_and_html')
-
-    Yields:
-        List[str]: Differences between sequences
-    """
-    # Prepare sequences for comparison (lowercase if case-insensitive, normalize whitespace if ignore_junk)
-    def prepare_line(line):
-        if case_insensitive:
-            line = line.lower()
-        if ignore_junk:
-            # Normalize whitespace: replace multiple spaces/tabs with single space
-            line = WHITESPACE_NORMALIZE_RE.sub(' ', line)
-        return line
-
-    compare_before = [prepare_line(line) for line in before]
-    compare_after = [prepare_line(line) for line in after]
-
-    cruncher = difflib.SequenceMatcher(isjunk=lambda x: x in " \t", a=compare_before, b=compare_after)
-
-    # When context_lines is set and include_equal is False, we need to track which equal lines to include
-    if context_lines > 0 and not include_equal:
-        opcodes = list(cruncher.get_opcodes())
-        # Mark equal ranges that should be included based on context
-        included_equal_ranges = set()
-
-        for i, (tag, alo, ahi, blo, bhi) in enumerate(opcodes):
-            if tag != 'equal':
-                # Include context lines before this change
-                for j in range(max(0, i - 1), i):
-                    if opcodes[j][0] == 'equal':
-                        prev_alo, prev_ahi = opcodes[j][1], opcodes[j][2]
-                        # Include last N lines of the previous equal block
-                        context_start = max(prev_alo, prev_ahi - context_lines)
-                        for line_num in range(context_start, prev_ahi):
-                            included_equal_ranges.add(line_num)
-
-                # Include context lines after this change
-                for j in range(i + 1, min(len(opcodes), i + 2)):
-                    if opcodes[j][0] == 'equal':
-                        next_alo, next_ahi = opcodes[j][1], opcodes[j][2]
-                        # Include first N lines of the next equal block
-                        context_end = min(next_ahi, next_alo + context_lines)
-                        for line_num in range(next_alo, context_end):
-                            included_equal_ranges.add(line_num)
-
-    # Remember! gmail, outlook etc dont support <style> must be inline.
-    # Gmail: strips <ins> and <del> tags entirely.
-    for tag, alo, ahi, blo, bhi in cruncher.get_opcodes():
-        if tag == 'equal':
-            if include_equal:
-                yield before[alo:ahi]
-            elif context_lines > 0:
-                # Only include equal lines that are in the context range
-                context_lines_to_include = [before[i] for i in range(alo, ahi) if i in included_equal_ranges]
-                if context_lines_to_include:
-                    yield context_lines_to_include
-        elif include_removed and tag == 'delete':
-            if include_change_type_prefix:
-                yield [f'{REMOVED_PLACEMARKER_OPEN}{line}{REMOVED_PLACEMARKER_CLOSED}' for line in same_slicer(before, alo, ahi)]
-            else:
-                yield same_slicer(before, alo, ahi)
-        elif include_replaced and tag == 'replace':
-            before_lines = same_slicer(before, alo, ahi)
-            after_lines = same_slicer(after, blo, bhi)
-
-            # Use inline word-level diff for single line replacements when word_diff is enabled
-            if word_diff and len(before_lines) == 1 and len(after_lines) == 1:
-                inline_diff, has_changes = render_inline_word_diff(before_lines[0], after_lines[0], ignore_junk=ignore_junk, tokenizer=tokenizer)
-                # Check if there are any actual changes (not just whitespace when ignore_junk is enabled)
-                if ignore_junk and not has_changes:
-                    # No real changes, skip this line
-                    continue
-                yield [inline_diff]
-            else:
-                # Fall back to line-level diff for multi-line changes
-                if include_change_type_prefix:
-                    yield [f'{CHANGED_PLACEMARKER_OPEN}{line}{CHANGED_PLACEMARKER_CLOSED}' for line in before_lines] + \
-                          [f'{CHANGED_INTO_PLACEMARKER_OPEN}{line}{CHANGED_INTO_PLACEMARKER_CLOSED}' for line in after_lines]
-                else:
-                    yield before_lines + after_lines
-        elif include_added and tag == 'insert':
-            if include_change_type_prefix:
-                yield [f'{ADDED_PLACEMARKER_OPEN}{line}{ADDED_PLACEMARKER_CLOSED}' for line in same_slicer(after, blo, bhi)]
-            else:
-                yield same_slicer(after, blo, bhi)
-
-def render_diff(
-    previous_version_file_contents: str,
-    newest_version_file_contents: str,
-    include_equal: bool = False,
-    include_removed: bool = True,
-    include_added: bool = True,
-    include_replaced: bool = True,
-    include_change_type_prefix: bool = True,
-    patch_format: bool = False,
-    word_diff: bool = True,
-    context_lines: int = 0,
-    case_insensitive: bool = False,
-    ignore_junk: bool = False,
-    tokenizer: str = 'words_and_html'
-) -> str:
-    """
-    Render the difference between two file contents.
-
-    Args:
-        previous_version_file_contents (str): Original file contents
-        newest_version_file_contents (str): Modified file contents
-        include_equal (bool): Include unchanged parts
-        include_removed (bool): Include removed parts
-        include_added (bool): Include added parts
-        include_replaced (bool): Include replaced parts
-        include_change_type_prefix (bool): Add prefixes to indicate change types
-        patch_format (bool): Use patch format for output
-        word_diff (bool): Use word-level diffing for replaced lines (controls inline rendering)
-        context_lines (int): Number of unchanged lines to show around changes (like grep -C)
-        case_insensitive (bool): Perform case-insensitive comparison, By default the test_json_diff/process.py is case sensitive, so this follows same logic
-        ignore_junk (bool): Ignore whitespace-only changes
-        tokenizer (str): Name of tokenizer to use from TOKENIZERS registry (default: 'words_and_html')
-
-    Returns:
-        str: Rendered difference
-    """
-    newest_lines = [line.rstrip() for line in newest_version_file_contents.splitlines()]
-    previous_lines = [line.rstrip() for line in previous_version_file_contents.splitlines()] if previous_version_file_contents else []
-    now = time.time()
-    logger.debug(
-        f"diff options: "
-        f"include_equal={include_equal}, "
-        f"include_removed={include_removed}, "
-        f"include_added={include_added}, "
-        f"include_replaced={include_replaced}, "
-        f"include_change_type_prefix={include_change_type_prefix}, "
-        f"patch_format={patch_format}, "
-        f"word_diff={word_diff}, "
-        f"context_lines={context_lines}, "
-        f"case_insensitive={case_insensitive}, "
-        f"ignore_junk={ignore_junk}, "
-        f"tokenizer={tokenizer}"
-    )
-    if patch_format:
-        patch = difflib.unified_diff(previous_lines, newest_lines)
-        return "\n".join(patch)
-
-    rendered_diff = customSequenceMatcher(
-        before=previous_lines,
-        after=newest_lines,
-        include_equal=include_equal,
-        include_removed=include_removed,
-        include_added=include_added,
-        include_replaced=include_replaced,
-        include_change_type_prefix=include_change_type_prefix,
-        word_diff=word_diff,
-        context_lines=context_lines,
-        case_insensitive=case_insensitive,
-        ignore_junk=ignore_junk,
-        tokenizer=tokenizer
-    )
-
-    def flatten(lst: List[Union[str, List[str]]]) -> str:
-        result = []
-        for x in lst:
-            if isinstance(x, list):
-                result.extend(x)
-            else:
-                result.append(x)
-        return "\n".join(result)
-
-    logger.debug(f"Diff generated in {time.time() - now:.2f}s")
-
-    return flatten(rendered_diff)
-
-
-# Export main public API
-__all__ = [
-    'render_diff',
-    'customSequenceMatcher',
-    'render_inline_word_diff',
-    'render_nested_line_diff',
-    'TOKENIZERS',
-    'REMOVED_STYLE',
-    'ADDED_STYLE',
-    'REMOVED_INNER_STYLE',
-    'ADDED_INNER_STYLE',
-]

changedetectionio/diff/tokenizers/__init__.py

@@ -1,23 +0,0 @@
-"""
-Tokenizers for diff operations.
-
-This module provides various tokenization strategies for use with the diff system.
-New tokenizers can be easily added by:
-1. Creating a new module in this directory
-2. Importing and registering it in the TOKENIZERS dictionary below
-"""
-
-from .natural_text import tokenize_words
-from .words_and_html import tokenize_words_and_html
-
-# Tokenizer registry - maps tokenizer names to functions
-TOKENIZERS = {
-    'words': tokenize_words,
-    'words_and_html': tokenize_words_and_html,
-}
-
-__all__ = [
-    'tokenize_words',
-    'tokenize_words_and_html',
-    'TOKENIZERS',
-]

changedetectionio/diff/tokenizers/natural_text.py

@@ -1,44 +0,0 @@
-"""
-Simple word tokenizer using whitespace boundaries.
-
-This is a simpler tokenizer that treats all whitespace as token boundaries
-without special handling for HTML tags or other markup.
-"""
-
-from typing import List
-
-
-def tokenize_words(text: str) -> List[str]:
-    """
-    Split text into words using simple whitespace boundaries.
-
-    This is a simpler tokenizer that treats all whitespace as token boundaries
-    without special handling for HTML tags.
-
-    Args:
-        text: Input text to tokenize
-
-    Returns:
-        List of tokens (words and whitespace)
-
-    Examples:
-        >>> tokenize_words("Hello world")
-        ['Hello', ' ', 'world']
-        >>> tokenize_words("one  two")
-        ['one', ' ', ' ', 'two']
-    """
-    tokens = []
-    current = ''
-
-    for char in text:
-        if char.isspace():
-            if current:
-                tokens.append(current)
-                current = ''
-            tokens.append(char)
-        else:
-            current += char
-
-    if current:
-        tokens.append(current)
-    return tokens

changedetectionio/diff/tokenizers/words_and_html.py

@@ -1,61 +0,0 @@
-"""
-Tokenizer that preserves HTML tags as atomic units while splitting on whitespace.
-
-This tokenizer is specifically designed for HTML content where:
-- HTML tags should remain intact (e.g., '<p>', '<a href="...">')
-- Whitespace tokens are preserved for accurate diff reconstruction
-- Words are split on whitespace boundaries
-"""
-
-from typing import List
-
-
-def tokenize_words_and_html(text: str) -> List[str]:
-    """
-    Split text into words and boundaries (spaces, HTML tags).
-
-    This tokenizer preserves HTML tags as atomic units while splitting on whitespace.
-    Useful for content that contains HTML markup.
-
-    Args:
-        text: Input text to tokenize
-
-    Returns:
-        List of tokens (words, spaces, HTML tags)
-
-    Examples:
-        >>> tokenize_words_and_html("<p>Hello world</p>")
-        ['<p>', 'Hello', ' ', 'world', '</p>']
-        >>> tokenize_words_and_html("<a href='test.com'>link</a>")
-        ['<a href=\\'test.com\\'>', 'link', '</a>']
-    """
-    tokens = []
-    current = ''
-    in_tag = False
-
-    for char in text:
-        if char == '<':
-            # Start of HTML tag
-            if current:
-                tokens.append(current)
-                current = ''
-            current = '<'
-            in_tag = True
-        elif char == '>' and in_tag:
-            # End of HTML tag
-            current += '>'
-            tokens.append(current)
-            current = ''
-            in_tag = False
-        elif char.isspace() and not in_tag:
-            # Space outside of tag
-            if current:
-                tokens.append(current)
-                current = ''
-            tokens.append(char)
-        else:
-            current += char
-
-    if current:
-        tokens.append(current)
-    return tokens

changedetectionio/flask_app.py

@@ -23,7 +23,6 @@ from flask import (
     render_template,
     request,
     send_from_directory,
-    session,
     url_for,
 )
 from flask_compress import Compress as FlaskCompress
@@ -35,15 +34,13 @@ from flask_cors import CORS
 # Make this a global singleton to avoid multiple signal objects
 watch_check_update = signal('watch_check_update', doc='Signal sent when a watch check is completed')
 from flask_wtf import CSRFProtect
-from flask_babel import Babel, gettext, get_locale
 from loguru import logger
 
 from changedetectionio import __version__
 from changedetectionio import queuedWatchMetaData
-from changedetectionio.api import Watch, WatchHistory, WatchSingleHistory, WatchHistoryDiff, CreateWatch, Import, SystemInfo, Tag, Tags, Notifications, WatchFavicon
+from changedetectionio.api import Watch, WatchHistory, WatchSingleHistory, CreateWatch, Import, SystemInfo, Tag, Tags, Notifications, WatchFavicon
 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
 
 datastore = None
 
@@ -69,10 +66,6 @@ CORS(app)
 
 # Super handy for compressing large BrowserSteps responses and others
 FlaskCompress(app)
-app.config['COMPRESS_MIN_SIZE'] = 4096
-app.config['COMPRESS_MIMETYPES'] = ['text/html', 'text/css', 'text/javascript', 'application/json', 'application/javascript', 'image/svg+xml']
-app.config['TEMPLATES_AUTO_RELOAD'] = False
-
 
 # Stop browser caching of assets
 app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
@@ -85,29 +78,9 @@ if os.getenv('FLASK_SERVER_NAME'):
 
 #app.config["EXPLAIN_TEMPLATE_LOADING"] = True
 
-
+# Disables caching of the templates
+app.config['TEMPLATES_AUTO_RELOAD'] = True
 app.jinja_env.add_extension('jinja2.ext.loopcontrols')
-
-# Configure Jinja2 to search for templates in plugin directories
-def _configure_plugin_templates():
-    """Configure Jinja2 loader to include plugin template directories."""
-    from jinja2 import ChoiceLoader, FileSystemLoader
-    from changedetectionio.pluggy_interface import get_plugin_template_paths
-
-    # Get plugin template paths
-    plugin_template_paths = get_plugin_template_paths()
-
-    if plugin_template_paths:
-        # Create a ChoiceLoader that searches app templates first, then plugin templates
-        loaders = [app.jinja_loader]  # Keep the default app loader first
-        for path in plugin_template_paths:
-            loaders.append(FileSystemLoader(path))
-
-        app.jinja_loader = ChoiceLoader(loaders)
-        logger.info(f"Configured Jinja2 to search {len(plugin_template_paths)} plugin template directories")
-
-# Configure plugin templates (called after plugins are loaded)
-_configure_plugin_templates()
 csrf = CSRFProtect()
 csrf.init_app(app)
 notification_debug_log=[]
@@ -210,26 +183,16 @@ def _get_worker_status_info():
 def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"):
 
     if watch_obj['last_checked'] == 0:
-        return gettext('Not yet')
+        return 'Not yet'
 
-    locale = get_timeago_locale(str(get_locale()))
-    try:
-        return timeago.format(int(watch_obj['last_checked']), time.time(), locale)
-    except:
-        # Fallback to English if locale not supported by timeago
-        return timeago.format(int(watch_obj['last_checked']), time.time(), 'en')
+    return timeago.format(int(watch_obj['last_checked']), time.time())
 
 @app.template_filter('format_timestamp_timeago')
 def _jinja2_filter_datetimestamp(timestamp, format="%Y-%m-%d %H:%M:%S"):
     if not timestamp:
-        return gettext('Not yet')
+        return 'Not yet'
 
-    locale = get_timeago_locale(str(get_locale()))
-    try:
-        return timeago.format(int(timestamp), time.time(), locale)
-    except:
-        # Fallback to English if locale not supported by timeago
-        return timeago.format(int(timestamp), time.time(), 'en')
+    return timeago.format(int(timestamp), time.time())
 
 
 @app.template_filter('pagination_slice')
@@ -243,59 +206,10 @@ def _jinja2_filter_pagination_slice(arr, skip):
 @app.template_filter('format_seconds_ago')
 def _jinja2_filter_seconds_precise(timestamp):
     if timestamp == False:
-        return gettext('Not yet')
+        return 'Not yet'
 
     return format(int(time.time()-timestamp), ',d')
 
-@app.template_filter('fetcher_status_icons')
-def _jinja2_filter_fetcher_status_icons(fetcher_name):
-    """Get status icon HTML for a given fetcher.
-
-    This filter checks both built-in fetchers and plugin fetchers for status icons.
-
-    Args:
-        fetcher_name: The fetcher name (e.g., 'html_webdriver', 'html_js_zyte')
-
-    Returns:
-        str: HTML string containing status icon elements
-    """
-    from changedetectionio import content_fetchers
-    from changedetectionio.pluggy_interface import collect_fetcher_status_icons
-    from markupsafe import Markup
-    from flask import url_for
-
-    icon_data = None
-
-    # First check if it's a plugin fetcher (plugins have priority)
-    plugin_icon_data = collect_fetcher_status_icons(fetcher_name)
-    if plugin_icon_data:
-        icon_data = plugin_icon_data
-    # Check if it's a built-in fetcher
-    elif hasattr(content_fetchers, fetcher_name):
-        fetcher_class = getattr(content_fetchers, fetcher_name)
-        if hasattr(fetcher_class, 'get_status_icon_data'):
-            icon_data = fetcher_class.get_status_icon_data()
-
-    # Build HTML from icon data
-    if icon_data and isinstance(icon_data, dict):
-        # Use 'group' from icon_data if specified, otherwise default to 'images'
-        group = icon_data.get('group', 'images')
-
-        # Try to use url_for, but fall back to manual URL building if endpoint not registered yet
-        try:
-            icon_url = url_for('static_content', group=group, filename=icon_data['filename'])
-        except:
-            # Fallback: build URL manually respecting APPLICATION_ROOT
-            from flask import request
-            app_root = request.script_root if hasattr(request, 'script_root') else ''
-            icon_url = f"{app_root}/static/{group}/{icon_data['filename']}"
-
-        style_attr = f' style="{icon_data["style"]}"' if icon_data.get('style') else ''
-        html = f'<img class="status-icon" src="{icon_url}" alt="{icon_data["alt"]}" title="{icon_data["title"]}"{style_attr}>'
-        return Markup(html)
-
-    return ''
-
 # Import login_optionally_required from auth_decorator
 from changedetectionio.auth_decorator import login_optionally_required
 
@@ -360,33 +274,7 @@ def changedetection_app(config=None, datastore_o=None):
     login_manager = flask_login.LoginManager(app)
     login_manager.login_view = 'login'
     app.secret_key = init_app_secret(config['datastore_path'])
-
-    # Initialize Flask-Babel for i18n support
-    available_languages = get_available_languages()
-    language_codes = get_language_codes()
-
-    def get_locale():
-        # 1. Try to get locale from session (user explicitly selected)
-        if 'locale' in session:
-            locale = session['locale']
-            print(f"DEBUG: get_locale() returning from session: {locale}")
-            return locale
-        # 2. Fall back to Accept-Language header
-        locale = request.accept_languages.best_match(language_codes)
-        print(f"DEBUG: get_locale() returning from Accept-Language: {locale}")
-        return locale
-
-    # Initialize Babel with locale selector
-    babel = Babel(app, locale_selector=get_locale)
-
-    # Make i18n functions available to templates
-    app.jinja_env.globals.update(
-        _=gettext,
-        get_locale=get_locale,
-        get_flag_for_locale=get_flag_for_locale,
-        available_languages=available_languages
-    )
-
+    
     # Set up a request hook to check authentication for all routes
     @app.before_request
     def check_authentication():
@@ -419,9 +307,6 @@ def changedetection_app(config=None, datastore_o=None):
                 return login_manager.unauthorized()
 
 
-    watch_api.add_resource(WatchHistoryDiff,
-                           '/api/v1/watch/<string:uuid>/difference/<string:from_timestamp>/<string:to_timestamp>',
-                           resource_class_kwargs={'datastore': datastore})
     watch_api.add_resource(WatchSingleHistory,
                            '/api/v1/watch/<string:uuid>/history/<string:timestamp>',
                            resource_class_kwargs={'datastore': datastore, 'update_q': update_q})
@@ -473,18 +358,6 @@ def changedetection_app(config=None, datastore_o=None):
         flask_login.logout_user()
         return redirect(url_for('watchlist.index'))
 
-    @app.route('/set-language/<locale>')
-    def set_language(locale):
-        """Set the user's preferred language in the session"""
-        # Validate the locale against available languages
-        if locale in language_codes:
-            session['locale'] = locale
-        else:
-            logger.error(f"Invalid locale {locale}, available: {language_codes}")
-
-        # Redirect back to the page they came from, or home
-        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'])
@@ -615,31 +488,6 @@ def changedetection_app(config=None, datastore_o=None):
             except FileNotFoundError:
                 abort(404)
 
-        # Handle plugin group specially
-        if group == 'plugin':
-            # Serve files from plugin static directories
-            from changedetectionio.pluggy_interface import plugin_manager
-            import os as os_check
-
-            for plugin_name, plugin_obj in plugin_manager.list_name_plugin():
-                if hasattr(plugin_obj, 'plugin_static_path'):
-                    try:
-                        static_path = plugin_obj.plugin_static_path()
-                        if static_path and os_check.path.isdir(static_path):
-                            # Check if file exists in plugin's static directory
-                            plugin_file_path = os_check.path.join(static_path, filename)
-                            if os_check.path.isfile(plugin_file_path):
-                                # Found the file in a plugin
-                                response = make_response(send_from_directory(static_path, filename))
-                                response.headers['Cache-Control'] = 'max-age=3600, public'  # Cache for 1 hour
-                                return response
-                    except Exception as e:
-                        logger.debug(f"Error checking plugin {plugin_name} for static file: {e}")
-                        pass
-
-            # File not found in any plugin
-            abort(404)
-
         # These files should be in our subdirectory
         try:
             return send_from_directory(f"static/{group}", path=filename)

changedetectionio/forms.py

@@ -2,21 +2,16 @@ import os
 import re
 from loguru import logger
 from wtforms.widgets.core import TimeInput
-from flask_babel import lazy_gettext as _l, gettext
 
 from changedetectionio.blueprint.rss import RSS_FORMAT_TYPES, RSS_TEMPLATE_TYPE_OPTIONS, RSS_TEMPLATE_HTML_DEFAULT
 from changedetectionio.conditions.form import ConditionFormRow
 from changedetectionio.notification_service import NotificationContextData
-from changedetectionio.processors.image_ssim_diff import SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS, \
-    SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT
 from changedetectionio.strtobool import strtobool
-from changedetectionio import processors
 
 from wtforms import (
     BooleanField,
     Form,
     Field,
-    FloatField,
     IntegerField,
     RadioField,
     SelectField,
@@ -60,8 +55,8 @@ valid_method = {
 
 default_method = 'GET'
 allow_simplehost = not strtobool(os.getenv('BLOCK_SIMPLEHOSTS', 'False'))
-REQUIRE_ATLEAST_ONE_TIME_PART_MESSAGE_DEFAULT=_l('At least one time interval (weeks, days, hours, minutes, or seconds) must be specified.')
-REQUIRE_ATLEAST_ONE_TIME_PART_WHEN_NOT_GLOBAL_DEFAULT=_l('At least one time interval (weeks, days, hours, minutes, or seconds) must be specified when not using global settings.')
+REQUIRE_ATLEAST_ONE_TIME_PART_MESSAGE_DEFAULT='At least one time interval (weeks, days, hours, minutes, or seconds) must be specified.'
+REQUIRE_ATLEAST_ONE_TIME_PART_WHEN_NOT_GLOBAL_DEFAULT='At least one time interval (weeks, days, hours, minutes, or seconds) must be specified when not using global settings.'
 
 class StringListField(StringField):
     widget = widgets.TextArea()
@@ -161,7 +156,7 @@ class TimeStringField(Field):
             time_str = valuelist[0]
             # Simple validation for HH:MM format
             if not time_str or len(time_str.split(":")) != 2:
-                raise ValidationError(_l("Invalid time format. Use HH:MM."))
+                raise ValidationError("Invalid time format. Use HH:MM.")
             self.data = time_str
 
 
@@ -177,15 +172,15 @@ class validateTimeZoneName(object):
         from zoneinfo import available_timezones
         python_timezones = available_timezones()
         if field.data and field.data not in python_timezones:
-            raise ValidationError(_l("Not a valid timezone name"))
+            raise ValidationError("Not a valid timezone name")
 
 class ScheduleLimitDaySubForm(Form):
-    enabled = BooleanField(_l("not set"), default=True)
-    start_time = TimeStringField(_l("Start At"), default="00:00", validators=[validators.Optional()])
-    duration = FormField(TimeDurationForm, label=_l("Run duration"))
+    enabled = BooleanField("not set", default=True)
+    start_time = TimeStringField("Start At", default="00:00", validators=[validators.Optional()])
+    duration = FormField(TimeDurationForm, label="Run duration")
 
 class ScheduleLimitForm(Form):
-    enabled = BooleanField(_l("Use time scheduler"), default=False)
+    enabled = BooleanField("Use time scheduler", default=False)
     # Because the label for=""" doesnt line up/work with the actual checkbox
     monday = FormField(ScheduleLimitDaySubForm, label="")
     tuesday = FormField(ScheduleLimitDaySubForm, label="")
@@ -195,7 +190,7 @@ class ScheduleLimitForm(Form):
     saturday = FormField(ScheduleLimitDaySubForm, label="")
     sunday = FormField(ScheduleLimitDaySubForm, label="")
 
-    timezone = StringField(_l("Optional timezone to run in"),
+    timezone = StringField("Optional timezone to run in",
                                   render_kw={"list": "timezones"},
                                   validators=[validateTimeZoneName()]
                                   )
@@ -209,13 +204,13 @@ class ScheduleLimitForm(Form):
         **kwargs,
     ):
         super().__init__(formdata, obj, prefix, data, meta, **kwargs)
-        self.monday.form.enabled.label.text=_l("Monday")
-        self.tuesday.form.enabled.label.text = _l("Tuesday")
-        self.wednesday.form.enabled.label.text = _l("Wednesday")
-        self.thursday.form.enabled.label.text = _l("Thursday")
-        self.friday.form.enabled.label.text = _l("Friday")
-        self.saturday.form.enabled.label.text = _l("Saturday")
-        self.sunday.form.enabled.label.text = _l("Sunday")
+        self.monday.form.enabled.label.text="Monday"
+        self.tuesday.form.enabled.label.text = "Tuesday"
+        self.wednesday.form.enabled.label.text = "Wednesday"
+        self.thursday.form.enabled.label.text = "Thursday"
+        self.friday.form.enabled.label.text = "Friday"
+        self.saturday.form.enabled.label.text = "Saturday"
+        self.sunday.form.enabled.label.text = "Sunday"
 
 
 def validate_time_between_check_has_values(form):
@@ -240,7 +235,7 @@ class RequiredTimeInterval(object):
     Use this with FormField(TimeBetweenCheckForm, validators=[RequiredTimeInterval()]).
     """
     def __init__(self, message=None):
-        self.message = message or _l('At least one time interval (weeks, days, hours, minutes, or seconds) must be specified.')
+        self.message = message or 'At least one time interval (weeks, days, hours, minutes, or seconds) must be specified.'
 
     def __call__(self, form, field):
         if not validate_time_between_check_has_values(field.form):
@@ -248,11 +243,11 @@ class RequiredTimeInterval(object):
 
 
 class TimeBetweenCheckForm(Form):
-    weeks = IntegerField(_l('Weeks'), validators=[validators.Optional(), validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
-    days = IntegerField(_l('Days'), validators=[validators.Optional(), validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
-    hours = IntegerField(_l('Hours'), validators=[validators.Optional(), validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
-    minutes = IntegerField(_l('Minutes'), validators=[validators.Optional(), validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
-    seconds = IntegerField(_l('Seconds'), validators=[validators.Optional(), validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
+    weeks = IntegerField('Weeks', validators=[validators.Optional(), validators.NumberRange(min=0, message="Should contain zero or more seconds")])
+    days = IntegerField('Days', validators=[validators.Optional(), validators.NumberRange(min=0, message="Should contain zero or more seconds")])
+    hours = IntegerField('Hours', validators=[validators.Optional(), validators.NumberRange(min=0, message="Should contain zero or more seconds")])
+    minutes = IntegerField('Minutes', validators=[validators.Optional(), validators.NumberRange(min=0, message="Should contain zero or more seconds")])
+    seconds = IntegerField('Seconds', validators=[validators.Optional(), validators.NumberRange(min=0, message="Should contain zero or more seconds")])
     # @todo add total seconds minimum validatior = minimum_seconds_recheck_time
 
     def __init__(self, formdata=None, obj=None, prefix="", data=None, meta=None, **kwargs):
@@ -722,16 +717,18 @@ class ValidateStartsWithRegex(object):
             if not stripped:
                 if self.allow_empty:
                     continue
-                raise ValidationError(self.message or _l("Empty value not allowed."))
+                raise ValidationError(self.message or "Empty value not allowed.")
             if not self.pattern.match(stripped):
-                raise ValidationError(self.message or _l("Invalid value."))
+                raise ValidationError(self.message or "Invalid value.")
 
 class quickWatchForm(Form):
+    from . import processors
+
     url = fields.URLField('URL', validators=[validateURL()])
     tags = StringTagUUID('Group tag', [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"})
+    watch_submit_button = SubmitField('Watch', render_kw={"class": "pure-button pure-button-primary"})
+    processor = RadioField(u'Processor', choices=processors.available_processors(), default="text_json_diff")
+    edit_and_watch_submit_button = SubmitField('Edit > Watch', render_kw={"class": "pure-button pure-button-primary"})
 
 
 # Common to a single watch and the global settings
@@ -744,14 +741,14 @@ class commonSettingsForm(Form):
         self.notification_title.extra_notification_tokens = kwargs.get('extra_notification_tokens', {})
         self.notification_urls.extra_notification_tokens = kwargs.get('extra_notification_tokens', {})
 
-    fetch_backend = RadioField(_l('Fetch Method'), choices=content_fetchers.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
-    notification_body = TextAreaField(_l('Notification Body'), default='{{ watch_url }} had a change.', validators=[validators.Optional(), ValidateJinja2Template()])
-    notification_format = SelectField(_l('Notification format'), choices=list(valid_notification_formats.items()))
-    notification_title = StringField(_l('Notification Title'), default='ChangeDetection.io Notification - {{ watch_url }}', validators=[validators.Optional(), ValidateJinja2Template()])
-    notification_urls = StringListField(_l('Notification URL List'), validators=[validators.Optional(), ValidateAppRiseServers(), ValidateJinja2Template()])
-    processor = RadioField( label=_l("Processor - What do you want to achieve?"), choices=lambda: processors.available_processors(), default="text_json_diff")
-    scheduler_timezone_default = StringField(_l("Default timezone for watch check scheduler"), render_kw={"list": "timezones"}, validators=[validateTimeZoneName()])
-    webdriver_delay = IntegerField(_l('Wait seconds before extracting text'), validators=[validators.Optional(), validators.NumberRange(min=1, message=_l("Should contain one or more seconds"))])
+    fetch_backend = RadioField(u'Fetch Method', choices=content_fetchers.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
+    notification_body = TextAreaField('Notification Body', default='{{ watch_url }} had a change.', validators=[validators.Optional(), ValidateJinja2Template()])
+    notification_format = SelectField('Notification format', choices=list(valid_notification_formats.items()))
+    notification_title = StringField('Notification Title', default='ChangeDetection.io Notification - {{ watch_url }}', validators=[validators.Optional(), ValidateJinja2Template()])
+    notification_urls = StringListField('Notification URL List', validators=[validators.Optional(), ValidateAppRiseServers(), ValidateJinja2Template()])
+    processor = RadioField( label=u"Processor - What do you want to achieve?", choices=processors.available_processors(), default="text_json_diff")
+    scheduler_timezone_default = StringField("Default timezone for watch check scheduler", render_kw={"list": "timezones"}, validators=[validateTimeZoneName()])
+    webdriver_delay = IntegerField('Wait seconds before extracting text', validators=[validators.Optional(), validators.NumberRange(min=1, message="Should contain one or more seconds")])
 
 # Not true anymore but keep the validate_ hook for future use, we convert color tags
 #    def validate_notification_urls(self, field):
@@ -763,21 +760,22 @@ class commonSettingsForm(Form):
 
 
 class importForm(Form):
-    processor = RadioField(_l('Processor'), choices=lambda: processors.available_processors(), default="text_json_diff")
-    urls = TextAreaField(_l('URLs'))
-    xlsx_file = FileField(_l('Upload .xlsx file'), validators=[FileAllowed(['xlsx'], _l('Must be .xlsx file!'))])
-    file_mapping = SelectField(_l('File mapping'), [validators.DataRequired()], choices={('wachete', 'Wachete mapping'), ('custom','Custom mapping')})
+    from . import processors
+    processor = RadioField(u'Processor', choices=processors.available_processors(), default="text_json_diff")
+    urls = TextAreaField('URLs')
+    xlsx_file = FileField('Upload .xlsx file', validators=[FileAllowed(['xlsx'], 'Must be .xlsx file!')])
+    file_mapping = SelectField('File mapping', [validators.DataRequired()], choices={('wachete', 'Wachete mapping'), ('custom','Custom mapping')})
 
 class SingleBrowserStep(Form):
 
-    operation = SelectField(_l('Operation'), [validators.Optional()], choices=browser_step_ui_config.keys())
+    operation = SelectField('Operation', [validators.Optional()], choices=browser_step_ui_config.keys())
 
     # maybe better to set some <script>var..
-    selector = StringField(_l('Selector'), [validators.Optional()], render_kw={"placeholder": "CSS or xPath selector"})
-    optional_value = StringField(_l('value'), [validators.Optional()], render_kw={"placeholder": "Value"})
+    selector = StringField('Selector', [validators.Optional()], render_kw={"placeholder": "CSS or xPath selector"})
+    optional_value = StringField('value', [validators.Optional()], render_kw={"placeholder": "Value"})
 #   @todo move to JS? ajax fetch new field?
-#    remove_button = SubmitField(_l('-'), render_kw={"type": "button", "class": "pure-button pure-button-primary", 'title': 'Remove'})
-#    add_button = SubmitField(_l('+'), render_kw={"type": "button", "class": "pure-button pure-button-primary", 'title': 'Add new step after'})
+#    remove_button = SubmitField('-', render_kw={"type": "button", "class": "pure-button pure-button-primary", 'title': 'Remove'})
+#    add_button = SubmitField('+', render_kw={"type": "button", "class": "pure-button pure-button-primary", 'title': 'Add new step after'})
 
 class processor_text_json_diff_form(commonSettingsForm):
 
@@ -793,48 +791,49 @@ class processor_text_json_diff_form(commonSettingsForm):
 
     time_schedule_limit = FormField(ScheduleLimitForm)
 
-    time_between_check_use_default = BooleanField(_l('Use global settings for time between check and scheduler.'), default=False)
+    time_between_check_use_default = BooleanField('Use global settings for time between check and scheduler.', default=False)
 
-    include_filters = StringListField(_l('CSS/JSONPath/JQ/XPath Filters'), [ValidateCSSJSONXPATHInput()], default='')
+    include_filters = StringListField('CSS/JSONPath/JQ/XPath Filters', [ValidateCSSJSONXPATHInput()], default='')
 
-    subtractive_selectors = StringListField(_l('Remove elements'), [ValidateCSSJSONXPATHInput(allow_json=False)])
+    subtractive_selectors = StringListField('Remove elements', [ValidateCSSJSONXPATHInput(allow_json=False)])
 
-    extract_text = StringListField(_l('Extract text'), [ValidateListRegex()])
+    extract_text = StringListField('Extract text', [ValidateListRegex()])
 
-    title = StringField(_l('Title'), default='')
+    title = StringField('Title', default='')
 
-    ignore_text = StringListField(_l('Ignore lines containing'), [ValidateListRegex()])
+    ignore_text = StringListField('Ignore lines containing', [ValidateListRegex()])
     headers = StringDictKeyValue('Request headers')
-    body = TextAreaField(_l('Request body'), [validators.Optional()])
-    method = SelectField(_l('Request method'), choices=valid_method, default=default_method)
-    ignore_status_codes = BooleanField(_l('Ignore status codes (process non-2xx status codes as normal)'), default=False)
-    check_unique_lines = BooleanField(_l('Only trigger when unique lines appear in all history'), default=False)
-    remove_duplicate_lines = BooleanField(_l('Remove duplicate lines of text'), default=False)
-    sort_text_alphabetically =  BooleanField(_l('Sort text alphabetically'), default=False)
-    strip_ignored_lines = TernaryNoneBooleanField(_l('Strip ignored lines'), default=None)
-    trim_text_whitespace = BooleanField(_l('Trim whitespace before and after text'), default=False)
+    body = TextAreaField('Request body', [validators.Optional()])
+    method = SelectField('Request method', choices=valid_method, default=default_method)
+    ignore_status_codes = BooleanField('Ignore status codes (process non-2xx status codes as normal)', default=False)
+    check_unique_lines = BooleanField('Only trigger when unique lines appear in all history', default=False)
+    remove_duplicate_lines = BooleanField('Remove duplicate lines of text', default=False)
+    sort_text_alphabetically =  BooleanField('Sort text alphabetically', default=False)
+    strip_ignored_lines = TernaryNoneBooleanField('Strip ignored lines', default=None)
+    trim_text_whitespace = BooleanField('Trim whitespace before and after text', default=False)
 
-    filter_text_added = BooleanField(_l('Added lines'), default=True)
-    filter_text_replaced = BooleanField(_l('Replaced/changed lines'), default=True)
-    filter_text_removed = BooleanField(_l('Removed lines'), default=True)
+    filter_text_added = BooleanField('Added lines', default=True)
+    filter_text_replaced = BooleanField('Replaced/changed lines', default=True)
+    filter_text_removed = BooleanField('Removed lines', default=True)
 
-    trigger_text = StringListField(_l('Keyword triggers - Trigger/wait for text'), [validators.Optional(), ValidateListRegex()])
+    trigger_text = StringListField('Keyword triggers - Trigger/wait for text', [validators.Optional(), ValidateListRegex()])
     if os.getenv("PLAYWRIGHT_DRIVER_URL"):
         browser_steps = FieldList(FormField(SingleBrowserStep), min_entries=10)
-    text_should_not_be_present = StringListField(_l('Block change-detection while text matches'), [validators.Optional(), ValidateListRegex()])
-    webdriver_js_execute_code = TextAreaField(_l('Execute JavaScript before change detection'), render_kw={"rows": "5"}, validators=[validators.Optional()])
+    text_should_not_be_present = StringListField('Block change-detection while text matches', [validators.Optional(), ValidateListRegex()])
+    webdriver_js_execute_code = TextAreaField('Execute JavaScript before change detection', render_kw={"rows": "5"}, validators=[validators.Optional()])
 
-    save_button = SubmitField(_l('Save'), render_kw={"class": "pure-button pure-button-primary"})
+    save_button = SubmitField('Save', render_kw={"class": "pure-button pure-button-primary"})
 
-    proxy = RadioField(_l('Proxy'))
+    proxy = RadioField('Proxy')
     # filter_failure_notification_send @todo make ternary
-    filter_failure_notification_send = BooleanField(_l('Send a notification when the filter can no longer be found on the page'), default=False)
-    notification_muted = TernaryNoneBooleanField(_l('Notifications'), default=None, yes_text=_l("Muted"), no_text=_l("On"))
-    notification_screenshot = BooleanField(_l('Attach screenshot to notification (where possible)'), default=False)
+    filter_failure_notification_send = BooleanField(
+        'Send a notification when the filter can no longer be found on the page', default=False)
+    notification_muted = TernaryNoneBooleanField('Notifications', default=None, yes_text="Muted", no_text="On")
+    notification_screenshot = BooleanField('Attach screenshot to notification (where possible)', default=False)
 
-    conditions_match_logic = RadioField(_l('Match'), choices=[('ALL', _l('Match all of the following')),('ANY', _l('Match any of the following'))], default='ALL')
+    conditions_match_logic = RadioField(u'Match', choices=[('ALL', 'Match all of the following'),('ANY', 'Match any of the following')], default='ALL')
     conditions = FieldList(FormField(ConditionFormRow), min_entries=1)  # Add rule logic here
-    use_page_title_in_list = TernaryNoneBooleanField(_l('Use page <title> in list'), default=None)
+    use_page_title_in_list = TernaryNoneBooleanField('Use page <title> in list', default=None)
 
     def extra_tab_content(self):
         return None
@@ -851,7 +850,7 @@ class processor_text_json_diff_form(commonSettingsForm):
 
         # Fail form validation when a body is set for a GET
         if self.method.data == 'GET' and self.body.data:
-            self.body.errors.append(gettext('Body must be empty when Request Method is set to GET'))
+            self.body.errors.append('Body must be empty when Request Method is set to GET')
             result = False
 
         # Attempt to validate jinja2 templates in the URL
@@ -860,11 +859,11 @@ class processor_text_json_diff_form(commonSettingsForm):
         except ModuleNotFoundError as e:
             # incase jinja2_time or others is missing
             logger.error(e)
-            self.url.errors.append(gettext('Invalid template syntax configuration: %(error)s') % {'error': e})
+            self.url.errors.append(f'Invalid template syntax configuration: {e}')
             result = False
         except Exception as e:
             logger.error(e)
-            self.url.errors.append(gettext('Invalid template syntax: %(error)s') % {'error': e})
+            self.url.errors.append(f'Invalid template syntax: {e}')
             result = False
 
         # Attempt to validate jinja2 templates in the body
@@ -874,11 +873,11 @@ class processor_text_json_diff_form(commonSettingsForm):
             except ModuleNotFoundError as e:
                 # incase jinja2_time or others is missing
                 logger.error(e)
-                self.body.errors.append(gettext('Invalid template syntax configuration: %(error)s') % {'error': e})
+                self.body.errors.append(f'Invalid template syntax configuration: {e}')
                 result = False
             except Exception as e:
                 logger.error(e)
-                self.body.errors.append(gettext('Invalid template syntax: %(error)s') % {'error': e})
+                self.body.errors.append(f'Invalid template syntax: {e}')
                 result = False
 
         # Attempt to validate jinja2 templates in the headers
@@ -889,11 +888,11 @@ class processor_text_json_diff_form(commonSettingsForm):
             except ModuleNotFoundError as e:
                 # incase jinja2_time or others is missing
                 logger.error(e)
-                self.headers.errors.append(gettext('Invalid template syntax configuration: %(error)s') % {'error': e})
+                self.headers.errors.append(f'Invalid template syntax configuration: {e}')
                 result = False
             except Exception as e:
                 logger.error(e)
-                self.headers.errors.append(gettext('Invalid template syntax in \"%(header)s\" header: %(error)s') % {'header': header, 'error': e})
+                self.headers.errors.append(f'Invalid template syntax in "{header}" header: {e}')
                 result = False
 
         return result
@@ -917,122 +916,110 @@ class processor_text_json_diff_form(commonSettingsForm):
 
 class SingleExtraProxy(Form):
     # maybe better to set some <script>var..
-    proxy_name = StringField(_l('Name'), [validators.Optional()], render_kw={"placeholder": "Name"})
-    proxy_url = StringField(_l('Proxy URL'), [
+    proxy_name = StringField('Name', [validators.Optional()], render_kw={"placeholder": "Name"})
+    proxy_url = StringField('Proxy URL', [
         validators.Optional(),
         ValidateStartsWithRegex(
             regex=r'^(https?|socks5)://',  # ✅ main pattern
             flags=re.IGNORECASE,  # ✅ makes it case-insensitive
-            message=_l('Proxy URLs must start with http://, https:// or socks5://'),
+            message='Proxy URLs must start with http://, https:// or socks5://',
         ),
         ValidateSimpleURL()
     ], render_kw={"placeholder": "socks5:// or regular proxy http://user:pass@...:3128", "size":50})
 
 class SingleExtraBrowser(Form):
-    browser_name = StringField(_l('Name'), [validators.Optional()], render_kw={"placeholder": "Name"})
-    browser_connection_url = StringField(_l('Browser connection URL'), [
+    browser_name = StringField('Name', [validators.Optional()], render_kw={"placeholder": "Name"})
+    browser_connection_url = StringField('Browser connection URL', [
         validators.Optional(),
         ValidateStartsWithRegex(
             regex=r'^(wss?|ws)://',
             flags=re.IGNORECASE,
-            message=_l('Browser URLs must start with wss:// or ws://')
+            message='Browser URLs must start with wss:// or ws://'
         ),
         ValidateSimpleURL()
     ], render_kw={"placeholder": "wss://brightdata... wss://oxylabs etc", "size":50})
 
 class DefaultUAInputForm(Form):
-    html_requests = StringField(_l('Plaintext requests'), validators=[validators.Optional()], render_kw={"placeholder": "<default>"})
+    html_requests = StringField('Plaintext requests', validators=[validators.Optional()], render_kw={"placeholder": "<default>"})
     if os.getenv("PLAYWRIGHT_DRIVER_URL") or os.getenv("WEBDRIVER_URL"):
-        html_webdriver = StringField(_l('Chrome requests'), validators=[validators.Optional()], render_kw={"placeholder": "<default>"})
+        html_webdriver = StringField('Chrome requests', validators=[validators.Optional()], render_kw={"placeholder": "<default>"})
 
 # datastore.data['settings']['requests']..
 class globalSettingsRequestForm(Form):
     time_between_check = RequiredFormField(TimeBetweenCheckForm)
     time_schedule_limit = FormField(ScheduleLimitForm)
-    proxy = RadioField(_l('Default proxy'))
-    jitter_seconds = IntegerField(_l('Random jitter seconds ± check'),
+    proxy = RadioField('Default proxy')
+    jitter_seconds = IntegerField('Random jitter seconds ± check',
                                   render_kw={"style": "width: 5em;"},
-                                  validators=[validators.NumberRange(min=0, message=_l("Should contain zero or more seconds"))])
+                                  validators=[validators.NumberRange(min=0, message="Should contain zero or more seconds")])
     
-    workers = IntegerField(_l('Number of fetch workers'),
+    workers = IntegerField('Number of fetch workers',
                           render_kw={"style": "width: 5em;"},
                           validators=[validators.NumberRange(min=1, max=50,
-                                                             message=_l("Should be between 1 and 50"))])
+                                                             message="Should be between 1 and 50")])
 
-    timeout = IntegerField(_l('Requests timeout in seconds'),
+    timeout = IntegerField('Requests timeout in seconds',
                            render_kw={"style": "width: 5em;"},
                            validators=[validators.NumberRange(min=1, max=999,
-                                                              message=_l("Should be between 1 and 999"))])
+                                                              message="Should be between 1 and 999")])
 
     extra_proxies = FieldList(FormField(SingleExtraProxy), min_entries=5)
     extra_browsers = FieldList(FormField(SingleExtraBrowser), min_entries=5)
 
-    default_ua = FormField(DefaultUAInputForm, label=_l("Default User-Agent overrides"))
+    default_ua = FormField(DefaultUAInputForm, label="Default User-Agent overrides")
 
     def validate_extra_proxies(self, extra_validators=None):
         for e in self.data['extra_proxies']:
             if e.get('proxy_name') or e.get('proxy_url'):
                 if not e.get('proxy_name','').strip() or not e.get('proxy_url','').strip():
-                    self.extra_proxies.errors.append(gettext('Both a name, and a Proxy URL is required.'))
+                    self.extra_proxies.errors.append('Both a name, and a Proxy URL is required.')
                     return False
 
 class globalSettingsApplicationUIForm(Form):
-    open_diff_in_new_tab = BooleanField(_l("Open 'History' page in a new tab"), default=True, validators=[validators.Optional()])
-    socket_io_enabled = BooleanField(_l('Realtime UI Updates Enabled'), default=True, validators=[validators.Optional()])
-    favicons_enabled = BooleanField(_l('Favicons Enabled'), default=True, validators=[validators.Optional()])
-    use_page_title_in_list = BooleanField(_l('Use page <title> in watch overview list')) #BooleanField=True
+    open_diff_in_new_tab = BooleanField("Open 'History' page in a new tab", default=True, validators=[validators.Optional()])
+    socket_io_enabled = BooleanField('Realtime UI Updates Enabled', default=True, validators=[validators.Optional()])
+    favicons_enabled = BooleanField('Favicons Enabled', default=True, validators=[validators.Optional()])
+    use_page_title_in_list = BooleanField('Use page <title> in watch overview list') #BooleanField=True
 
 # datastore.data['settings']['application']..
 class globalSettingsApplicationForm(commonSettingsForm):
 
-    api_access_token_enabled = BooleanField(_l('API access token security check enabled'), default=True, validators=[validators.Optional()])
-    base_url = StringField(_l('Notification base URL override'),
+    api_access_token_enabled = BooleanField('API access token security check enabled', default=True, validators=[validators.Optional()])
+    base_url = StringField('Notification base URL override',
                            validators=[validators.Optional()],
                            render_kw={"placeholder": os.getenv('BASE_URL', 'Not set')}
                            )
-    empty_pages_are_a_change =  BooleanField(_l('Treat empty pages as a change?'), default=False)
-    fetch_backend = RadioField(_l('Fetch Method'), default="html_requests", choices=content_fetchers.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
-    global_ignore_text = StringListField(_l('Ignore Text'), [ValidateListRegex()])
-    global_subtractive_selectors = StringListField(_l('Remove elements'), [ValidateCSSJSONXPATHInput(allow_json=False)])
-    ignore_whitespace = BooleanField(_l('Ignore whitespace'))
-
-    # Screenshot comparison settings
-    min_change_percentage = FloatField(
-        'Screenshot: Minimum Change Percentage',
-        validators=[
-            validators.Optional(),
-            validators.NumberRange(min=0.0, max=100.0, message=_l('Must be between 0 and 100'))
-        ],
-        default=0.1,
-        render_kw={"placeholder": "0.1", "style": "width: 8em;"}
-    )
-
+    empty_pages_are_a_change =  BooleanField('Treat empty pages as a change?', default=False)
+    fetch_backend = RadioField('Fetch Method', default="html_requests", choices=content_fetchers.available_fetchers(), validators=[ValidateContentFetcherIsReady()])
+    global_ignore_text = StringListField('Ignore Text', [ValidateListRegex()])
+    global_subtractive_selectors = StringListField('Remove elements', [ValidateCSSJSONXPATHInput(allow_json=False)])
+    ignore_whitespace = BooleanField('Ignore whitespace')
     password = SaltyPasswordField()
-    pager_size = IntegerField(_l('Pager size'),
+    pager_size = IntegerField('Pager size',
                               render_kw={"style": "width: 5em;"},
                               validators=[validators.NumberRange(min=0,
-                                                                 message=_l("Should be atleast zero (disabled)"))])
+                                                                 message="Should be atleast zero (disabled)")])
 
-    rss_content_format = SelectField(_l('RSS Content format'), choices=list(RSS_FORMAT_TYPES.items()))
-    rss_template_type = SelectField(_l('RSS <description> body built from'), choices=list(RSS_TEMPLATE_TYPE_OPTIONS.items()))
-    rss_template_override = TextAreaField(_l('RSS "System default" template override'), render_kw={"rows": "5", "placeholder": RSS_TEMPLATE_HTML_DEFAULT}, validators=[validators.Optional(), ValidateJinja2Template()])
+    rss_content_format = SelectField('RSS Content format', choices=list(RSS_FORMAT_TYPES.items()))
+    rss_template_type = SelectField('RSS <description> body built from', choices=list(RSS_TEMPLATE_TYPE_OPTIONS.items()))
+    rss_template_override = TextAreaField('RSS "System default" template override', render_kw={"rows": "5", "placeholder": RSS_TEMPLATE_HTML_DEFAULT}, validators=[validators.Optional(), ValidateJinja2Template()])
 
-    removepassword_button = SubmitField(_l('Remove password'), render_kw={"class": "pure-button pure-button-primary"})
-    render_anchor_tag_content = BooleanField(_l('Render anchor tag content'), default=False)
-    shared_diff_access = BooleanField(_l('Allow anonymous access to watch history page when password is enabled'), default=False, validators=[validators.Optional()])
-    strip_ignored_lines = BooleanField(_l('Strip ignored lines'))
-    rss_hide_muted_watches = BooleanField(_l('Hide muted watches from RSS feed'), default=True,
+    removepassword_button = SubmitField('Remove password', render_kw={"class": "pure-button pure-button-primary"})
+    render_anchor_tag_content = BooleanField('Render anchor tag content', default=False)
+    shared_diff_access = BooleanField('Allow anonymous access to watch history page when password is enabled', default=False, validators=[validators.Optional()])
+    strip_ignored_lines = BooleanField('Strip ignored lines')
+    rss_hide_muted_watches = BooleanField('Hide muted watches from RSS feed', default=True,
                                       validators=[validators.Optional()])
 
-    rss_reader_mode = BooleanField(_l('Enable RSS reader mode '), default=False, validators=[validators.Optional()])
-    rss_diff_length = IntegerField(label=_l('Number of changes to show in watch RSS feed'),
+    rss_reader_mode = BooleanField('Enable RSS reader mode ', default=False, validators=[validators.Optional()])
+    rss_diff_length = IntegerField(label='Number of changes to show in watch RSS feed',
                                    render_kw={"style": "width: 5em;"},
-                                   validators=[validators.NumberRange(min=0, message=_l("Should contain zero or more attempts"))])
+                                   validators=[validators.NumberRange(min=0, message="Should contain zero or more attempts")])
 
-    filter_failure_notification_threshold_attempts = IntegerField(_l('Number of times the filter can be missing before sending a notification'),
+    filter_failure_notification_threshold_attempts = IntegerField('Number of times the filter can be missing before sending a notification',
                                                                   render_kw={"style": "width: 5em;"},
                                                                   validators=[validators.NumberRange(min=0,
-                                                                                                     message=_l("Should contain zero or more attempts"))])
+                                                                                                     message="Should contain zero or more attempts")])
     ui = FormField(globalSettingsApplicationUIForm)
 
 
@@ -1048,9 +1035,9 @@ class globalSettingsForm(Form):
 
     requests = FormField(globalSettingsRequestForm)
     application = FormField(globalSettingsApplicationForm)
-    save_button = SubmitField(_l('Save'), render_kw={"class": "pure-button pure-button-primary"})
+    save_button = SubmitField('Save', render_kw={"class": "pure-button pure-button-primary"})
 
 
 class extractDataForm(Form):
-    extract_regex = StringField(_l('RegEx to extract'), validators=[validators.DataRequired(), ValidateSinglePythonRegexString()])
-    extract_submit_button = SubmitField(_l('Extract as CSV'), render_kw={"class": "pure-button pure-button-primary"})
+    extract_regex = StringField('RegEx to extract', validators=[validators.DataRequired(), ValidateSinglePythonRegexString()])
+    extract_submit_button = SubmitField('Extract as CSV', render_kw={"class": "pure-button pure-button-primary"})

changedetectionio/html_tools.py

@@ -172,131 +172,99 @@ def elementpath_tostring(obj):
     return str(obj)
 
 # Return str Utf-8 of matched rules
-def xpath_filter(xpath_filter, html_content, append_pretty_line_formatting=False, is_xml=False):
-    """
-
-    :param xpath_filter:
-    :param html_content:
-    :param append_pretty_line_formatting:
-    :param is_xml: set to true if is XML or is RSS (RSS is XML)
-    :return:
-    """
+def xpath_filter(xpath_filter, html_content, append_pretty_line_formatting=False, is_rss=False):
     from lxml import etree, html
     import elementpath
     # xpath 2.0-3.1
     from elementpath.xpath3 import XPath3Parser
 
     parser = etree.HTMLParser()
-    tree = None
-    try:
-        if is_xml:
-            # So that we can keep CDATA for cdata_in_document_to_text() to process
-            parser = etree.XMLParser(strip_cdata=False)
-            # For XML/RSS content, use etree.fromstring to properly handle XML declarations
-            tree = etree.fromstring(html_content.encode('utf-8') if isinstance(html_content, str) else html_content, parser=parser)
+    if is_rss:
+        # So that we can keep CDATA for cdata_in_document_to_text() to process
+        parser = etree.XMLParser(strip_cdata=False)
+
+    tree = html.fromstring(bytes(html_content, encoding='utf-8'), parser=parser)
+    html_block = ""
+
+    # Build namespace map for XPath queries
+    namespaces = {'re': 'http://exslt.org/regular-expressions'}
+
+    # Handle default namespace in documents (common in RSS/Atom feeds, but can occur in any XML)
+    # XPath spec: unprefixed element names have no namespace, not the default namespace
+    # Solution: Register the default namespace with empty string prefix in elementpath
+    # This is primarily for RSS/Atom feeds but works for any XML with default namespace
+    if hasattr(tree, 'nsmap') and tree.nsmap and None in tree.nsmap:
+        # Register the default namespace with empty string prefix for elementpath
+        # This allows //title to match elements in the default namespace
+        namespaces[''] = tree.nsmap[None]
+
+    r = elementpath.select(tree, xpath_filter.strip(), namespaces=namespaces, parser=XPath3Parser)
+    #@note: //title/text() now works with default namespaces (fixed by registering '' prefix)
+    #@note: //title/text() wont work where <title>CDATA.. (use cdata_in_document_to_text first)
+
+    if type(r) != list:
+        r = [r]
+
+    for element in r:
+        # When there's more than 1 match, then add the suffix to separate each line
+        # And where the matched result doesn't include something that will cause Inscriptis to add a newline
+        # (This way each 'match' reliably has a new-line in the diff)
+        # Divs are converted to 4 whitespaces by inscriptis
+        if append_pretty_line_formatting and len(html_block) and (not hasattr( element, 'tag' ) or not element.tag in (['br', 'hr', 'div', 'p'])):
+            html_block += TEXT_FILTER_LIST_LINE_SUFFIX
+
+        if type(element) == str:
+            html_block += element
+        elif issubclass(type(element), etree._Element) or issubclass(type(element), etree._ElementTree):
+            html_block += etree.tostring(element, pretty_print=True).decode('utf-8')
         else:
-            tree = html.fromstring(html_content, parser=parser)
-        html_block = ""
+            html_block += elementpath_tostring(element)
 
-        # Build namespace map for XPath queries
-        namespaces = {'re': 'http://exslt.org/regular-expressions'}
-
-        # Handle default namespace in documents (common in RSS/Atom feeds, but can occur in any XML)
-        # XPath spec: unprefixed element names have no namespace, not the default namespace
-        # Solution: Register the default namespace with empty string prefix in elementpath
-        # This is primarily for RSS/Atom feeds but works for any XML with default namespace
-        if hasattr(tree, 'nsmap') and tree.nsmap and None in tree.nsmap:
-            # Register the default namespace with empty string prefix for elementpath
-            # This allows //title to match elements in the default namespace
-            namespaces[''] = tree.nsmap[None]
-
-        r = elementpath.select(tree, xpath_filter.strip(), namespaces=namespaces, parser=XPath3Parser)
-        #@note: //title/text() now works with default namespaces (fixed by registering '' prefix)
-        #@note: //title/text() wont work where <title>CDATA.. (use cdata_in_document_to_text first)
-
-        if type(r) != list:
-            r = [r]
-
-        for element in r:
-            # When there's more than 1 match, then add the suffix to separate each line
-            # And where the matched result doesn't include something that will cause Inscriptis to add a newline
-            # (This way each 'match' reliably has a new-line in the diff)
-            # Divs are converted to 4 whitespaces by inscriptis
-            if append_pretty_line_formatting and len(html_block) and (not hasattr( element, 'tag' ) or not element.tag in (['br', 'hr', 'div', 'p'])):
-                html_block += TEXT_FILTER_LIST_LINE_SUFFIX
-
-            if type(element) == str:
-                html_block += element
-            elif issubclass(type(element), etree._Element) or issubclass(type(element), etree._ElementTree):
-                # Use 'xml' method for RSS/XML content, 'html' for HTML content
-                # parser will be XMLParser if we detected XML content
-                method = 'xml' if (is_xml or isinstance(parser, etree.XMLParser)) else 'html'
-                html_block += etree.tostring(element, pretty_print=True, method=method, encoding='unicode')
-            else:
-                html_block += elementpath_tostring(element)
-
-        return html_block
-    finally:
-        # Explicitly clear the tree to free memory
-        # lxml trees can hold significant memory, especially with large documents
-        if tree is not None:
-            tree.clear()
+    return html_block
 
 # Return str Utf-8 of matched rules
 # 'xpath1:'
-def xpath1_filter(xpath_filter, html_content, append_pretty_line_formatting=False, is_xml=False):
+def xpath1_filter(xpath_filter, html_content, append_pretty_line_formatting=False, is_rss=False):
     from lxml import etree, html
 
     parser = None
-    tree = None
-    try:
-        if is_xml:
-            # So that we can keep CDATA for cdata_in_document_to_text() to process
-            parser = etree.XMLParser(strip_cdata=False)
-            # For XML/RSS content, use etree.fromstring to properly handle XML declarations
-            tree = etree.fromstring(html_content.encode('utf-8') if isinstance(html_content, str) else html_content, parser=parser)
+    if is_rss:
+        # So that we can keep CDATA for cdata_in_document_to_text() to process
+        parser = etree.XMLParser(strip_cdata=False)
+
+    tree = html.fromstring(bytes(html_content, encoding='utf-8'), parser=parser)
+    html_block = ""
+
+    # Build namespace map for XPath queries
+    namespaces = {'re': 'http://exslt.org/regular-expressions'}
+
+    # NOTE: lxml's native xpath() does NOT support empty string prefix for default namespace
+    # For documents with default namespace (RSS/Atom feeds), users must use:
+    #   - local-name(): //*[local-name()='title']/text()
+    #   - Or use xpath_filter (not xpath1_filter) which supports default namespaces
+    # XPath spec: unprefixed element names have no namespace, not the default namespace
+
+    r = tree.xpath(xpath_filter.strip(), namespaces=namespaces)
+    #@note: xpath1 (lxml) does NOT automatically handle default namespaces
+    #@note: Use //*[local-name()='element'] or switch to xpath_filter for default namespace support
+    #@note: //title/text() wont work where <title>CDATA.. (use cdata_in_document_to_text first)
+
+    for element in r:
+        # When there's more than 1 match, then add the suffix to separate each line
+        # And where the matched result doesn't include something that will cause Inscriptis to add a newline
+        # (This way each 'match' reliably has a new-line in the diff)
+        # Divs are converted to 4 whitespaces by inscriptis
+        if append_pretty_line_formatting and len(html_block) and (not hasattr(element, 'tag') or not element.tag in (['br', 'hr', 'div', 'p'])):
+            html_block += TEXT_FILTER_LIST_LINE_SUFFIX
+
+        # Some kind of text, UTF-8 or other
+        if isinstance(element, (str, bytes)):
+            html_block += element
         else:
-            tree = html.fromstring(html_content, parser=parser)
-        html_block = ""
+            # Return the HTML which will get parsed as text
+            html_block += etree.tostring(element, pretty_print=True).decode('utf-8')
 
-        # Build namespace map for XPath queries
-        namespaces = {'re': 'http://exslt.org/regular-expressions'}
-
-        # NOTE: lxml's native xpath() does NOT support empty string prefix for default namespace
-        # For documents with default namespace (RSS/Atom feeds), users must use:
-        #   - local-name(): //*[local-name()='title']/text()
-        #   - Or use xpath_filter (not xpath1_filter) which supports default namespaces
-        # XPath spec: unprefixed element names have no namespace, not the default namespace
-
-        r = tree.xpath(xpath_filter.strip(), namespaces=namespaces)
-        #@note: xpath1 (lxml) does NOT automatically handle default namespaces
-        #@note: Use //*[local-name()='element'] or switch to xpath_filter for default namespace support
-        #@note: //title/text() wont work where <title>CDATA.. (use cdata_in_document_to_text first)
-
-        for element in r:
-            # When there's more than 1 match, then add the suffix to separate each line
-            # And where the matched result doesn't include something that will cause Inscriptis to add a newline
-            # (This way each 'match' reliably has a new-line in the diff)
-            # Divs are converted to 4 whitespaces by inscriptis
-            if append_pretty_line_formatting and len(html_block) and (not hasattr(element, 'tag') or not element.tag in (['br', 'hr', 'div', 'p'])):
-                html_block += TEXT_FILTER_LIST_LINE_SUFFIX
-
-            # Some kind of text, UTF-8 or other
-            if isinstance(element, (str, bytes)):
-                html_block += element
-            else:
-                # Return the HTML/XML which will get parsed as text
-                # Use 'xml' method for RSS/XML content, 'html' for HTML content
-                # parser will be XMLParser if we detected XML content
-                method = 'xml' if (is_xml or isinstance(parser, etree.XMLParser)) else 'html'
-                html_block += etree.tostring(element, pretty_print=True, method=method, encoding='unicode')
-
-        return html_block
-    finally:
-        # Explicitly clear the tree to free memory
-        # lxml trees can hold significant memory, especially with large documents
-        if tree is not None:
-            tree.clear()
+    return html_block
 
 # Extract/find element
 def extract_element(find='title', html_content=''):
@@ -464,9 +432,6 @@ def strip_ignore_text(content, wordlist, mode="content"):
     ignore_regex_multiline = []
     ignored_lines = []
 
-    if not content:
-        return ''
-
     for k in wordlist:
         # Skip empty strings to avoid matching everything
         if not k or not k.strip():

changedetectionio/languages.py

@@ -1,103 +0,0 @@
-"""
-Language configuration for i18n support
-Automatically discovers available languages from translations directory
-"""
-import os
-from pathlib import Path
-
-
-def get_timeago_locale(flask_locale):
-    """
-    Convert Flask-Babel locale codes to timeago library locale codes.
-
-    The Python timeago library (https://github.com/hustcc/timeago) supports 48 locales
-    but uses different naming conventions than Flask-Babel. This function maps between them.
-
-    Notable differences:
-    - Chinese: Flask uses 'zh', timeago uses 'zh_CN'
-    - Portuguese: Flask uses 'pt', timeago uses 'pt_PT' or 'pt_BR'
-    - Swedish: Flask uses 'sv', timeago uses 'sv_SE'
-    - Norwegian: Flask uses 'no', timeago uses 'nb_NO' or 'nn_NO'
-    - Hindi: Flask uses 'hi', timeago uses 'in_HI'
-    - Czech: Flask uses 'cs', but timeago doesn't support Czech - fallback to English
-
-    Args:
-        flask_locale (str): Flask-Babel locale code (e.g., 'cs', 'zh', 'pt')
-
-    Returns:
-        str: timeago library locale code (e.g., 'en', 'zh_CN', 'pt_PT')
-    """
-    locale_map = {
-        'zh': 'zh_CN',      # Chinese Simplified
-        '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
-    }
-    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'},
-    'de': {'flag': 'fi fi-de fis', 'name': 'Deutsch'},
-    'fr': {'flag': 'fi fi-fr fis', 'name': 'Français'},
-    'ko': {'flag': 'fi fi-kr fis', 'name': '한국어'},
-    'cs': {'flag': 'fi fi-cz fis', 'name': 'Čeština'},
-    'es': {'flag': 'fi fi-es fis', 'name': 'Español'},
-    'pt': {'flag': 'fi fi-pt fis', 'name': 'Português'},
-    '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': '繁體中文'},
-    'ru': {'flag': 'fi fi-ru fis', 'name': 'Русский'},
-    'pl': {'flag': 'fi fi-pl fis', 'name': 'Polski'},
-    'nl': {'flag': 'fi fi-nl fis', 'name': 'Nederlands'},
-    'sv': {'flag': 'fi fi-se fis', 'name': 'Svenska'},
-    'da': {'flag': 'fi fi-dk fis', 'name': 'Dansk'},
-    'no': {'flag': 'fi fi-no fis', 'name': 'Norsk'},
-    'fi': {'flag': 'fi fi-fi fis', 'name': 'Suomi'},
-    'tr': {'flag': 'fi fi-tr fis', 'name': 'Türkçe'},
-    'ar': {'flag': 'fi fi-sa fis', 'name': 'العربية'},
-    'hi': {'flag': 'fi fi-in fis', 'name': 'हिन्दी'},
-}
-
-
-def get_available_languages():
-    """
-    Discover available languages by scanning the translations directory
-    Returns a dict of available languages with their metadata
-    """
-    translations_dir = Path(__file__).parent / 'translations'
-
-    # Always include English as base language
-    available = {
-        'en': LANGUAGE_DATA['en']
-    }
-
-    # Scan for translation directories
-    if translations_dir.exists():
-        for lang_dir in translations_dir.iterdir():
-            if lang_dir.is_dir() and lang_dir.name in LANGUAGE_DATA:
-                # Check if messages.po exists
-                po_file = lang_dir / 'LC_MESSAGES' / 'messages.po'
-                if po_file.exists():
-                    available[lang_dir.name] = LANGUAGE_DATA[lang_dir.name]
-
-    return available
-
-
-def get_language_codes():
-    """Get list of available language codes"""
-    return list(get_available_languages().keys())
-
-
-def get_flag_for_locale(locale):
-    """Get flag emoji for a locale, or globe if unknown"""
-    return LANGUAGE_DATA.get(locale, {}).get('flag', '🌐')
-
-
-def get_name_for_locale(locale):
-    """Get native name for a locale"""
-    return LANGUAGE_DATA.get(locale, {}).get('name', locale.upper())

changedetectionio/model/App.py

@@ -46,7 +46,6 @@ class model(dict):
                     'global_subtractive_selectors': [],
                     'ignore_whitespace': True,
                     'ignore_status_codes': False, #@todo implement, as ternary.
-                    'ssim_threshold': '0.96',  # Default SSIM threshold for screenshot comparison
                     'notification_body': default_notification_body,
                     'notification_format': default_notification_format,
                     'notification_title': default_notification_title,

changedetectionio/model/Watch.py

@@ -13,137 +13,6 @@ from .. import jinja2_custom as safe_jinja
 from ..diff import ADDED_PLACEMARKER_OPEN
 from ..html_tools import TRANSLATE_WHITESPACE_TABLE
 
-
-def _brotli_compress_worker(conn, filepath, mode=None):
-    """
-    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.
-
-    Args:
-        contents: data to compress (str or bytes)
-        filepath: destination file path
-        mode: brotli compression mode (e.g., brotli.MODE_TEXT)
-        timeout: subprocess timeout in seconds
-        fallback_uncompressed: if True, save uncompressed on failure; if False, raise exception
-
-    Returns:
-        str: actual filepath saved (may differ from input if fallback used)
-
-    Raises:
-        Exception: if compression fails and fallback_uncompressed is False
-    """
-    import brotli
-    import multiprocessing
-    import sys
-
-    # Ensure contents are bytes
-    if isinstance(contents, str):
-        contents = contents.encode('utf-8')
-
-    # Use explicit spawn context for thread safety (avoids fork() with multi-threaded parent)
-    # Always use spawn - consistent behavior in tests and production
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
-
-    # Run compression in subprocess using spawn (not fork)
-    proc = ctx.Process(target=_brotli_compress_worker, args=(child_conn, filepath, mode))
-
-    # Windows-safe: Set daemon=False explicitly to avoid issues with process cleanup
-    proc.daemon = False
-    proc.start()
-
-    try:
-        # Send data to subprocess via pipe (avoids pickle)
-        parent_conn.send(contents)
-
-        # Wait for result with timeout
-        if parent_conn.poll(timeout):
-            success = parent_conn.recv()
-        else:
-            success = False
-            logger.warning(f"Brotli compression subprocess timed out after {timeout}s")
-            # Graceful termination with platform-aware cleanup
-            try:
-                proc.terminate()
-            except Exception as term_error:
-                logger.debug(f"Process termination issue (may be normal on Windows): {term_error}")
-
-        parent_conn.close()
-        proc.join(timeout=5)
-
-        # Force kill if still alive after graceful termination
-        if proc.is_alive():
-            try:
-                if sys.platform == 'win32':
-                    # Windows: use kill() which is more forceful
-                    proc.kill()
-                else:
-                    # Unix: terminate() already sent SIGTERM, now try SIGKILL
-                    proc.kill()
-                proc.join(timeout=2)
-            except Exception as kill_error:
-                logger.warning(f"Failed to kill brotli compression process: {kill_error}")
-
-        # Check if file was created successfully
-        if success and os.path.exists(filepath):
-            return filepath
-
-    except Exception as e:
-        logger.error(f"Brotli compression error: {e}")
-        try:
-            parent_conn.close()
-        except:
-            pass
-        try:
-            proc.terminate()
-            proc.join(timeout=2)
-        except:
-            pass
-
-    # Compression failed
-    if fallback_uncompressed:
-        logger.warning(f"Brotli compression failed for {filepath}, saving uncompressed")
-        fallback_path = filepath.replace('.br', '')
-        with open(fallback_path, 'wb') as f:
-            f.write(contents)
-        return fallback_path
-    else:
-        raise Exception(f"Brotli compression subprocess failed for {filepath}")
-
 FAVICON_RESAVE_THRESHOLD_SECONDS=86400
 
 
@@ -224,29 +93,11 @@ class model(watch_base):
         domain = parsed.hostname
         return domain
 
-    @property
-    def history_index_filename(self):
-        # So that you dont try to view different histories in different 'diff' setups, can confuse cdio.
-        processor = self.get('processor')
-        if not processor or self.get('processor') == 'text_json_diff':
-            return 'history.txt'
-        else:
-            return f'history-{processor}.txt'
-
     def clear_watch(self):
         import pathlib
 
-        # Get list of processor config files to preserve
-        from changedetectionio.processors import find_processors
-        processor_names = [name for cls, name in find_processors()]
-        processor_config_files = {f"{name}.json" for name in processor_names}
-
         # JSON Data, Screenshots, Textfiles (history index and snapshots), HTML in the future etc
-        # But preserve processor config files (they're configuration, not history data)
         for item in pathlib.Path(str(self.watch_data_dir)).rglob("*.*"):
-            # Skip processor config files
-            if item.name in processor_config_files:
-                continue
             os.unlink(item)
 
         # Force the attr to recalculate
@@ -334,7 +185,7 @@ class model(watch_base):
             return []
 
         # Read the history file as a dict
-        fname = os.path.join(self.watch_data_dir, self.history_index_filename)
+        fname = os.path.join(self.watch_data_dir, "history.txt")
         if os.path.isfile(fname):
             logger.debug(f"Reading watch history index for {self.get('uuid')}")
             with open(fname, "r", encoding='utf-8') as f:
@@ -344,15 +195,12 @@ class model(watch_base):
 
                         # The index history could contain a relative path, so we need to make the fullpath
                         # so that python can read it
-                        # Cross-platform: check for any path separator (works on Windows and Unix)
-                        if os.sep not in v and '/' not in v and '\\' not in v:
-                            # Relative filename only, no path separators
+                        if not '/' in v and not '\'' in v:
                             v = os.path.join(self.watch_data_dir, v)
                         else:
                             # It's possible that they moved the datadir on older versions
                             # So the snapshot exists but is in a different path
-                            # Cross-platform: use os.path.basename instead of split('/')
-                            snapshot_fname = os.path.basename(v)
+                            snapshot_fname = v.split('/')[-1]
                             proposed_new_path = os.path.join(self.watch_data_dir, snapshot_fname)
                             if not os.path.exists(v) and os.path.exists(proposed_new_path):
                                 v = proposed_new_path
@@ -370,7 +218,7 @@ class model(watch_base):
 
     @property
     def has_history(self):
-        fname = os.path.join(self.watch_data_dir, self.history_index_filename)
+        fname = os.path.join(self.watch_data_dir, "history.txt")
         return os.path.isfile(fname)
 
     @property
@@ -440,109 +288,61 @@ class model(watch_base):
         if not filepath:
             filepath = self.history[timestamp]
 
-        # Check if binary file (image, PDF, etc.)
-        # Binary files are NEVER saved with .br compression, only text files are
-        binary_extensions = ('.png', '.jpg', '.jpeg', '.gif', '.webp', '.pdf', '.bin', '.jfif')
-        is_binary = any(filepath.endswith(ext) for ext in binary_extensions)
+        # See if a brotli versions exists and switch to that
+        if not filepath.endswith('.br') and os.path.isfile(f"{filepath}.br"):
+            filepath = f"{filepath}.br"
 
-        # Only look for .br versions for text files
-        if not is_binary:
-            # See if a brotli version exists and switch to that (text files only)
-            if not filepath.endswith('.br') and os.path.isfile(f"{filepath}.br"):
-                filepath = f"{filepath}.br"
+        # OR in the backup case that the .br does not exist, but the plain one does
+        if filepath.endswith('.br') and not os.path.isfile(filepath):
+            if os.path.isfile(filepath.replace('.br', '')):
+                filepath = filepath.replace('.br', '')
 
-            # OR in the backup case that the .br does not exist, but the plain one does
-            if filepath.endswith('.br') and not os.path.isfile(filepath):
-                if os.path.isfile(filepath.replace('.br', '')):
-                    filepath = filepath.replace('.br', '')
-
-        # Handle .br compressed text files
         if filepath.endswith('.br'):
             # Brotli doesnt have a fileheader to detect it, so we rely on filename
             # https://www.rfc-editor.org/rfc/rfc7932
-            # Note: .br should ONLY exist for text files, never binary
             with open(filepath, 'rb') as f:
-                return brotli.decompress(f.read()).decode('utf-8')
+                return(brotli.decompress(f.read()).decode('utf-8'))
 
-        # Binary file - return raw bytes
-        if is_binary:
-            with open(filepath, 'rb') as f:
-                return f.read()
-
-        # Text file - decode to string
         with open(filepath, 'r', encoding='utf-8', errors='ignore') as f:
             return f.read()
 
-    def _write_atomic(self, dest, data):
-        """Write data atomically to dest using a temp file"""
-        if not os.path.exists(dest):
-            import tempfile
-            with tempfile.NamedTemporaryFile('wb', delete=False, dir=self.watch_data_dir) as tmp:
-                tmp.write(data)
-                tmp.flush()
-                os.fsync(tmp.fileno())
-                tmp_path = tmp.name
-            os.replace(tmp_path, dest)
-
-    # Save some text file to the appropriate path and bump the history
+   # Save some text file to the appropriate path and bump the history
     # result_obj from fetch_site_status.run()
-    def save_history_blob(self, contents, timestamp, snapshot_id):
-
-        logger.trace(f"{self.get('uuid')} - Updating {self.history_index_filename} with timestamp {timestamp}")
+    def save_history_text(self, contents, timestamp, snapshot_id):
+        import brotli
+        import tempfile
+        logger.trace(f"{self.get('uuid')} - Updating history.txt with timestamp {timestamp}")
 
         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
-        if isinstance(contents, bytes):
-            try:
-                import puremagic
-                detections = puremagic.magic_string(contents[:2048])
-                ext = detections[0].extension if detections else 'bin'
-                # Strip leading dot if present (puremagic returns extensions like '.jfif')
-                ext = ext.lstrip('.')
-                if detections:
-                    logger.trace(f"Detected file type: {detections[0].mime_type} -> extension: {ext}")
-            except Exception as e:
-                logger.warning(f"puremagic detection failed: {e}, using 'bin' extension")
-                ext = 'bin'
-
-            snapshot_fname = f"{snapshot_id}.{ext}"
-            dest = os.path.join(self.watch_data_dir, snapshot_fname)
-            self._write_atomic(dest, contents)
-            logger.trace(f"Saved binary snapshot as {snapshot_fname} ({len(contents)} bytes)")
-
-        # Text data - use brotli compression if enabled and above threshold
+        # Decide on snapshot filename and destination path
+        if not skip_brotli and len(contents) > threshold:
+            snapshot_fname = f"{snapshot_id}.txt.br"
+            encoded_data = brotli.compress(contents.encode('utf-8'), mode=brotli.MODE_TEXT)
         else:
-            if not skip_brotli and len(contents) > threshold:
-                # Compressed text
-                import brotli
-                snapshot_fname = f"{snapshot_id}.txt.br"
-                dest = os.path.join(self.watch_data_dir, snapshot_fname)
+            snapshot_fname = f"{snapshot_id}.txt"
+            encoded_data = contents.encode('utf-8')
 
-                if not os.path.exists(dest):
-                    try:
-                        actual_dest = _brotli_subprocess_save(contents, dest, mode=brotli.MODE_TEXT, fallback_uncompressed=True)
-                        if actual_dest != dest:
-                            snapshot_fname = os.path.basename(actual_dest)
-                    except Exception as e:
-                        logger.error(f"{self.get('uuid')} - Brotli compression failed: {e}")
-                        # Fallback to uncompressed
-                        snapshot_fname = f"{snapshot_id}.txt"
-                        dest = os.path.join(self.watch_data_dir, snapshot_fname)
-                        self._write_atomic(dest, contents.encode('utf-8'))
-            else:
-                # Plain text
-                snapshot_fname = f"{snapshot_id}.txt"
-                dest = os.path.join(self.watch_data_dir, snapshot_fname)
-                self._write_atomic(dest, contents.encode('utf-8'))
+        dest = os.path.join(self.watch_data_dir, snapshot_fname)
+
+        # Write snapshot file atomically if it doesn't exist
+        if not os.path.exists(dest):
+            with tempfile.NamedTemporaryFile('wb', delete=False, dir=self.watch_data_dir) as tmp:
+                tmp.write(encoded_data)
+                tmp.flush()
+                os.fsync(tmp.fileno())
+                tmp_path = tmp.name
+            os.rename(tmp_path, dest)
 
         # Append to history.txt atomically
-        index_fname = os.path.join(self.watch_data_dir, self.history_index_filename)
+        index_fname = os.path.join(self.watch_data_dir, "history.txt")
         index_line = f"{timestamp},{snapshot_fname}\n"
 
+        # Lets try force flush here since it's usually a very small file
+        # If this still fails in the future then try reading all to memory first, re-writing etc
         with open(index_fname, 'a', encoding='utf-8') as f:
             f.write(index_line)
             f.flush()
@@ -950,13 +750,25 @@ 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)
+        with open(filepath, 'wb') as f:
+            f.write(brotli.compress(contents, mode=brotli.MODE_TEXT))
 
     def save_last_fetched_html(self, timestamp, contents):
+        import brotli
+
         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)
+
+        with open(filepath, 'wb') as f:
+            contents = contents.encode('utf-8') if isinstance(contents, str) else contents
+            try:
+                f.write(brotli.compress(contents))
+            except Exception as e:
+                logger.warning(f"{self.get('uuid')} - Unable to compress snapshot, saving as raw data to {filepath}")
+                logger.warning(e)
+                f.write(contents)
+
         self._prune_last_fetched_html_snapshots()
 
     def get_fetched_html(self, timestamp):
@@ -1014,7 +826,6 @@ class model(watch_base):
         # has app+request context, we can use url_for()
         if has_app_context:
             if last_error:
-                last_error = safe_jinja.render_fully_escaped(last_error)
                 if '403' in last_error:
                     if has_proxies:
                         output.append(str(Markup(f"{last_error} - <a href=\"{url_for('settings.settings_page', uuid=self.get('uuid'))}\">Try other proxies/location</a>&nbsp;'")))
@@ -1024,9 +835,7 @@ class model(watch_base):
                     output.append(str(Markup(last_error)))
 
             if self.get('last_notification_error'):
-                txt = safe_jinja.render_fully_escaped(self.get('last_notification_error'))
-                result = f'<div class="notification-error"><a href="{url_for("settings.notification_logs")}">{txt}</a></div>'
-                output.append(result)
+                output.append(str(Markup(f"<div class=\"notification-error\"><a href=\"{url_for('settings.notification_logs')}\">{ self.get('last_notification_error') }</a></div>")))
 
         else:
             # Lo_Fi version - no app context, cant rely on Jinja2 Markup

changedetectionio/notification/handler.py

@@ -1,6 +1,5 @@
 
 import time
-import re
 import apprise
 from apprise import NotifyFormat
 from loguru import logger
@@ -12,10 +11,11 @@ from ..diff import HTML_REMOVED_STYLE, REMOVED_PLACEMARKER_OPEN, REMOVED_PLACEMA
     CHANGED_PLACEMARKER_CLOSED, HTML_CHANGED_STYLE, HTML_CHANGED_INTO_STYLE
 import re
 
-from ..notification_service import NotificationContextData, add_rendered_diff_to_notification_vars
+from ..notification_service import NotificationContextData
 
 newline_re = re.compile(r'\r\n|\r|\n')
 
+
 def markup_text_links_to_html(body):
     """
     Convert plaintext to HTML with clickable links.
@@ -79,24 +79,6 @@ def notification_format_align_with_apprise(n_format : str):
 
     return n_format
 
-
-def apply_html_color_to_body(n_body: str):
-    # https://github.com/dgtlmoon/changedetection.io/issues/821#issuecomment-1241837050
-    n_body = n_body.replace(REMOVED_PLACEMARKER_OPEN,
-                            f'<span style="{HTML_REMOVED_STYLE}" role="deletion" aria-label="Removed text" title="Removed text">')
-    n_body = n_body.replace(REMOVED_PLACEMARKER_CLOSED, f'</span>')
-    n_body = n_body.replace(ADDED_PLACEMARKER_OPEN,
-                            f'<span style="{HTML_ADDED_STYLE}" role="insertion" aria-label="Added text" title="Added text">')
-    n_body = n_body.replace(ADDED_PLACEMARKER_CLOSED, f'</span>')
-    # Handle changed/replaced lines (old → new)
-    n_body = n_body.replace(CHANGED_PLACEMARKER_OPEN,
-                            f'<span style="{HTML_CHANGED_STYLE}" role="note" aria-label="Changed text" title="Changed text">')
-    n_body = n_body.replace(CHANGED_PLACEMARKER_CLOSED, f'</span>')
-    n_body = n_body.replace(CHANGED_INTO_PLACEMARKER_OPEN,
-                            f'<span style="{HTML_CHANGED_INTO_STYLE}" role="note" aria-label="Changed into" title="Changed into">')
-    n_body = n_body.replace(CHANGED_INTO_PLACEMARKER_CLOSED, f'</span>')
-    return n_body
-
 def apply_discord_markdown_to_body(n_body):
     """
     Discord does not support <del> but it supports non-standard ~~strikethrough~~
@@ -351,16 +333,6 @@ def process_notification(n_object: NotificationContextData, datastore):
     if not n_object.get('notification_urls'):
         return None
 
-    n_object.update(add_rendered_diff_to_notification_vars(
-        notification_scan_text=n_object.get('notification_body', '')+n_object.get('notification_title', ''),
-        current_snapshot=n_object.get('current_snapshot'),
-        prev_snapshot=n_object.get('prev_snapshot'),
-        # Should always be false for 'text' mode or its too hard to read
-        # But otherwise, this could be some setting
-        word_diff=False if requested_output_format_original == 'text' else True,
-        )
-    )
-
     with (apprise.LogCapture(level=apprise.logging.DEBUG) as logs):
         for url in n_object['notification_urls']:
 

changedetectionio/notification_service.py

@@ -115,6 +115,7 @@ class NotificationContextData(dict):
 
         super().__setitem__(key, value)
 
+
 def timestamp_to_localtime(timestamp):
     # Format the date using locale-aware formatting with timezone
     dt = datetime.datetime.fromtimestamp(int(timestamp))
@@ -133,70 +134,21 @@ def timestamp_to_localtime(timestamp):
 
     return formatted_date
 
-def add_rendered_diff_to_notification_vars(notification_scan_text:str, prev_snapshot:str, current_snapshot:str, word_diff:bool):
-    """
-    Efficiently renders only the diff placeholders that are actually used in the notification text.
-
-    Scans the notification template for diff placeholder usage (diff, diff_added, diff_clean, etc.)
-    and only renders those specific variants, avoiding expensive render_diff() calls for unused placeholders.
-    Uses LRU caching to avoid duplicate renders when multiple placeholders share the same arguments.
-
-    Args:
-        notification_scan_text: The notification template text to scan for placeholders
-        prev_snapshot: Previous version of content for diff comparison
-        current_snapshot: Current version of content for diff comparison
-        word_diff: Whether to use word-level (True) or line-level (False) diffing
-
-    Returns:
-        dict: Only the diff placeholders that were found in notification_scan_text, with rendered content
-    """
-    from changedetectionio import diff
-    import re
-    from functools import lru_cache
-
+def set_basic_notification_vars(snapshot_contents, current_snapshot, prev_snapshot, watch, triggered_text, timestamp_changed=None):
     now = time.time()
-
-    # Define specifications for each diff variant
-    diff_specs = {
-        'diff': {'word_diff': word_diff},
-        'diff_clean': {'word_diff': word_diff, 'include_change_type_prefix': False},
-        'diff_added': {'word_diff': word_diff, 'include_removed': False},
-        'diff_added_clean': {'word_diff': word_diff, 'include_removed': False, 'include_change_type_prefix': False},
-        'diff_full': {'word_diff': word_diff, 'include_equal': True},
-        'diff_full_clean': {'word_diff': word_diff, 'include_equal': True, 'include_change_type_prefix': False},
-        'diff_patch': {'word_diff': word_diff, 'patch_format': True},
-        'diff_removed': {'word_diff': word_diff, 'include_added': False},
-        'diff_removed_clean': {'word_diff': word_diff, 'include_added': False, 'include_change_type_prefix': False},
-    }
-
-    # Memoize render_diff to avoid duplicate renders with same kwargs
-    @lru_cache(maxsize=4)
-    def cached_render(kwargs_tuple):
-        return diff.render_diff(prev_snapshot, current_snapshot, **dict(kwargs_tuple))
-
-    ret = {}
-    rendered_count = 0
-    # Only check and render diff keys that exist in NotificationContextData
-    for key in NotificationContextData().keys():
-        if key.startswith('diff') and key in diff_specs:
-            # Check if this placeholder is actually used in the notification text
-            pattern = rf"(?<![A-Za-z0-9_]){re.escape(key)}(?![A-Za-z0-9_])"
-            if re.search(pattern, notification_scan_text, re.IGNORECASE):
-                kwargs = diff_specs[key]
-                # Convert dict to sorted tuple for cache key (handles duplicate kwarg combinations)
-                ret[key] = cached_render(tuple(sorted(kwargs.items())))
-                rendered_count += 1
-
-    if rendered_count:
-        logger.trace(f"Rendered {rendered_count} diff placeholder(s) {sorted(ret.keys())} in {time.time() - now:.3f}s")
-
-    return ret
-
-def set_basic_notification_vars(current_snapshot, prev_snapshot, watch, triggered_text, timestamp_changed=None):
+    from changedetectionio import diff
 
     n_object = {
-        'current_snapshot': current_snapshot,
-        'prev_snapshot': prev_snapshot,
+        'current_snapshot': snapshot_contents,
+        'diff': diff.render_diff(prev_snapshot, current_snapshot),
+        'diff_clean': diff.render_diff(prev_snapshot, current_snapshot, include_change_type_prefix=False),
+        'diff_added': diff.render_diff(prev_snapshot, current_snapshot, include_removed=False),
+        'diff_added_clean': diff.render_diff(prev_snapshot, current_snapshot, include_removed=False, include_change_type_prefix=False),
+        'diff_full': diff.render_diff(prev_snapshot, current_snapshot, include_equal=True),
+        'diff_full_clean': diff.render_diff(prev_snapshot, current_snapshot, include_equal=True, include_change_type_prefix=False),
+        'diff_patch': diff.render_diff(prev_snapshot, current_snapshot, patch_format=True),
+        'diff_removed': diff.render_diff(prev_snapshot, current_snapshot, include_added=False),
+        'diff_removed_clean': diff.render_diff(prev_snapshot, current_snapshot, include_added=False, include_change_type_prefix=False),
         'screenshot': watch.get_screenshot() if watch and watch.get('notification_screenshot') else None,
         'change_datetime': timestamp_to_localtime(timestamp_changed) if timestamp_changed else None,
         'triggered_text': triggered_text,
@@ -211,6 +163,7 @@ def set_basic_notification_vars(current_snapshot, prev_snapshot, watch, triggere
     if watch:
         n_object.update(watch.extra_notification_token_values())
 
+    logger.trace(f"Main rendered notification placeholders (diff_added etc) calculated in {time.time() - now:.3f}s")
     return n_object
 
 class NotificationService:
@@ -267,7 +220,8 @@ class NotificationService:
             current_snapshot = watch.get_history_snapshot(timestamp=dates[date_index_to])
 
 
-        n_object.update(set_basic_notification_vars(current_snapshot=current_snapshot,
+        n_object.update(set_basic_notification_vars(snapshot_contents=snapshot_contents,
+                                                    current_snapshot=current_snapshot,
                                                     prev_snapshot=prev_snapshot,
                                                     watch=watch,
                                                     triggered_text=triggered_text,

changedetectionio/pluggy_interface.py

@@ -2,7 +2,6 @@ import pluggy
 import os
 import importlib
 import sys
-from loguru import logger
 
 # Global plugin namespace for changedetection.io
 PLUGIN_NAMESPACE = "changedetectionio"
@@ -17,94 +16,15 @@ class ChangeDetectionSpec:
     @hookspec
     def ui_edit_stats_extras(watch):
         """Return HTML content to add to the stats tab in the edit view.
-
+        
         Args:
             watch: The watch object being edited
-
+            
         Returns:
             str: HTML content to be inserted in the stats tab
         """
         pass
 
-    @hookspec
-    def register_content_fetcher(self):
-        """Return a tuple of (fetcher_name, fetcher_class) for content fetcher plugins.
-
-        The fetcher_name should start with 'html_' and the fetcher_class
-        should inherit from changedetectionio.content_fetchers.base.Fetcher
-
-        Returns:
-            tuple: (str: fetcher_name, class: fetcher_class)
-        """
-        pass
-
-    @hookspec
-    def fetcher_status_icon(fetcher_name):
-        """Return status icon HTML attributes for a content fetcher.
-
-        Args:
-            fetcher_name: The name of the fetcher (e.g., 'html_webdriver', 'html_js_zyte')
-
-        Returns:
-            str: HTML string containing <img> tags or other status icon elements
-                 Empty string if no custom status icon is needed
-        """
-        pass
-
-    @hookspec
-    def plugin_static_path(self):
-        """Return the path to the plugin's static files directory.
-
-        Returns:
-            str: Absolute path to the plugin's static directory, or None if no static files
-        """
-        pass
-
-    @hookspec
-    def get_itemprop_availability_override(self, content, fetcher_name, fetcher_instance, url):
-        """Provide custom implementation of get_itemprop_availability for a specific fetcher.
-
-        This hook allows plugins to provide their own product availability detection
-        when their fetcher is being used. This is called as a fallback when the built-in
-        method doesn't find good data.
-
-        Args:
-            content: The HTML/text content to parse
-            fetcher_name: The name of the fetcher being used (e.g., 'html_js_zyte')
-            fetcher_instance: The fetcher instance that generated the content
-            url: The URL being watched/checked
-
-        Returns:
-            dict or None: Dictionary with availability data:
-                {
-                    'price': float or None,
-                    'availability': str or None,  # e.g., 'in stock', 'out of stock'
-                    'currency': str or None,      # e.g., 'USD', 'EUR'
-                }
-                Or None if this plugin doesn't handle this fetcher or couldn't extract data
-        """
-        pass
-
-    @hookspec
-    def plugin_settings_tab(self):
-        """Return settings tab information for this plugin.
-
-        This hook allows plugins to add their own settings tab to the settings page.
-        Settings will be saved to a separate JSON file in the datastore directory.
-
-        Returns:
-            dict or None: Dictionary with settings tab information:
-                {
-                    'plugin_id': str,           # Unique identifier (e.g., 'zyte_fetcher')
-                    'tab_label': str,           # Display name for tab (e.g., 'Zyte Fetcher')
-                    'form_class': Form,         # WTForms Form class for the settings
-                    'template_path': str,       # Optional: path to Jinja2 template (relative to plugin)
-                                                # If not provided, a default form renderer will be used
-                }
-                Or None if this plugin doesn't provide settings
-        """
-        pass
-
 
 # Set up Plugin Manager
 plugin_manager = pluggy.PluginManager(PLUGIN_NAMESPACE)
@@ -145,334 +65,18 @@ load_plugins_from_directories()
 # Discover installed plugins from external packages (if any)
 plugin_manager.load_setuptools_entrypoints(PLUGIN_NAMESPACE)
 
-# Function to inject datastore into plugins that need it
-def inject_datastore_into_plugins(datastore):
-    """Inject the global datastore into plugins that need access to settings.
-
-    This should be called after plugins are loaded and datastore is initialized.
-
-    Args:
-        datastore: The global ChangeDetectionStore instance
-    """
-    for plugin_name, plugin_obj in plugin_manager.list_name_plugin():
-        # Check if plugin has datastore attribute and it's not set
-        if hasattr(plugin_obj, 'datastore'):
-            if plugin_obj.datastore is None:
-                plugin_obj.datastore = datastore
-                logger.debug(f"Injected datastore into plugin: {plugin_name}")
-
-# Function to register built-in fetchers - called later from content_fetchers/__init__.py
-def register_builtin_fetchers():
-    """Register built-in content fetchers as internal plugins
-
-    This is called from content_fetchers/__init__.py after all fetchers are imported
-    to avoid circular import issues.
-    """
-    from changedetectionio.content_fetchers import requests, playwright, puppeteer, webdriver_selenium
-
-    # Register each built-in fetcher plugin
-    if hasattr(requests, 'requests_plugin'):
-        plugin_manager.register(requests.requests_plugin, 'builtin_requests')
-
-    if hasattr(playwright, 'playwright_plugin'):
-        plugin_manager.register(playwright.playwright_plugin, 'builtin_playwright')
-
-    if hasattr(puppeteer, 'puppeteer_plugin'):
-        plugin_manager.register(puppeteer.puppeteer_plugin, 'builtin_puppeteer')
-
-    if hasattr(webdriver_selenium, 'webdriver_selenium_plugin'):
-        plugin_manager.register(webdriver_selenium.webdriver_selenium_plugin, 'builtin_webdriver_selenium')
-
 # Helper function to collect UI stats extras from all plugins
 def collect_ui_edit_stats_extras(watch):
     """Collect and combine HTML content from all plugins that implement ui_edit_stats_extras"""
     extras_content = []
-
+    
     # Get all plugins that implement the ui_edit_stats_extras hook
     results = plugin_manager.hook.ui_edit_stats_extras(watch=watch)
-
+    
     # If we have results, add them to our content
     if results:
         for result in results:
             if result:  # Skip empty results
                 extras_content.append(result)
-
-    return "\n".join(extras_content) if extras_content else ""
-
-def collect_fetcher_status_icons(fetcher_name):
-    """Collect status icon data from all plugins
-
-    Args:
-        fetcher_name: The name of the fetcher (e.g., 'html_webdriver', 'html_js_zyte')
-
-    Returns:
-        dict or None: Icon data dictionary from first matching plugin, or None
-    """
-    # Get status icon data from plugins
-    results = plugin_manager.hook.fetcher_status_icon(fetcher_name=fetcher_name)
-
-    # Return first non-None result
-    if results:
-        for result in results:
-            if result and isinstance(result, dict):
-                return result
-
-    return None
-
-def get_itemprop_availability_from_plugin(content, fetcher_name, fetcher_instance, url):
-    """Get itemprop availability data from plugins as a fallback.
-
-    This is called when the built-in get_itemprop_availability doesn't find good data.
-
-    Args:
-        content: The HTML/text content to parse
-        fetcher_name: The name of the fetcher being used (e.g., 'html_js_zyte')
-        fetcher_instance: The fetcher instance that generated the content
-        url: The URL being watched (watch.link - includes Jinja2 evaluation)
-
-    Returns:
-        dict or None: Availability data dictionary from first matching plugin, or None
-    """
-    # Get availability data from plugins
-    results = plugin_manager.hook.get_itemprop_availability_override(
-        content=content,
-        fetcher_name=fetcher_name,
-        fetcher_instance=fetcher_instance,
-        url=url
-    )
-
-    # Return first non-None result with actual data
-    if results:
-        for result in results:
-            if result and isinstance(result, dict):
-                # Check if the result has any meaningful data
-                if result.get('price') is not None or result.get('availability'):
-                    return result
-
-    return None
-
-
-def get_active_plugins():
-    """Get a list of active plugins with their descriptions.
-
-    Returns:
-        list: List of dictionaries with plugin information:
-            [
-                {'name': 'plugin_name', 'description': 'Plugin description'},
-                ...
-            ]
-    """
-    active_plugins = []
-
-    # Get all registered plugins
-    for plugin_name, plugin_obj in plugin_manager.list_name_plugin():
-        # Skip built-in plugins (they start with 'builtin_')
-        if plugin_name.startswith('builtin_'):
-            continue
-
-        # Get plugin description if available
-        description = None
-        if hasattr(plugin_obj, '__doc__') and plugin_obj.__doc__:
-            description = plugin_obj.__doc__.strip().split('\n')[0]  # First line only
-        elif hasattr(plugin_obj, 'description'):
-            description = plugin_obj.description
-
-        # Try to get a friendly name from the plugin
-        friendly_name = plugin_name
-        if hasattr(plugin_obj, 'name'):
-            friendly_name = plugin_obj.name
-
-        active_plugins.append({
-            'name': friendly_name,
-            'description': description or 'No description available'
-        })
-
-    return active_plugins
-
-
-def get_fetcher_capabilities(watch, datastore):
-    """Get capability flags for a watch's fetcher.
-
-    Args:
-        watch: The watch object/dict
-        datastore: The datastore to resolve 'system' fetcher
-
-    Returns:
-        dict: Dictionary with capability flags:
-            {
-                'supports_browser_steps': bool,
-                'supports_screenshots': bool,
-                'supports_xpath_element_data': bool
-            }
-    """
-    # Get the fetcher name from watch
-    fetcher_name = watch.get('fetch_backend', 'system')
-
-    # Resolve 'system' to actual fetcher
-    if fetcher_name == 'system':
-        fetcher_name = datastore.data['settings']['application'].get('fetch_backend', 'html_requests')
-
-    # Get the fetcher class
-    from changedetectionio import content_fetchers
-
-    # Try to get from built-in fetchers first
-    if hasattr(content_fetchers, fetcher_name):
-        fetcher_class = getattr(content_fetchers, fetcher_name)
-        return {
-            'supports_browser_steps': getattr(fetcher_class, 'supports_browser_steps', False),
-            'supports_screenshots': getattr(fetcher_class, 'supports_screenshots', False),
-            'supports_xpath_element_data': getattr(fetcher_class, 'supports_xpath_element_data', False)
-        }
-
-    # Try to get from plugin-provided fetchers
-    # Query all plugins for registered fetchers
-    plugin_fetchers = plugin_manager.hook.register_content_fetcher()
-    for fetcher_registration in plugin_fetchers:
-        if fetcher_registration:
-            name, fetcher_class = fetcher_registration
-            if name == fetcher_name:
-                return {
-                    'supports_browser_steps': getattr(fetcher_class, 'supports_browser_steps', False),
-                    'supports_screenshots': getattr(fetcher_class, 'supports_screenshots', False),
-                    'supports_xpath_element_data': getattr(fetcher_class, 'supports_xpath_element_data', False)
-                }
-
-    # Default: no capabilities
-    return {
-        'supports_browser_steps': False,
-        'supports_screenshots': False,
-        'supports_xpath_element_data': False
-    }
-
-
-def get_plugin_settings_tabs():
-    """Get all plugin settings tabs.
-
-    Returns:
-        list: List of dictionaries with plugin settings tab information:
-            [
-                {
-                    'plugin_id': str,
-                    'tab_label': str,
-                    'form_class': Form,
-                    'description': str
-                },
-                ...
-            ]
-    """
-    tabs = []
-    results = plugin_manager.hook.plugin_settings_tab()
-
-    for result in results:
-        if result and isinstance(result, dict):
-            # Validate required fields
-            if 'plugin_id' in result and 'tab_label' in result and 'form_class' in result:
-                tabs.append(result)
-            else:
-                logger.warning(f"Invalid plugin settings tab spec: {result}")
-
-    return tabs
-
-
-def load_plugin_settings(datastore_path, plugin_id):
-    """Load settings for a specific plugin from JSON file.
-
-    Args:
-        datastore_path: Path to the datastore directory
-        plugin_id: Unique identifier for the plugin (e.g., 'zyte_fetcher')
-
-    Returns:
-        dict: Plugin settings, or empty dict if file doesn't exist
-    """
-    import json
-    settings_file = os.path.join(datastore_path, f"{plugin_id}.json")
-
-    if not os.path.exists(settings_file):
-        return {}
-
-    try:
-        with open(settings_file, 'r', encoding='utf-8') as f:
-            return json.load(f)
-    except Exception as e:
-        logger.error(f"Failed to load settings for plugin '{plugin_id}': {e}")
-        return {}
-
-
-def save_plugin_settings(datastore_path, plugin_id, settings):
-    """Save settings for a specific plugin to JSON file.
-
-    Args:
-        datastore_path: Path to the datastore directory
-        plugin_id: Unique identifier for the plugin (e.g., 'zyte_fetcher')
-        settings: Dictionary of settings to save
-
-    Returns:
-        bool: True if save was successful, False otherwise
-    """
-    import json
-    settings_file = os.path.join(datastore_path, f"{plugin_id}.json")
-
-    try:
-        with open(settings_file, 'w', encoding='utf-8') as f:
-            json.dump(settings, f, indent=2, ensure_ascii=False)
-        logger.info(f"Saved settings for plugin '{plugin_id}' to {settings_file}")
-        return True
-    except Exception as e:
-        logger.error(f"Failed to save settings for plugin '{plugin_id}': {e}")
-        return False
-
-
-def get_plugin_template_paths():
-    """Get list of plugin template directories for Jinja2 loader.
-
-    Scans both external pluggy plugins and built-in processor plugins.
-
-    Returns:
-        list: List of absolute paths to plugin template directories
-    """
-    template_paths = []
-
-    # Add the base processors/templates directory (as absolute path)
-    processors_templates_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'processors', 'templates')
-    if os.path.isdir(processors_templates_dir):
-        template_paths.append(processors_templates_dir)
-        logger.debug(f"Added base processors template path: {processors_templates_dir}")
-
-    # Scan built-in processor plugins
-    from changedetectionio.processors import find_processors
-    processor_list = find_processors()
-    for processor_module, processor_name in processor_list:
-        # Each processor is a module, check if it has a templates directory
-        if hasattr(processor_module, '__file__'):
-            processor_file = processor_module.__file__
-            if processor_file:
-                # Get the processor directory (e.g., processors/image_ssim_diff/)
-                processor_dir = os.path.dirname(os.path.abspath(processor_file))
-                templates_dir = os.path.join(processor_dir, 'templates')
-                if os.path.isdir(templates_dir):
-                    template_paths.append(templates_dir)
-                    logger.debug(f"Added processor template path: {templates_dir}")
-
-    # Get all registered external pluggy plugins
-    for plugin_name, plugin_obj in plugin_manager.list_name_plugin():
-        # Check if plugin has a templates directory
-        if hasattr(plugin_obj, '__file__'):
-            plugin_file = plugin_obj.__file__
-        elif hasattr(plugin_obj, '__module__'):
-            # Get the module file
-            module = sys.modules.get(plugin_obj.__module__)
-            if module and hasattr(module, '__file__'):
-                plugin_file = module.__file__
-            else:
-                continue
-        else:
-            continue
-
-        if plugin_file:
-            plugin_dir = os.path.dirname(os.path.abspath(plugin_file))
-            templates_dir = os.path.join(plugin_dir, 'templates')
-            if os.path.isdir(templates_dir):
-                template_paths.append(templates_dir)
-                logger.debug(f"Added plugin template path: {templates_dir}")
-
-    return template_paths
+            
+    return "\n".join(extras_content) if extras_content else ""

changedetectionio/processors/__init__.py

@@ -1,10 +1,180 @@
-from functools import lru_cache
+from abc import abstractmethod
+from changedetectionio.content_fetchers.base import Fetcher
+from changedetectionio.strtobool import strtobool
+from copy import deepcopy
 from loguru import logger
-from flask_babel import gettext
+import hashlib
 import importlib
 import inspect
 import os
 import pkgutil
+import re
+
+class difference_detection_processor():
+
+    browser_steps = None
+    datastore = None
+    fetcher = None
+    screenshot = None
+    watch = None
+    xpath_data = None
+    preferred_proxy = None
+
+    def __init__(self, *args, datastore, watch_uuid, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.datastore = datastore
+        self.watch = deepcopy(self.datastore.data['watching'].get(watch_uuid))
+        # Generic fetcher that should be extended (requests, playwright etc)
+        self.fetcher = Fetcher()
+
+    async def call_browser(self, preferred_proxy_id=None):
+
+        from requests.structures import CaseInsensitiveDict
+
+        url = self.watch.link
+
+        # Protect against file:, file:/, file:// access, check the real "link" without any meta "source:" etc prepended.
+        if re.search(r'^file:', url.strip(), re.IGNORECASE):
+            if not strtobool(os.getenv('ALLOW_FILE_URI', 'false')):
+                raise Exception(
+                    "file:// type access is denied for security reasons."
+                )
+
+        # Requests, playwright, other browser via wss:// etc, fetch_extra_something
+        prefer_fetch_backend = self.watch.get('fetch_backend', 'system')
+
+        # Proxy ID "key"
+        preferred_proxy_id = preferred_proxy_id if preferred_proxy_id else self.datastore.get_preferred_proxy_for_watch(uuid=self.watch.get('uuid'))
+
+        # Pluggable content self.fetcher
+        if not prefer_fetch_backend or prefer_fetch_backend == 'system':
+            prefer_fetch_backend = self.datastore.data['settings']['application'].get('fetch_backend')
+
+        # In the case that the preferred fetcher was a browser config with custom connection URL..
+        # @todo - on save watch, if its extra_browser_ then it should be obvious it will use playwright (like if its requests now..)
+        custom_browser_connection_url = None
+        if prefer_fetch_backend.startswith('extra_browser_'):
+            (t, key) = prefer_fetch_backend.split('extra_browser_')
+            connection = list(
+                filter(lambda s: (s['browser_name'] == key), self.datastore.data['settings']['requests'].get('extra_browsers', [])))
+            if connection:
+                prefer_fetch_backend = 'html_webdriver'
+                custom_browser_connection_url = connection[0].get('browser_connection_url')
+
+        # PDF should be html_requests because playwright will serve it up (so far) in a embedded page
+        # @todo https://github.com/dgtlmoon/changedetection.io/issues/2019
+        # @todo needs test to or a fix
+        if self.watch.is_pdf:
+           prefer_fetch_backend = "html_requests"
+
+        # Grab the right kind of 'fetcher', (playwright, requests, etc)
+        from changedetectionio import content_fetchers
+        if hasattr(content_fetchers, prefer_fetch_backend):
+            # @todo TEMPORARY HACK - SWITCH BACK TO PLAYWRIGHT FOR BROWSERSTEPS
+            if prefer_fetch_backend == 'html_webdriver' and self.watch.has_browser_steps:
+                # This is never supported in selenium anyway
+                logger.warning("Using playwright fetcher override for possible puppeteer request in browsersteps, because puppetteer:browser steps is incomplete.")
+                from changedetectionio.content_fetchers.playwright import fetcher as playwright_fetcher
+                fetcher_obj = playwright_fetcher
+            else:
+                fetcher_obj = getattr(content_fetchers, prefer_fetch_backend)
+        else:
+            # What it referenced doesnt exist, Just use a default
+            fetcher_obj = getattr(content_fetchers, "html_requests")
+
+        proxy_url = None
+        if preferred_proxy_id:
+            # Custom browser endpoints should NOT have a proxy added
+            if not prefer_fetch_backend.startswith('extra_browser_'):
+                proxy_url = self.datastore.proxy_list.get(preferred_proxy_id).get('url')
+                logger.debug(f"Selected proxy key '{preferred_proxy_id}' as proxy URL '{proxy_url}' for {url}")
+            else:
+                logger.debug("Skipping adding proxy data when custom Browser endpoint is specified. ")
+
+        logger.debug(f"Using proxy '{proxy_url}' for {self.watch['uuid']}")
+
+        # Now call the fetcher (playwright/requests/etc) with arguments that only a fetcher would need.
+        # When browser_connection_url is None, it method should default to working out whats the best defaults (os env vars etc)
+        self.fetcher = fetcher_obj(proxy_override=proxy_url,
+                                   custom_browser_connection_url=custom_browser_connection_url
+                                   )
+
+        if self.watch.has_browser_steps:
+            self.fetcher.browser_steps = self.watch.get('browser_steps', [])
+            self.fetcher.browser_steps_screenshot_path = os.path.join(self.datastore.datastore_path, self.watch.get('uuid'))
+
+        # Tweak the base config with the per-watch ones
+        from changedetectionio.jinja2_custom import render as jinja_render
+        request_headers = CaseInsensitiveDict()
+
+        ua = self.datastore.data['settings']['requests'].get('default_ua')
+        if ua and ua.get(prefer_fetch_backend):
+            request_headers.update({'User-Agent': ua.get(prefer_fetch_backend)})
+
+        request_headers.update(self.watch.get('headers', {}))
+        request_headers.update(self.datastore.get_all_base_headers())
+        request_headers.update(self.datastore.get_all_headers_in_textfile_for_watch(uuid=self.watch.get('uuid')))
+
+        # https://github.com/psf/requests/issues/4525
+        # Requests doesnt yet support brotli encoding, so don't put 'br' here, be totally sure that the user cannot
+        # do this by accident.
+        if 'Accept-Encoding' in request_headers and "br" in request_headers['Accept-Encoding']:
+            request_headers['Accept-Encoding'] = request_headers['Accept-Encoding'].replace(', br', '')
+
+        for header_name in request_headers:
+            request_headers.update({header_name: jinja_render(template_str=request_headers.get(header_name))})
+
+        timeout = self.datastore.data['settings']['requests'].get('timeout')
+
+        request_body = self.watch.get('body')
+        if request_body:
+            request_body = jinja_render(template_str=self.watch.get('body'))
+        
+        request_method = self.watch.get('method')
+        ignore_status_codes = self.watch.get('ignore_status_codes', False)
+
+        # Configurable per-watch or global extra delay before extracting text (for webDriver types)
+        system_webdriver_delay = self.datastore.data['settings']['application'].get('webdriver_delay', None)
+        if self.watch.get('webdriver_delay'):
+            self.fetcher.render_extract_delay = self.watch.get('webdriver_delay')
+        elif system_webdriver_delay is not None:
+            self.fetcher.render_extract_delay = system_webdriver_delay
+
+        if self.watch.get('webdriver_js_execute_code') is not None and self.watch.get('webdriver_js_execute_code').strip():
+            self.fetcher.webdriver_js_execute_code = self.watch.get('webdriver_js_execute_code')
+
+        # Requests for PDF's, images etc should be passwd the is_binary flag
+        is_binary = self.watch.is_pdf
+
+        # And here we go! call the right browser with browser-specific settings
+        empty_pages_are_a_change = self.datastore.data['settings']['application'].get('empty_pages_are_a_change', False)
+        # All fetchers are now async
+        await self.fetcher.run(
+            current_include_filters=self.watch.get('include_filters'),
+            empty_pages_are_a_change=empty_pages_are_a_change,
+            fetch_favicon=self.watch.favicon_is_expired(),
+            ignore_status_codes=ignore_status_codes,
+            is_binary=is_binary,
+            request_body=request_body,
+            request_headers=request_headers,
+            request_method=request_method,
+            timeout=timeout,
+            url=url,
+       )
+
+        #@todo .quit here could go on close object, so we can run JS if change-detected
+        self.fetcher.quit(watch=self.watch)
+
+        # After init, call run_changedetection() which will do the actual change-detection
+
+    @abstractmethod
+    def run_changedetection(self, watch):
+        update_obj = {'last_notification_error': False, 'last_error': False}
+        some_data = 'xxxxx'
+        update_obj["previous_md5"] = hashlib.md5(some_data.encode('utf-8')).hexdigest()
+        changed_detected = False
+        return changed_detected, update_obj, ''.encode('utf-8')
+
 
 def find_sub_packages(package_name):
     """
@@ -28,7 +198,6 @@ def find_processors():
 
     processors = []
     sub_packages = find_sub_packages(package_name)
-    from changedetectionio.processors.base import difference_detection_processor
 
     for sub_package in sub_packages:
         module_name = f"{package_name}.{sub_package}.processor"
@@ -37,12 +206,8 @@ def find_processors():
 
             # Iterate through all classes in the module
             for name, obj in inspect.getmembers(module, inspect.isclass):
-                # Only register classes that are actually defined in this module (not imported)
-                if (issubclass(obj, difference_detection_processor) and
-                    obj is not difference_detection_processor and
-                    obj.__module__ == module.__name__):
+                if issubclass(obj, difference_detection_processor) and obj is not difference_detection_processor:
                     processors.append((module, sub_package))
-                    break  # Only need one processor per module
         except (ModuleNotFoundError, ImportError) as e:
             logger.warning(f"Failed to import module {module_name}: {e} (find_processors())")
 
@@ -77,205 +242,17 @@ def get_custom_watch_obj_for_processor(processor_name):
     return watch_class
 
 
-def find_processor_module(processor_name):
-    """
-    Find the processor module by name.
-
-    Args:
-        processor_name: Processor machine name (e.g., 'image_ssim_diff')
-
-    Returns:
-        module: The processor's parent module, or None if not found
-    """
-    processor_classes = find_processors()
-    processor_tuple = next((tpl for tpl in processor_classes if tpl[1] == processor_name), None)
-
-    if processor_tuple:
-        # Return the parent module (the package containing processor.py)
-        return get_parent_module(processor_tuple[0])
-
-    return None
-
-
 def available_processors():
     """
-    Get a list of processors by name and description for the UI elements.
-    Can be filtered via ALLOWED_PROCESSORS environment variable (comma-separated list).
+    Get a list of processors by name and description for the UI elements
     :return: A list :)
     """
 
     processor_classes = find_processors()
 
-    # Check if ALLOWED_PROCESSORS env var is set
-    # For now we disable it, need to make a deploy with lots of new code and this will be an overload
-    allowed_processors_env = os.getenv('ALLOWED_PROCESSORS', 'text_json_diff, restock_diff').strip()
-    allowed_processors = None
-    if allowed_processors_env:
-        # Parse comma-separated list and strip whitespace
-        allowed_processors = [p.strip() for p in allowed_processors_env.split(',') if p.strip()]
-        logger.info(f"ALLOWED_PROCESSORS set, filtering to: {allowed_processors}")
-
     available = []
-    for module, sub_package_name in processor_classes:
-        # Filter by allowed processors if set
-        if allowed_processors and sub_package_name not in allowed_processors:
-            logger.debug(f"Skipping processor '{sub_package_name}' (not in ALLOWED_PROCESSORS)")
-            continue
+    for package, processor_class in processor_classes:
+        available.append((processor_class, package.name))
 
-        # Try to get the 'name' attribute from the processor module first
-        if hasattr(module, 'name'):
-            description = gettext(module.name)
-        else:
-            # Fall back to processor_description from parent module's __init__.py
-            parent_module = get_parent_module(module)
-            if parent_module and hasattr(parent_module, 'processor_description'):
-                description = gettext(parent_module.processor_description)
-            else:
-                # Final fallback to a readable name
-                description = sub_package_name.replace('_', ' ').title()
-
-        # Get weight for sorting (lower weight = higher in list)
-        weight = 0  # Default weight for processors without explicit weight
-
-        # Check processor module itself first
-        if hasattr(module, 'processor_weight'):
-            weight = module.processor_weight
-        else:
-            # Fall back to parent module (package __init__.py)
-            parent_module = get_parent_module(module)
-            if parent_module and hasattr(parent_module, 'processor_weight'):
-                weight = parent_module.processor_weight
-
-        available.append((sub_package_name, description, weight))
-
-    # Sort by weight (lower weight = appears first)
-    available.sort(key=lambda x: x[2])
-
-    # Return as tuples without weight (for backwards compatibility)
-    return [(name, desc) for name, desc, weight in available]
-
-
-def get_processor_badge_texts():
-    """
-    Get a dictionary mapping processor names to their list_badge_text values.
-    Translations are applied based on the current request locale.
-
-    :return: A dict mapping processor name to badge text (e.g., {'text_json_diff': 'Text', 'restock_diff': 'Restock'})
-    """
-    processor_classes = find_processors()
-    badge_texts = {}
-
-    for module, sub_package_name in processor_classes:
-        # Try to get the 'list_badge_text' attribute from the processor module
-        if hasattr(module, 'list_badge_text'):
-            badge_texts[sub_package_name] = gettext(module.list_badge_text)
-        else:
-            # Fall back to parent module's __init__.py
-            parent_module = get_parent_module(module)
-            if parent_module and hasattr(parent_module, 'list_badge_text'):
-                badge_texts[sub_package_name] = gettext(parent_module.list_badge_text)
-
-    return badge_texts
-
-
-def get_processor_descriptions():
-    """
-    Get a dictionary mapping processor names to their description/name values.
-    Translations are applied based on the current request locale.
-
-    :return: A dict mapping processor name to description (e.g., {'text_json_diff': 'Webpage Text/HTML, JSON and PDF changes'})
-    """
-    processor_classes = find_processors()
-    descriptions = {}
-
-    for module, sub_package_name in processor_classes:
-        # Try to get the 'name' or 'description' attribute from the processor module first
-        if hasattr(module, 'name'):
-            descriptions[sub_package_name] = gettext(module.name)
-        elif hasattr(module, 'description'):
-            descriptions[sub_package_name] = gettext(module.description)
-        else:
-            # Fall back to parent module's __init__.py
-            parent_module = get_parent_module(module)
-            if parent_module and hasattr(parent_module, 'processor_description'):
-                descriptions[sub_package_name] = gettext(parent_module.processor_description)
-            elif parent_module and hasattr(parent_module, 'name'):
-                descriptions[sub_package_name] = gettext(parent_module.name)
-            else:
-                # Final fallback to a readable name
-                descriptions[sub_package_name] = sub_package_name.replace('_', ' ').title()
-
-    return descriptions
-
-
-def generate_processor_badge_colors(processor_name):
-    """
-    Generate consistent colors for a processor badge based on its name.
-    Uses a hash of the processor name to generate pleasing, accessible colors
-    for both light and dark modes.
-
-    :param processor_name: The processor name (e.g., 'text_json_diff')
-    :return: A dict with 'light' and 'dark' color schemes, each containing 'bg' and 'color'
-    """
-    import hashlib
-
-    # Generate a consistent hash from the processor name
-    hash_obj = hashlib.md5(processor_name.encode('utf-8'))
-    hash_int = int(hash_obj.hexdigest()[:8], 16)
-
-    # Generate hue from hash (0-360)
-    hue = hash_int % 360
-
-    # Light mode: pastel background with darker text
-    light_saturation = 60 + (hash_int % 25)  # 60-85%
-    light_lightness = 85 + (hash_int % 10)   # 85-95% - very light
-    text_lightness = 25 + (hash_int % 15)    # 25-40% - dark
-
-    # Dark mode: solid, vibrant colors with white text
-    dark_saturation = 55 + (hash_int % 20)   # 55-75%
-    dark_lightness = 45 + (hash_int % 15)    # 45-60%
-
-    return {
-        'light': {
-            'bg': f'hsl({hue}, {light_saturation}%, {light_lightness}%)',
-            'color': f'hsl({hue}, 50%, {text_lightness}%)'
-        },
-        'dark': {
-            'bg': f'hsl({hue}, {dark_saturation}%, {dark_lightness}%)',
-            'color': '#fff'
-        }
-    }
-
-
-@lru_cache(maxsize=1)
-def get_processor_badge_css():
-    """
-    Generate CSS for all processor badges with auto-generated colors.
-    This creates CSS rules for both light and dark modes for each processor.
-
-    :return: A string containing CSS rules for all processor badges
-    """
-    processor_classes = find_processors()
-    css_rules = []
-
-    for module, sub_package_name in processor_classes:
-        colors = generate_processor_badge_colors(sub_package_name)
-
-        # Light mode rule
-        css_rules.append(
-            f".processor-badge-{sub_package_name} {{\n"
-            f"  background-color: {colors['light']['bg']};\n"
-            f"  color: {colors['light']['color']};\n"
-            f"}}"
-        )
-
-        # Dark mode rule
-        css_rules.append(
-            f"html[data-darkmode=\"true\"] .processor-badge-{sub_package_name} {{\n"
-            f"  background-color: {colors['dark']['bg']};\n"
-            f"  color: {colors['dark']['color']};\n"
-            f"}}"
-        )
-
-    return '\n\n'.join(css_rules)
+    return available
 

changedetectionio/processors/base.py

@@ -1,259 +0,0 @@
-import re
-import hashlib
-from changedetectionio.content_fetchers.base import Fetcher
-from changedetectionio.strtobool import strtobool
-from copy import deepcopy
-from abc import abstractmethod
-import os
-from loguru import logger
-
-SCREENSHOT_FORMAT_JPEG = 'JPEG'
-SCREENSHOT_FORMAT_PNG = 'PNG'
-
-class difference_detection_processor():
-    browser_steps = None
-    datastore = None
-    fetcher = None
-    screenshot = None
-    watch = None
-    xpath_data = None
-    preferred_proxy = None
-    screenshot_format = SCREENSHOT_FORMAT_JPEG
-
-    def __init__(self, datastore, watch_uuid):
-        self.datastore = datastore
-        self.watch_uuid = watch_uuid
-        self.watch = deepcopy(self.datastore.data['watching'].get(watch_uuid))
-        # Generic fetcher that should be extended (requests, playwright etc)
-        self.fetcher = Fetcher()
-
-    async def call_browser(self, preferred_proxy_id=None):
-
-        from requests.structures import CaseInsensitiveDict
-
-        url = self.watch.link
-
-        # Protect against file:, file:/, file:// access, check the real "link" without any meta "source:" etc prepended.
-        if re.search(r'^file:', url.strip(), re.IGNORECASE):
-            if not strtobool(os.getenv('ALLOW_FILE_URI', 'false')):
-                raise Exception(
-                    "file:// type access is denied for security reasons."
-                )
-
-        # Requests, playwright, other browser via wss:// etc, fetch_extra_something
-        prefer_fetch_backend = self.watch.get('fetch_backend', 'system')
-
-        # Proxy ID "key"
-        preferred_proxy_id = preferred_proxy_id if preferred_proxy_id else self.datastore.get_preferred_proxy_for_watch(
-            uuid=self.watch.get('uuid'))
-
-        # Pluggable content self.fetcher
-        if not prefer_fetch_backend or prefer_fetch_backend == 'system':
-            prefer_fetch_backend = self.datastore.data['settings']['application'].get('fetch_backend')
-
-        # In the case that the preferred fetcher was a browser config with custom connection URL..
-        # @todo - on save watch, if its extra_browser_ then it should be obvious it will use playwright (like if its requests now..)
-        custom_browser_connection_url = None
-        if prefer_fetch_backend.startswith('extra_browser_'):
-            (t, key) = prefer_fetch_backend.split('extra_browser_')
-            connection = list(
-                filter(lambda s: (s['browser_name'] == key), self.datastore.data['settings']['requests'].get('extra_browsers', [])))
-            if connection:
-                prefer_fetch_backend = 'html_webdriver'
-                custom_browser_connection_url = connection[0].get('browser_connection_url')
-
-        # PDF should be html_requests because playwright will serve it up (so far) in a embedded page
-        # @todo https://github.com/dgtlmoon/changedetection.io/issues/2019
-        # @todo needs test to or a fix
-        if self.watch.is_pdf:
-            prefer_fetch_backend = "html_requests"
-
-        # Grab the right kind of 'fetcher', (playwright, requests, etc)
-        from changedetectionio import content_fetchers
-        if hasattr(content_fetchers, prefer_fetch_backend):
-            # @todo TEMPORARY HACK - SWITCH BACK TO PLAYWRIGHT FOR BROWSERSTEPS
-            if prefer_fetch_backend == 'html_webdriver' and self.watch.has_browser_steps:
-                # This is never supported in selenium anyway
-                logger.warning(
-                    "Using playwright fetcher override for possible puppeteer request in browsersteps, because puppetteer:browser steps is incomplete.")
-                from changedetectionio.content_fetchers.playwright import fetcher as playwright_fetcher
-                fetcher_obj = playwright_fetcher
-            else:
-                fetcher_obj = getattr(content_fetchers, prefer_fetch_backend)
-        else:
-            # What it referenced doesnt exist, Just use a default
-            fetcher_obj = getattr(content_fetchers, "html_requests")
-
-        proxy_url = None
-        if preferred_proxy_id:
-            # Custom browser endpoints should NOT have a proxy added
-            if not prefer_fetch_backend.startswith('extra_browser_'):
-                proxy_url = self.datastore.proxy_list.get(preferred_proxy_id).get('url')
-                logger.debug(f"Selected proxy key '{preferred_proxy_id}' as proxy URL '{proxy_url}' for {url}")
-            else:
-                logger.debug("Skipping adding proxy data when custom Browser endpoint is specified. ")
-
-        logger.debug(f"Using proxy '{proxy_url}' for {self.watch['uuid']}")
-
-        # Now call the fetcher (playwright/requests/etc) with arguments that only a fetcher would need.
-        # When browser_connection_url is None, it method should default to working out whats the best defaults (os env vars etc)
-        self.fetcher = fetcher_obj(proxy_override=proxy_url,
-                                   custom_browser_connection_url=custom_browser_connection_url,
-                                   screenshot_format=self.screenshot_format
-                                   )
-
-        if self.watch.has_browser_steps:
-            self.fetcher.browser_steps = self.watch.get('browser_steps', [])
-            self.fetcher.browser_steps_screenshot_path = os.path.join(self.datastore.datastore_path, self.watch.get('uuid'))
-
-        # Tweak the base config with the per-watch ones
-        from changedetectionio.jinja2_custom import render as jinja_render
-        request_headers = CaseInsensitiveDict()
-
-        ua = self.datastore.data['settings']['requests'].get('default_ua')
-        if ua and ua.get(prefer_fetch_backend):
-            request_headers.update({'User-Agent': ua.get(prefer_fetch_backend)})
-
-        request_headers.update(self.watch.get('headers', {}))
-        request_headers.update(self.datastore.get_all_base_headers())
-        request_headers.update(self.datastore.get_all_headers_in_textfile_for_watch(uuid=self.watch.get('uuid')))
-
-        # https://github.com/psf/requests/issues/4525
-        # Requests doesnt yet support brotli encoding, so don't put 'br' here, be totally sure that the user cannot
-        # do this by accident.
-        if 'Accept-Encoding' in request_headers and "br" in request_headers['Accept-Encoding']:
-            request_headers['Accept-Encoding'] = request_headers['Accept-Encoding'].replace(', br', '')
-
-        for header_name in request_headers:
-            request_headers.update({header_name: jinja_render(template_str=request_headers.get(header_name))})
-
-        timeout = self.datastore.data['settings']['requests'].get('timeout')
-
-        request_body = self.watch.get('body')
-        if request_body:
-            request_body = jinja_render(template_str=self.watch.get('body'))
-
-        request_method = self.watch.get('method')
-        ignore_status_codes = self.watch.get('ignore_status_codes', False)
-
-        # Configurable per-watch or global extra delay before extracting text (for webDriver types)
-        system_webdriver_delay = self.datastore.data['settings']['application'].get('webdriver_delay', None)
-        if self.watch.get('webdriver_delay'):
-            self.fetcher.render_extract_delay = self.watch.get('webdriver_delay')
-        elif system_webdriver_delay is not None:
-            self.fetcher.render_extract_delay = system_webdriver_delay
-
-        if self.watch.get('webdriver_js_execute_code') is not None and self.watch.get('webdriver_js_execute_code').strip():
-            self.fetcher.webdriver_js_execute_code = self.watch.get('webdriver_js_execute_code')
-
-        # Requests for PDF's, images etc should be passwd the is_binary flag
-        is_binary = self.watch.is_pdf
-
-        # And here we go! call the right browser with browser-specific settings
-        empty_pages_are_a_change = self.datastore.data['settings']['application'].get('empty_pages_are_a_change', False)
-        # All fetchers are now async
-        await self.fetcher.run(
-            current_include_filters=self.watch.get('include_filters'),
-            empty_pages_are_a_change=empty_pages_are_a_change,
-            fetch_favicon=self.watch.favicon_is_expired(),
-            ignore_status_codes=ignore_status_codes,
-            is_binary=is_binary,
-            request_body=request_body,
-            request_headers=request_headers,
-            request_method=request_method,
-            screenshot_format=self.screenshot_format,
-            timeout=timeout,
-            url=url,
-            watch_uuid=self.watch_uuid,
-        )
-
-        # @todo .quit here could go on close object, so we can run JS if change-detected
-        await self.fetcher.quit(watch=self.watch)
-
-        # After init, call run_changedetection() which will do the actual change-detection
-
-    def get_extra_watch_config(self, filename):
-        """
-        Read processor-specific JSON config file from watch data directory.
-
-        Args:
-            filename: Name of JSON file (e.g., "visual_ssim_score.json")
-
-        Returns:
-            dict: Parsed JSON data, or empty dict if file doesn't exist
-        """
-        import json
-        import os
-
-        watch = self.datastore.data['watching'].get(self.watch_uuid)
-        watch_data_dir = watch.watch_data_dir
-
-        if not watch_data_dir:
-            return {}
-
-        filepath = os.path.join(watch_data_dir, filename)
-
-        if not os.path.isfile(filepath):
-            return {}
-
-        try:
-            with open(filepath, 'r', encoding='utf-8') as f:
-                return json.load(f)
-        except (json.JSONDecodeError, IOError) as e:
-            logger.warning(f"Failed to read extra watch config {filename}: {e}")
-            return {}
-
-    def update_extra_watch_config(self, filename, data, merge=True):
-        """
-        Write processor-specific JSON config file to watch data directory.
-
-        Args:
-            filename: Name of JSON file (e.g., "visual_ssim_score.json")
-            data: Dictionary to serialize as JSON
-            merge: If True, merge with existing data; if False, overwrite completely
-        """
-        import json
-        import os
-
-        watch = self.datastore.data['watching'].get(self.watch_uuid)
-        watch_data_dir = watch.watch_data_dir
-
-        if not watch_data_dir:
-            logger.warning(f"Cannot save extra watch config {filename}: no watch_data_dir")
-            return
-
-        # Ensure directory exists
-        watch.ensure_data_dir_exists()
-
-        filepath = os.path.join(watch_data_dir, filename)
-
-        try:
-            # If merge is enabled, read existing data first
-            existing_data = {}
-            if merge and os.path.isfile(filepath):
-                try:
-                    with open(filepath, 'r', encoding='utf-8') as f:
-                        existing_data = json.load(f)
-                except (json.JSONDecodeError, IOError) as e:
-                    logger.warning(f"Failed to read existing config for merge: {e}")
-
-            # Merge new data with existing
-            if merge:
-                existing_data.update(data)
-                data_to_save = existing_data
-            else:
-                data_to_save = data
-
-            # Write the data
-            with open(filepath, 'w', encoding='utf-8') as f:
-                json.dump(data_to_save, f, indent=2)
-        except IOError as e:
-            logger.error(f"Failed to write extra watch config {filename}: {e}")
-
-    @abstractmethod
-    def run_changedetection(self, watch):
-        update_obj = {'last_notification_error': False, 'last_error': False}
-        some_data = 'xxxxx'
-        update_obj["previous_md5"] = hashlib.md5(some_data.encode('utf-8')).hexdigest()
-        changed_detected = False
-        return changed_detected, update_obj, ''.encode('utf-8')

changedetectionio/processors/extract.py

@@ -1,131 +0,0 @@
-"""
-Base data extraction module for all processors.
-
-This module handles extracting data from watch history using regex patterns
-and exporting to CSV format. This is the default extractor that all processors
-(text_json_diff, restock_diff, etc.) can use by default or override.
-"""
-
-import os
-from loguru import logger
-
-
-def render_form(watch, datastore, request, url_for, render_template, flash, redirect, extract_form=None):
-    """
-    Render the data extraction form.
-
-    Args:
-        watch: The watch object
-        datastore: The ChangeDetectionStore instance
-        request: Flask request object
-        url_for: Flask url_for function
-        render_template: Flask render_template function
-        flash: Flask flash function
-        redirect: Flask redirect function
-        extract_form: Optional pre-built extract form (for error cases)
-
-    Returns:
-        Rendered HTML response with the extraction form
-    """
-    from changedetectionio import forms
-
-    uuid = watch.get('uuid')
-
-    # Use provided form or create a new one
-    if extract_form is None:
-        extract_form = forms.extractDataForm(
-            formdata=request.form,
-            data={'extract_regex': request.form.get('extract_regex', '')}
-        )
-
-    # Get error information for the template
-    screenshot_url = watch.get_screenshot()
-
-    system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-    is_html_webdriver = False
-    if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
-        is_html_webdriver = True
-
-    password_enabled_and_share_is_off = False
-    if datastore.data['settings']['application'].get('password') or os.getenv("SALTED_PASS", False):
-        password_enabled_and_share_is_off = not datastore.data['settings']['application'].get('shared_diff_access')
-
-    # Use the shared default template from processors/templates/
-    # Processors can override this by creating their own extract.py with custom template logic
-    output = render_template(
-        "extract.html",
-        uuid=uuid,
-        extract_form=extract_form,
-        watch_a=watch,
-        last_error=watch['last_error'],
-        last_error_screenshot=watch.get_error_snapshot(),
-        last_error_text=watch.get_error_text(),
-        screenshot=screenshot_url,
-        is_html_webdriver=is_html_webdriver,
-        password_enabled_and_share_is_off=password_enabled_and_share_is_off,
-        extra_title=f" - {watch.label} - Extract Data",
-        extra_stylesheets=[url_for('static_content', group='styles', filename='diff.css')],
-        pure_menu_fixed=False
-    )
-
-    return output
-
-
-def process_extraction(watch, datastore, request, url_for, make_response, send_from_directory, flash, redirect, extract_form=None):
-    """
-    Process the data extraction request and return CSV file.
-
-    Args:
-        watch: The watch object
-        datastore: The ChangeDetectionStore instance
-        request: Flask request object
-        url_for: Flask url_for function
-        make_response: Flask make_response function
-        send_from_directory: Flask send_from_directory function
-        flash: Flask flash function
-        redirect: Flask redirect function
-        extract_form: Optional pre-built extract form
-
-    Returns:
-        CSV file download response or redirect to form on error
-    """
-    from changedetectionio import forms
-
-    uuid = watch.get('uuid')
-
-    # Use provided form or create a new one
-    if extract_form is None:
-        extract_form = forms.extractDataForm(
-            formdata=request.form,
-            data={'extract_regex': request.form.get('extract_regex', '')}
-        )
-
-    if not extract_form.validate():
-        flash("An error occurred, please see below.", "error")
-        # render_template needs to be imported from Flask for this to work
-        from flask import render_template as flask_render_template
-        return render_form(
-            watch=watch,
-            datastore=datastore,
-            request=request,
-            url_for=url_for,
-            render_template=flask_render_template,
-            flash=flash,
-            redirect=redirect,
-            extract_form=extract_form
-        )
-
-    extract_regex = request.form.get('extract_regex', '').strip()
-    output = watch.extract_regex_from_all_history(extract_regex)
-
-    if output:
-        watch_dir = os.path.join(datastore.datastore_path, uuid)
-        response = make_response(send_from_directory(directory=watch_dir, path=output, as_attachment=True))
-        response.headers['Content-type'] = 'text/csv'
-        response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
-        response.headers['Pragma'] = 'no-cache'
-        response.headers['Expires'] = "0"
-        return response
-
-    flash('No matches found while scanning all of the watch history for that RegEx.', 'error')
-    return redirect(url_for('ui.ui_diff.diff_history_page_extract_GET', uuid=uuid))

changedetectionio/processors/image_ssim_diff/README.md

@@ -1,210 +0,0 @@
-# Fast Screenshot Comparison Processor
-
-Visual/screenshot change detection using ultra-fast image comparison algorithms.
-
-## Overview
-
-This processor uses **OpenCV** by default for screenshot comparison, providing **50-100x faster** performance compared to the previous SSIM implementation while still detecting meaningful visual changes.
-
-## Current Features
-
-- **Ultra-fast OpenCV comparison**: cv2.absdiff with Gaussian blur for noise reduction
-- **MD5 pre-check**: Fast identical image detection before expensive comparison
-- **Configurable sensitivity**: Threshold-based change detection
-- **Three-panel diff view**: Previous | Current | Difference (with red highlights)
-- **Direct image support**: Works with browser screenshots AND direct image URLs
-- **Visual selector support**: Compare specific page regions using CSS/XPath selectors
-- **Download images**: Download any of the three comparison images directly from the diff view
-
-## Performance
-
-- **OpenCV (default)**: 50-100x faster than SSIM
-- **Large screenshots**: Automatic downscaling for diff visualization (configurable via `MAX_DIFF_HEIGHT`/`MAX_DIFF_WIDTH`)
-- **Memory efficient**: Explicit cleanup of large objects for long-running processes
-- **JPEG diff images**: Smaller file sizes, faster rendering
-
-## How It Works
-
-1. **Fetch**: Screenshot captured via browser OR direct image URL fetched
-2. **MD5 Check**: Quick hash comparison - if identical, skip comparison
-3. **Region Selection** (optional): Crop to specific page region if visual selector is configured
-4. **OpenCV Comparison**: Fast pixel-level difference detection with Gaussian blur
-5. **Change Detection**: Percentage of changed pixels above threshold = change detected
-6. **Visualization**: Generate diff image with red-highlighted changed regions
-
-## Architecture
-
-### Default Method: OpenCV
-
-The processor uses OpenCV's `cv2.absdiff()` for ultra-fast pixel-level comparison:
-
-```python
-# Convert to grayscale
-gray_from = cv2.cvtColor(image_from, cv2.COLOR_RGB2GRAY)
-gray_to = cv2.cvtColor(image_to, cv2.COLOR_RGB2GRAY)
-
-# Apply Gaussian blur (reduces noise, controlled by OPENCV_BLUR_SIGMA env var)
-gray_from = cv2.GaussianBlur(gray_from, (0, 0), sigma=0.8)
-gray_to = cv2.GaussianBlur(gray_to, (0, 0), sigma=0.8)
-
-# Calculate absolute difference
-diff = cv2.absdiff(gray_from, gray_to)
-
-# Apply threshold (default: 30)
-_, thresh = cv2.threshold(diff, threshold, 255, cv2.THRESH_BINARY)
-
-# Count changed pixels
-change_percentage = (changed_pixels / total_pixels) * 100
-```
-
-### Optional: Pixelmatch
-
-For users who need better anti-aliasing detection (especially for text-heavy screenshots), **pixelmatch** can be optionally installed:
-
-```bash
-pip install pybind11-pixelmatch>=0.1.3
-```
-
-**Note**: Pixelmatch uses a C++17 implementation via pybind11 and may have build issues on some platforms (particularly Alpine/musl systems with symbolic link security restrictions). The application will automatically fall back to OpenCV if pixelmatch is not available.
-
-To use pixelmatch instead of OpenCV, set the environment variable:
-```bash
-COMPARISON_METHOD=pixelmatch
-```
-
-#### When to use pixelmatch:
-- Screenshots with lots of text and anti-aliasing
-- Need to ignore minor font rendering differences between browser versions
-- 10-20x faster than SSIM (but slower than OpenCV)
-
-#### When to stick with OpenCV (default):
-- General webpage monitoring
-- Maximum performance (50-100x faster than SSIM)
-- Simple pixel-level change detection
-- Avoid build dependencies (Alpine/musl systems)
-
-## Configuration
-
-### Environment Variables
-
-```bash
-# Comparison method (opencv or pixelmatch)
-COMPARISON_METHOD=opencv  # Default
-
-# OpenCV threshold (0-255, lower = more sensitive)
-COMPARISON_THRESHOLD_OPENCV=30  # Default
-
-# Pixelmatch threshold (0-100, mapped to 0-1 scale)
-COMPARISON_THRESHOLD_PIXELMATCH=10  # Default
-
-# Gaussian blur sigma for OpenCV (0 = no blur, higher = more blur)
-OPENCV_BLUR_SIGMA=0.8  # Default
-
-# Minimum change percentage to trigger detection
-OPENCV_MIN_CHANGE_PERCENT=0.1  # Default (0.1%)
-PIXELMATCH_MIN_CHANGE_PERCENT=0.1  # Default
-
-# Diff visualization image size limits (pixels)
-MAX_DIFF_HEIGHT=8000  # Default
-MAX_DIFF_WIDTH=900  # Default
-```
-
-### Per-Watch Configuration
-
-- **Comparison Threshold**: Can be configured per-watch in the edit form
-  - Very low sensitivity (10) - Only major changes
-  - Low sensitivity (20) - Significant changes
-  - Medium sensitivity (30) - Moderate changes (default)
-  - High sensitivity (50) - Small changes
-  - Very high sensitivity (75) - Any visible change
-
-### Visual Selector (Region Comparison)
-
-Use the "Include filters" field with CSS selectors or XPath to compare only specific page regions:
-
-```
-.content-area
-//div[@id='main']
-```
-
-The processor will automatically crop both screenshots to the bounding box of the first matched element.
-
-## Dependencies
-
-### Required
-- `opencv-python-headless>=4.8.0.76` - Fast image comparison
-- `Pillow (PIL)` - Image loading and manipulation
-- `numpy` - Array operations
-
-### Optional
-- `pybind11-pixelmatch>=0.1.3` - Alternative comparison method with anti-aliasing detection
-
-## Change Detection Interpretation
-
-- **0%** = Identical images (or below minimum change threshold)
-- **0.1-1%** = Minor differences (anti-aliasing, slight rendering differences)
-- **1-5%** = Noticeable changes (text updates, small content changes)
-- **5-20%** = Significant changes (layout shifts, content additions)
-- **>20%** = Major differences (page redesign, large content changes)
-
-## Technical Notes
-
-### Memory Management
-```python
-# Explicit cleanup for long-running processes
-img.close()  # Close PIL Images
-buffer.close()  # Close BytesIO buffers
-del large_array  # Mark numpy arrays for GC
-```
-
-### Diff Image Generation
-- Format: JPEG (quality=85, optimized)
-- Highlight: Red overlay (50% blend with original)
-- Auto-downscaling: Large screenshots downscaled for faster rendering
-- Base64 embedded: For direct template rendering
-
-### OpenCV Blur Parameters
-The Gaussian blur reduces sensitivity to:
-- Font rendering differences
-- Anti-aliasing variations
-- JPEG compression artifacts
-- Minor pixel shifts (1-2 pixels)
-
-Increase `OPENCV_BLUR_SIGMA` to make comparison more tolerant of these differences.
-
-## Comparison: OpenCV vs Pixelmatch vs SSIM
-
-| Feature | OpenCV | Pixelmatch | SSIM (old) |
-|---------|--------|------------|------------|
-| **Speed** | 50-100x faster | 10-20x faster | Baseline |
-| **Anti-aliasing** | Via blur | Built-in detection | Built-in |
-| **Text sensitivity** | High | Medium (AA-aware) | Medium |
-| **Dependencies** | opencv-python-headless | pybind11-pixelmatch + C++ compiler | scikit-image |
-| **Alpine/musl support** | ✅ Yes | ⚠️ Build issues | ✅ Yes |
-| **Memory usage** | Low | Low | High |
-| **Best for** | General use, max speed | Text-heavy screenshots | Deprecated |
-
-## Migration from SSIM
-
-If you're upgrading from the old SSIM-based processor:
-
-1. **Thresholds are different**: SSIM used 0-1 scale (higher = more similar), OpenCV uses 0-255 pixel difference (lower = more similar)
-2. **Default threshold**: Start with 30 for OpenCV, adjust based on your needs
-3. **Performance**: Expect dramatically faster comparisons, especially for large screenshots
-4. **Accuracy**: OpenCV is more sensitive to pixel-level changes; increase `OPENCV_BLUR_SIGMA` if you're getting false positives
-
-## Future Enhancements
-
-Potential features for future consideration:
-
-- **Change region detection**: Highlight specific areas that changed with bounding boxes
-- **Perceptual hashing**: Pre-screening filter for even faster checks
-- **Ignore regions**: Exclude specific page areas (ads, timestamps) from comparison
-- **Text extraction**: OCR-based text comparison for semantic changes
-- **Adaptive thresholds**: Different sensitivity for different page regions
-
-## Resources
-
-- [OpenCV Documentation](https://docs.opencv.org/)
-- [pybind11-pixelmatch GitHub](https://github.com/whtsky/pybind11-pixelmatch)
-- [Pixelmatch (original JS library)](https://github.com/mapbox/pixelmatch)

changedetectionio/processors/image_ssim_diff/__init__.py

@@ -1,32 +0,0 @@
-"""
-Visual/screenshot change detection using fast image comparison algorithms.
-
-This processor compares screenshots using OpenCV (cv2.absdiff),
-which is 10-100x faster than SSIM while still detecting meaningful visual changes.
-"""
-
-import os
-from pathlib import Path
-
-processor_description = "Visual/Screenshot change detection (Fast)"
-processor_name = "image_ssim_diff"
-processor_weight = 2  # Lower weight = appears at top, heavier weight = appears lower (bottom)
-
-PROCESSOR_CONFIG_NAME = f"{Path(__file__).parent.name}.json"
-
-# Subprocess timeout settings
-# Maximum time to wait for subprocess operations (seconds)
-POLL_TIMEOUT_ABSOLUTE = int(os.getenv('OPENCV_SUBPROCESS_TIMEOUT', '20'))
-
-# Template tracking filename
-CROPPED_IMAGE_TEMPLATE_FILENAME = 'cropped_image_template.png'
-
-SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS = [
-    ('200', 'Low sensitivity (only major changes)'),
-    ('80', 'Medium sensitivity (moderate changes - recommended)'),
-    ('20', 'High sensitivity (small changes)'),
-    ('0', 'Very high sensitivity (any change)')
-]
-
-SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT=0.999
-OPENCV_BLUR_SIGMA=float(os.getenv("OPENCV_BLUR_SIGMA", "3.0"))

changedetectionio/processors/image_ssim_diff/difference.py

@@ -1,440 +0,0 @@
-"""
-Screenshot diff visualization for fast image comparison processor.
-
-All image operations now use ImageDiffHandler abstraction for clean separation
-of concerns and easy backend swapping (LibVIPS, OpenCV, PIL, etc.).
-"""
-
-import os
-import json
-import time
-from loguru import logger
-
-from changedetectionio.processors.image_ssim_diff import SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT, PROCESSOR_CONFIG_NAME, \
-    OPENCV_BLUR_SIGMA
-
-# All image operations now use OpenCV via isolated_opencv subprocess handler
-# No direct handler imports needed - subprocess isolation handles everything
-
-# Maximum dimensions for diff visualization (can be overridden via environment variable)
-# Large screenshots don't need full resolution for visual inspection
-# Reduced defaults to minimize memory usage - 2000px height is plenty for diff viewing
-MAX_DIFF_HEIGHT = int(os.getenv('MAX_DIFF_HEIGHT', '8000'))
-MAX_DIFF_WIDTH = int(os.getenv('MAX_DIFF_WIDTH', '900'))
-
-
-def get_asset(asset_name, watch, datastore, request):
-    """
-    Get processor-specific binary assets for streaming.
-
-    Uses ImageDiffHandler for all image operations - no more multiprocessing needed
-    as LibVIPS handles threading/memory internally.
-
-    Supported assets:
-    - 'before': The previous/from screenshot
-    - 'after': The current/to screenshot
-    - 'rendered_diff': The generated diff visualization with red highlights
-
-    Args:
-        asset_name: Name of the asset to retrieve ('before', 'after', 'rendered_diff')
-        watch: Watch object
-        datastore: Datastore object
-        request: Flask request (for from_version/to_version query params)
-
-    Returns:
-        tuple: (binary_data, content_type, cache_control_header) or None if not found
-    """
-    # Get version parameters from query string
-    versions = list(watch.history.keys())
-
-    if len(versions) < 2:
-        return None
-
-    from_version = request.args.get('from_version', versions[-2] if len(versions) >= 2 else versions[0])
-    to_version = request.args.get('to_version', versions[-1])
-
-    # Validate versions exist
-    if from_version not in versions:
-        from_version = versions[-2] if len(versions) >= 2 else versions[0]
-    if to_version not in versions:
-        to_version = versions[-1]
-
-    try:
-        if asset_name == 'before':
-            # Return the 'from' screenshot with bounding box if configured
-            img_bytes = watch.get_history_snapshot(timestamp=from_version)
-            img_bytes = _draw_bounding_box_if_configured(img_bytes, watch, datastore)
-            mime_type = _detect_mime_type(img_bytes)
-            return (img_bytes, mime_type, 'public, max-age=3600')
-
-        elif asset_name == 'after':
-            # Return the 'to' screenshot with bounding box if configured
-            img_bytes = watch.get_history_snapshot(timestamp=to_version)
-            img_bytes = _draw_bounding_box_if_configured(img_bytes, watch, datastore)
-            mime_type = _detect_mime_type(img_bytes)
-            return (img_bytes, mime_type, 'public, max-age=3600')
-
-        elif asset_name == 'rendered_diff':
-            # Generate diff in isolated subprocess to prevent memory leaks
-            # Subprocess provides complete memory isolation
-            from .image_handler import isolated_opencv as process_screenshot_handler
-
-            img_bytes_from = watch.get_history_snapshot(timestamp=from_version)
-            img_bytes_to = watch.get_history_snapshot(timestamp=to_version)
-
-            # Get pixel difference threshold sensitivity (per-watch > global)
-            # This controls how different a pixel must be (0-255 scale) to count as "changed"
-            from changedetectionio import processors
-            processor_instance = processors.difference_detection_processor(datastore, watch.get('uuid'))
-            processor_config = processor_instance.get_extra_watch_config(PROCESSOR_CONFIG_NAME)
-
-            pixel_difference_threshold_sensitivity = processor_config.get('pixel_difference_threshold_sensitivity')
-            if not pixel_difference_threshold_sensitivity:
-                pixel_difference_threshold_sensitivity = datastore.data['settings']['application'].get(
-                    'pixel_difference_threshold_sensitivity', SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT)
-            try:
-                pixel_difference_threshold_sensitivity = int(pixel_difference_threshold_sensitivity)
-            except (ValueError, TypeError):
-                logger.warning(
-                    f"Invalid pixel_difference_threshold_sensitivity value '{pixel_difference_threshold_sensitivity}', using default")
-                pixel_difference_threshold_sensitivity = SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT
-
-            logger.debug(f"Pixel difference threshold sensitivity is {pixel_difference_threshold_sensitivity}")
-
-
-            # Generate diff in isolated subprocess (async-safe)
-            import asyncio
-            import threading
-
-            # Async-safe wrapper: runs coroutine in new thread with its own event loop
-            def run_async_in_thread():
-                return asyncio.run(
-                    process_screenshot_handler.generate_diff_isolated(
-                        img_bytes_from,
-                        img_bytes_to,
-                        pixel_difference_threshold=int(pixel_difference_threshold_sensitivity),
-                        blur_sigma=OPENCV_BLUR_SIGMA,
-                        max_width=MAX_DIFF_WIDTH,
-                        max_height=MAX_DIFF_HEIGHT
-                    )
-                )
-
-            # Run in thread to avoid blocking event loop if called from async context
-            result_container = [None]
-            exception_container = [None]
-
-            def thread_target():
-                try:
-                    result_container[0] = run_async_in_thread()
-                except Exception as e:
-                    exception_container[0] = e
-
-            thread = threading.Thread(target=thread_target)
-            thread.start()
-            thread.join(timeout=60)
-
-            if exception_container[0]:
-                raise exception_container[0]
-
-            diff_image_bytes = result_container[0]
-
-            if diff_image_bytes:
-                # Note: Bounding box drawing on diff not yet implemented
-                return (diff_image_bytes, 'image/jpeg', 'public, max-age=300')
-            else:
-                logger.error("Failed to generate diff in subprocess")
-                return None
-
-        else:
-            # Unknown asset
-            return None
-
-    except Exception as e:
-        logger.error(f"Failed to get asset '{asset_name}': {e}")
-        import traceback
-        logger.error(traceback.format_exc())
-        return None
-
-
-def _detect_mime_type(img_bytes):
-    """
-    Detect MIME type using puremagic (same as Watch.py).
-
-    Args:
-        img_bytes: Image bytes
-
-    Returns:
-        str: MIME type (e.g., 'image/png', 'image/jpeg')
-    """
-    try:
-        import puremagic
-        detections = puremagic.magic_string(img_bytes[:2048])
-        if detections:
-            mime_type = detections[0].mime_type
-            logger.trace(f"Detected MIME type: {mime_type}")
-            return mime_type
-        else:
-            logger.trace("No MIME type detected, using 'image/png' fallback")
-            return 'image/png'
-    except Exception as e:
-        logger.warning(f"puremagic detection failed: {e}, using 'image/png' fallback")
-        return 'image/png'
-
-
-def _draw_bounding_box_if_configured(img_bytes, watch, datastore):
-    """
-    Draw blue bounding box on image if configured in processor settings.
-    Uses isolated subprocess to prevent memory leaks from large images.
-
-    Supports two modes:
-    - "Select by element": Use include_filter to find xpath element bbox
-    - "Draw area": Use manually drawn bounding_box from config
-
-    Args:
-        img_bytes: Image bytes (PNG)
-        watch: Watch object
-        datastore: Datastore object
-
-    Returns:
-        Image bytes (possibly with bounding box drawn)
-    """
-    try:
-        # Get processor configuration
-        from changedetectionio import processors
-        processor_instance = processors.difference_detection_processor(datastore, watch.get('uuid'))
-        processor_name = watch.get('processor', 'default')
-        config_filename = f'{processor_name}.json'
-        processor_config = processor_instance.get_extra_watch_config(config_filename)
-
-        if not processor_config:
-            return img_bytes
-
-        selection_mode = processor_config.get('selection_mode', 'draw')
-        x, y, width, height = None, None, None, None
-
-        # Mode 1: Select by element (use include_filter + xpath_data)
-        if selection_mode == 'element':
-            include_filters = watch.get('include_filters', [])
-
-            if include_filters and len(include_filters) > 0:
-                first_filter = include_filters[0].strip()
-
-                # Get xpath_data from watch history
-                history_keys = list(watch.history.keys())
-                if history_keys:
-                    latest_snapshot = watch.get_history_snapshot(timestamp=history_keys[-1])
-                    xpath_data_path = watch.get_xpath_data_filepath(timestamp=history_keys[-1])
-
-                    try:
-                        import gzip
-                        with gzip.open(xpath_data_path, 'rt') as f:
-                            xpath_data = json.load(f)
-
-                        # Find matching element
-                        for element in xpath_data.get('size_pos', []):
-                            if element.get('xpath') == first_filter and element.get('highlight_as_custom_filter'):
-                                x = element.get('left', 0)
-                                y = element.get('top', 0)
-                                width = element.get('width', 0)
-                                height = element.get('height', 0)
-                                logger.debug(f"Found element bbox for filter '{first_filter}': x={x}, y={y}, w={width}, h={height}")
-                                break
-                    except Exception as e:
-                        logger.warning(f"Failed to load xpath_data for element selection: {e}")
-
-        # Mode 2: Draw area (use manually configured bbox)
-        else:
-            bounding_box = processor_config.get('bounding_box')
-            if bounding_box:
-                # Parse bounding box: "x,y,width,height"
-                parts = [int(p.strip()) for p in bounding_box.split(',')]
-                if len(parts) == 4:
-                    x, y, width, height = parts
-                else:
-                    logger.warning(f"Invalid bounding box format: {bounding_box}")
-
-        # If no bbox found, return original image
-        if x is None or y is None or width is None or height is None:
-            return img_bytes
-
-        # Use isolated subprocess to prevent memory leaks from large images
-        from .image_handler import isolated_opencv
-        import asyncio
-        import threading
-
-        # Async-safe wrapper: runs coroutine in new thread with its own event loop
-        # This prevents blocking when called from async context (update worker)
-        def run_async_in_thread():
-            return asyncio.run(
-                isolated_opencv.draw_bounding_box_isolated(
-                    img_bytes, x, y, width, height,
-                    color=(255, 0, 0),  # Blue in BGR format
-                    thickness=3
-                )
-            )
-
-        # Always run in thread to avoid blocking event loop if called from async context
-        result_container = [None]
-        exception_container = [None]
-
-        def thread_target():
-            try:
-                result_container[0] = run_async_in_thread()
-            except Exception as e:
-                exception_container[0] = e
-
-        thread = threading.Thread(target=thread_target)
-        thread.start()
-        thread.join(timeout=15)
-
-        if exception_container[0]:
-            raise exception_container[0]
-
-        result = result_container[0]
-
-        # Return result or original if subprocess failed
-        return result if result else img_bytes
-
-    except Exception as e:
-        logger.warning(f"Failed to draw bounding box: {e}")
-        import traceback
-        logger.debug(traceback.format_exc())
-        return img_bytes
-
-
-def render(watch, datastore, request, url_for, render_template, flash, redirect):
-    """
-    Render the screenshot comparison diff page.
-
-    Uses ImageDiffHandler for all image operations.
-
-    Args:
-        watch: Watch object
-        datastore: Datastore object
-        request: Flask request
-        url_for: Flask url_for function
-        render_template: Flask render_template function
-        flash: Flask flash function
-        redirect: Flask redirect function
-
-    Returns:
-        Rendered template or redirect
-    """
-    # Get version parameters (from_version, to_version)
-    versions = list(watch.history.keys())
-
-    if len(versions) < 2:
-        flash("Not enough history to compare. Need at least 2 snapshots.", "error")
-        return redirect(url_for('watchlist.index'))
-
-    # Default: compare latest two versions
-    from_version = request.args.get('from_version', versions[-2] if len(versions) >= 2 else versions[0])
-    to_version = request.args.get('to_version', versions[-1])
-
-    # Validate versions exist
-    if from_version not in versions:
-        from_version = versions[-2] if len(versions) >= 2 else versions[0]
-    if to_version not in versions:
-        to_version = versions[-1]
-
-    # Get pixel difference threshold sensitivity (per-watch > global > env default)
-    pixel_difference_threshold_sensitivity = watch.get('pixel_difference_threshold_sensitivity')
-    if not pixel_difference_threshold_sensitivity or pixel_difference_threshold_sensitivity == '':
-        pixel_difference_threshold_sensitivity = datastore.data['settings']['application'].get('pixel_difference_threshold_sensitivity', SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT)
-
-    # Convert to appropriate type
-    try:
-        pixel_difference_threshold_sensitivity = float(pixel_difference_threshold_sensitivity)
-    except (ValueError, TypeError):
-        logger.warning(f"Invalid pixel_difference_threshold_sensitivity value '{pixel_difference_threshold_sensitivity}', using default")
-        pixel_difference_threshold_sensitivity = 30.0
-
-    # Get blur sigma
-    blur_sigma = OPENCV_BLUR_SIGMA
-
-    # Load screenshots from history
-    try:
-        img_bytes_from = watch.get_history_snapshot(timestamp=from_version)
-        img_bytes_to = watch.get_history_snapshot(timestamp=to_version)
-
-    except Exception as e:
-        logger.error(f"Failed to load screenshots: {e}")
-        flash(f"Failed to load screenshots: {e}", "error")
-        return redirect(url_for('watchlist.index'))
-
-    # Calculate change percentage using isolated subprocess to prevent memory leaks (async-safe)
-    now = time.time()
-    try:
-        from .image_handler import isolated_opencv as process_screenshot_handler
-        import asyncio
-        import threading
-
-        # Async-safe wrapper: runs coroutine in new thread with its own event loop
-        def run_async_in_thread():
-            return asyncio.run(
-                process_screenshot_handler.calculate_change_percentage_isolated(
-                    img_bytes_from,
-                    img_bytes_to,
-                    pixel_difference_threshold=int(pixel_difference_threshold_sensitivity),
-                    blur_sigma=blur_sigma,
-                    max_width=MAX_DIFF_WIDTH,
-                    max_height=MAX_DIFF_HEIGHT
-                )
-            )
-
-        # Run in thread to avoid blocking event loop if called from async context
-        result_container = [None]
-        exception_container = [None]
-
-        def thread_target():
-            try:
-                result_container[0] = run_async_in_thread()
-            except Exception as e:
-                exception_container[0] = e
-
-        thread = threading.Thread(target=thread_target)
-        thread.start()
-        thread.join(timeout=60)
-
-        if exception_container[0]:
-            raise exception_container[0]
-
-        change_percentage = result_container[0]
-
-        method_display = f"{process_screenshot_handler.IMPLEMENTATION_NAME} (pixel_diff_threshold: {pixel_difference_threshold_sensitivity:.0f})"
-        logger.debug(f"Done change percentage calculation in {time.time() - now:.2f}s")
-
-    except Exception as e:
-        logger.error(f"Failed to calculate change percentage: {e}")
-        import traceback
-        logger.error(traceback.format_exc())
-        flash(f"Failed to calculate diff: {e}", "error")
-        return redirect(url_for('watchlist.index'))
-
-    # Load historical data if available (for charts/visualization)
-    comparison_data = {}
-    comparison_config_path = os.path.join(watch.watch_data_dir, "visual_comparison_data.json")
-    if os.path.isfile(comparison_config_path):
-        try:
-            with open(comparison_config_path, 'r') as f:
-                comparison_data = json.load(f)
-        except Exception as e:
-            logger.warning(f"Failed to load comparison history data: {e}")
-
-    # Render custom template
-    # Template path is namespaced to avoid conflicts with other processors
-    # Images are now served via separate /processor-asset/ endpoints instead of base64
-    return render_template(
-        'image_ssim_diff/diff.html',
-        change_percentage=change_percentage,
-        comparison_data=comparison_data,  # Full history for charts/visualization
-        comparison_method=method_display,
-        current_diff_url=watch['url'],
-        from_version=from_version,
-        percentage_different=change_percentage,
-        threshold=pixel_difference_threshold_sensitivity,
-        to_version=to_version,
-        uuid=watch.get('uuid'),
-        versions=versions,
-        watch=watch,
-    )

changedetectionio/processors/image_ssim_diff/edit_hook.py

@@ -1,151 +0,0 @@
-"""
-Optional hook called when processor settings are saved in edit page.
-
-This hook analyzes the selected region to determine if template matching
-should be enabled for tracking content movement.
-
-Template matching is controlled via ENABLE_TEMPLATE_TRACKING env var (default: False).
-"""
-
-import io
-import os
-from loguru import logger
-from changedetectionio import strtobool
-from . import CROPPED_IMAGE_TEMPLATE_FILENAME
-
-# Template matching controlled via environment variable (default: disabled)
-# Set ENABLE_TEMPLATE_TRACKING=True to enable
-TEMPLATE_MATCHING_ENABLED = strtobool(os.getenv('ENABLE_TEMPLATE_TRACKING', 'False'))
-IMPORT_ERROR = "Template matching disabled (set ENABLE_TEMPLATE_TRACKING=True to enable)"
-
-
-def on_config_save(watch, processor_config, datastore):
-    """
-    Called after processor config is saved in edit page.
-
-    Analyzes the bounding box region to determine if it has enough
-    visual features (texture/edges) to enable template matching for
-    tracking content movement when page layout shifts.
-
-    Args:
-        watch: Watch object
-        processor_config: Dict of processor-specific config
-        datastore: Datastore object
-
-    Returns:
-        dict: Updated processor_config with auto_track_region setting
-    """
-    # Check if template matching is globally enabled via ENV var
-    if not TEMPLATE_MATCHING_ENABLED:
-        logger.debug("Template tracking disabled via ENABLE_TEMPLATE_TRACKING env var")
-        processor_config['auto_track_region'] = False
-        return processor_config
-
-    bounding_box = processor_config.get('bounding_box')
-
-    if not bounding_box:
-        # No bounding box, disable tracking
-        processor_config['auto_track_region'] = False
-        logger.debug("No bounding box set, disabled auto-tracking")
-        return processor_config
-
-    try:
-        # Get the latest screenshot from watch history
-        history_keys = list(watch.history.keys())
-        if len(history_keys) == 0:
-            logger.warning("No screenshot history available yet, cannot analyze for tracking")
-            processor_config['auto_track_region'] = False
-            return processor_config
-
-        # Get latest screenshot
-        latest_timestamp = history_keys[-1]
-        screenshot_bytes = watch.get_history_snapshot(timestamp=latest_timestamp)
-
-        if not screenshot_bytes:
-            logger.warning("Could not load screenshot for analysis")
-            processor_config['auto_track_region'] = False
-            return processor_config
-
-        # Parse bounding box
-        parts = [int(p.strip()) for p in bounding_box.split(',')]
-        if len(parts) != 4:
-            logger.warning("Invalid bounding box format")
-            processor_config['auto_track_region'] = False
-            return processor_config
-
-        x, y, width, height = parts
-
-        # Analyze the region for features/texture
-        has_enough_features = analyze_region_features(screenshot_bytes, x, y, width, height)
-
-        if has_enough_features:
-            logger.info(f"Region has sufficient features for tracking - enabling auto_track_region")
-            processor_config['auto_track_region'] = True
-
-            # Save the template as cropped.jpg in watch data directory
-            save_template_to_file(watch, screenshot_bytes, x, y, width, height)
-
-        else:
-            logger.info(f"Region lacks distinctive features - disabling auto_track_region")
-            processor_config['auto_track_region'] = False
-
-            # Remove old template file if exists
-            template_path = os.path.join(watch.watch_data_dir, CROPPED_IMAGE_TEMPLATE_FILENAME)
-            if os.path.exists(template_path):
-                os.remove(template_path)
-                logger.debug(f"Removed old template file: {template_path}")
-
-        return processor_config
-
-    except Exception as e:
-        logger.error(f"Error analyzing region for tracking: {e}")
-        processor_config['auto_track_region'] = False
-        return processor_config
-
-
-def analyze_region_features(screenshot_bytes, x, y, width, height):
-    """
-    Analyze if a region has enough visual features for template matching.
-
-    Uses OpenCV to detect corners/edges. If the region has distinctive
-    features, template matching can reliably track it when it moves.
-
-    Args:
-        screenshot_bytes: Full screenshot as bytes
-        x, y, width, height: Bounding box coordinates
-
-    Returns:
-        bool: True if region has enough features, False otherwise
-    """
-    # Template matching disabled - would need OpenCV implementation for region analysis
-    if not TEMPLATE_MATCHING_ENABLED:
-        logger.warning(f"Cannot analyze region features: {IMPORT_ERROR}")
-        return False
-
-    # Note: Original implementation used LibVIPS handler to crop region, then OpenCV
-    # for feature detection (goodFeaturesToTrack, Canny edge detection, variance).
-    # If re-implementing, use OpenCV directly for both cropping and analysis.
-    # Feature detection would use: cv2.goodFeaturesToTrack, cv2.Canny, np.var
-    return False
-
-
-def save_template_to_file(watch, screenshot_bytes, x, y, width, height):
-    """
-    Extract the template region and save as cropped_image_template.png in watch data directory.
-
-    This is a convenience wrapper around handler.save_template() that handles
-    watch directory setup and path construction.
-
-    Args:
-        watch: Watch object
-        screenshot_bytes: Full screenshot as bytes
-        x, y, width, height: Bounding box coordinates
-    """
-    # Template matching disabled - would need OpenCV implementation for template saving
-    if not TEMPLATE_MATCHING_ENABLED:
-        logger.warning(f"Cannot save template: {IMPORT_ERROR}")
-        return
-
-    # Note: Original implementation used LibVIPS handler to crop and save region.
-    # If re-implementing, use OpenCV (cv2.imdecode, crop with array slicing, cv2.imwrite).
-    return

changedetectionio/processors/image_ssim_diff/forms.py

@@ -1,120 +0,0 @@
-"""
-Configuration forms for fast screenshot comparison processor.
-"""
-
-from wtforms import SelectField, StringField, validators, ValidationError, IntegerField
-from flask_babel import lazy_gettext as _l
-from changedetectionio.forms import processor_text_json_diff_form
-import re
-
-from changedetectionio.processors.image_ssim_diff import SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS
-
-
-def validate_bounding_box(form, field):
-    """Validate bounding box format: x,y,width,height with integers."""
-    if not field.data:
-        return  # Optional field
-
-    if len(field.data) > 100:
-        raise ValidationError(_l('Bounding box value is too long'))
-
-    # Should be comma-separated integers
-    if not re.match(r'^\d+,\d+,\d+,\d+$', field.data):
-        raise ValidationError(_l('Bounding box must be in format: x,y,width,height (integers only)'))
-
-    # Validate values are reasonable (not negative, not ridiculously large)
-    parts = [int(p) for p in field.data.split(',')]
-    for part in parts:
-        if part < 0:
-            raise ValidationError(_l('Bounding box values must be non-negative'))
-        if part > 10000:  # Reasonable max screen dimension
-            raise ValidationError(_l('Bounding box values are too large'))
-
-
-def validate_selection_mode(form, field):
-    """Validate selection mode value."""
-    if not field.data:
-        return  # Optional field
-
-    if field.data not in ['element', 'draw']:
-        raise ValidationError(_l('Selection mode must be either "element" or "draw"'))
-
-
-class processor_settings_form(processor_text_json_diff_form):
-    """Form for fast image comparison processor settings."""
-
-    processor_config_min_change_percentage = IntegerField(
-        _l('Minimum Change Percentage'),
-        validators=[
-            validators.Optional(),
-            validators.NumberRange(min=1, max=100, message=_l('Must be between 0 and 100'))
-        ],
-        render_kw={"placeholder": "Use global default (0.1)"}
-    )
-
-    processor_config_pixel_difference_threshold_sensitivity = SelectField(
-        _l('Pixel Difference Sensitivity'),
-        choices=[
-                    ('', _l('Use global default'))
-                ] + SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS,
-        validators=[validators.Optional()],
-        default=''
-    )
-
-    # Processor-specific config fields (stored in separate JSON file)
-    processor_config_bounding_box = StringField(
-        _l('Bounding Box'),
-        validators=[
-            validators.Optional(),
-            validators.Length(max=100, message=_l('Bounding box value is too long')),
-            validate_bounding_box
-        ],
-        render_kw={"style": "display: none;", "id": "bounding_box"}
-    )
-
-    processor_config_selection_mode = StringField(
-        _l('Selection Mode'),
-        validators=[
-            validators.Optional(),
-            validators.Length(max=20, message=_l('Selection mode value is too long')),
-            validate_selection_mode
-        ],
-        render_kw={"style": "display: none;", "id": "selection_mode"}
-    )
-
-    def extra_tab_content(self):
-        """Tab label for processor-specific settings."""
-        return _l('Screenshot Comparison')
-
-    def extra_form_content(self):
-        """Render processor-specific form fields.
-        @NOTE: prepend processor_config_* to the field name so it will save into its own datadir/uuid/image_ssim_diff.json and be read at process time
-        """
-        return '''
-        {% from '_helpers.html' import render_field %}
-        <fieldset>
-            <legend>Screenshot Comparison Settings</legend>
-
-            <div class="pure-control-group">
-                {{ render_field(form.processor_config_min_change_percentage) }}
-                <span class="pure-form-message-inline">
-                    <strong>What percentage of pixels must change to trigger a detection?</strong><br>
-                    For example, <strong>0.1%</strong> means if 0.1% or more of the pixels change, it counts as a change.<br>
-                    Lower values = more sensitive (detect smaller changes).<br>
-                    Higher values = less sensitive (only detect larger changes).<br>
-                    Leave blank to use global default (0.1%).
-                </span>
-            </div>
-
-            <div class="pure-control-group">
-                {{ render_field(form.processor_config_pixel_difference_threshold_sensitivity) }}
-                <span class="pure-form-message-inline">
-                    <strong>How different must an individual pixel be to count as "changed"?</strong><br>
-                    <strong>Low sensitivity (75)</strong> = Only count pixels that changed significantly (0-255 scale).<br>
-                    <strong>High sensitivity (20)</strong> = Count pixels with small changes as different.<br>
-                    <strong>Very high (0)</strong> = Any pixel change counts.<br>
-                    Select "Use global default" to inherit the system-wide setting.
-                </span>
-            </div>
-        </fieldset>
-        '''

changedetectionio/processors/image_ssim_diff/image_handler/__init__.py

@@ -1,242 +0,0 @@
-"""
-Abstract base class for image processing operations.
-
-All image operations for the image_ssim_diff processor must be implemented
-through this interface to allow different backends (libvips, OpenCV, PIL, etc.).
-"""
-
-from abc import ABC, abstractmethod
-from typing import Tuple, Optional, Any
-
-
-class ImageDiffHandler(ABC):
-    """
-    Abstract base class for image processing operations.
-
-    Implementations must handle all image operations needed for screenshot
-    comparison including loading, cropping, resizing, diffing, and overlays.
-    """
-
-    @abstractmethod
-    def load_from_bytes(self, img_bytes: bytes) -> Any:
-        """
-        Load image from bytes.
-
-        Args:
-            img_bytes: Image data as bytes (PNG, JPEG, etc.)
-
-        Returns:
-            Handler-specific image object
-        """
-        pass
-
-    @abstractmethod
-    def save_to_bytes(self, img: Any, format: str = 'png', quality: int = 85) -> bytes:
-        """
-        Save image to bytes.
-
-        Args:
-            img: Handler-specific image object
-            format: Output format ('png' or 'jpeg')
-            quality: Quality for JPEG (1-100)
-
-        Returns:
-            Image data as bytes
-        """
-        pass
-
-    @abstractmethod
-    def crop(self, img: Any, left: int, top: int, right: int, bottom: int) -> Any:
-        """
-        Crop image to specified region.
-
-        Args:
-            img: Handler-specific image object
-            left: Left coordinate
-            top: Top coordinate
-            right: Right coordinate
-            bottom: Bottom coordinate
-
-        Returns:
-            Cropped image object
-        """
-        pass
-
-    @abstractmethod
-    def resize(self, img: Any, max_width: int, max_height: int) -> Any:
-        """
-        Resize image maintaining aspect ratio.
-
-        Args:
-            img: Handler-specific image object
-            max_width: Maximum width in pixels
-            max_height: Maximum height in pixels
-
-        Returns:
-            Resized image object
-        """
-        pass
-
-    @abstractmethod
-    def get_dimensions(self, img: Any) -> Tuple[int, int]:
-        """
-        Get image dimensions.
-
-        Args:
-            img: Handler-specific image object
-
-        Returns:
-            Tuple of (width, height)
-        """
-        pass
-
-    @abstractmethod
-    def to_grayscale(self, img: Any) -> Any:
-        """
-        Convert image to grayscale.
-
-        Args:
-            img: Handler-specific image object
-
-        Returns:
-            Grayscale image object
-        """
-        pass
-
-    @abstractmethod
-    def gaussian_blur(self, img: Any, sigma: float) -> Any:
-        """
-        Apply Gaussian blur to image.
-
-        Args:
-            img: Handler-specific image object
-            sigma: Blur sigma value (0 = no blur)
-
-        Returns:
-            Blurred image object
-        """
-        pass
-
-    @abstractmethod
-    def absolute_difference(self, img1: Any, img2: Any) -> Any:
-        """
-        Calculate absolute difference between two images.
-
-        Args:
-            img1: First image (handler-specific object)
-            img2: Second image (handler-specific object)
-
-        Returns:
-            Difference image object
-        """
-        pass
-
-    @abstractmethod
-    def threshold(self, img: Any, threshold_value: int) -> Tuple[float, Any]:
-        """
-        Apply threshold to image and calculate change percentage.
-
-        Args:
-            img: Handler-specific image object (typically grayscale difference)
-            threshold_value: Threshold value (0-255)
-
-        Returns:
-            Tuple of (change_percentage, binary_mask)
-            - change_percentage: Percentage of pixels above threshold (0-100)
-            - binary_mask: Handler-specific binary mask object
-        """
-        pass
-
-    @abstractmethod
-    def apply_red_overlay(self, img: Any, mask: Any) -> bytes:
-        """
-        Apply red overlay to image where mask is True.
-
-        Args:
-            img: Handler-specific image object (color)
-            mask: Handler-specific binary mask object
-
-        Returns:
-            JPEG bytes with red overlay applied
-        """
-        pass
-
-    @abstractmethod
-    def close(self, img: Any) -> None:
-        """
-        Clean up image resources if needed.
-
-        Args:
-            img: Handler-specific image object
-        """
-        pass
-
-    @abstractmethod
-    def find_template(
-        self,
-        img: Any,
-        template_img: Any,
-        original_bbox: Tuple[int, int, int, int],
-        search_tolerance: float = 0.2
-    ) -> Optional[Tuple[int, int, int, int]]:
-        """
-        Find template in image using template matching.
-
-        Args:
-            img: Handler-specific image object to search in
-            template_img: Handler-specific template image object to find
-            original_bbox: Original bounding box (left, top, right, bottom)
-            search_tolerance: How far to search (0.2 = ±20% of region size)
-
-        Returns:
-            New bounding box (left, top, right, bottom) or None if not found
-        """
-        pass
-
-    @abstractmethod
-    def save_template(
-        self,
-        img: Any,
-        bbox: Tuple[int, int, int, int],
-        output_path: str
-    ) -> bool:
-        """
-        Save a cropped region as a template file.
-
-        Args:
-            img: Handler-specific image object
-            bbox: Bounding box to crop (left, top, right, bottom)
-            output_path: Where to save the template PNG
-
-        Returns:
-            True if successful, False otherwise
-        """
-        pass
-
-    @abstractmethod
-    def draw_bounding_box(
-        self,
-        img_bytes: bytes,
-        x: int,
-        y: int,
-        width: int,
-        height: int,
-        color: Tuple[int, int, int] = (255, 0, 0),
-        thickness: int = 3
-    ) -> bytes:
-        """
-        Draw a bounding box rectangle on image.
-
-        Args:
-            img_bytes: Image data as bytes
-            x: Left coordinate
-            y: Top coordinate
-            width: Box width
-            height: Box height
-            color: BGR color tuple (default: blue)
-            thickness: Line thickness in pixels
-
-        Returns:
-            Image bytes with bounding box drawn
-        """
-        pass

changedetectionio/processors/image_ssim_diff/image_handler/isolated_libvips.py

@@ -1,353 +0,0 @@
-"""
-Subprocess-isolated image operations for memory leak prevention.
-
-LibVIPS accumulates C-level memory in long-running processes that cannot be
-reclaimed by Python's GC or libvips cache management. Using subprocess isolation
-ensures complete memory cleanup when the process exits.
-
-This module wraps LibvipsImageDiffHandler operations in multiprocessing for
-complete memory isolation without code duplication.
-
-Research: https://github.com/libvips/pyvips/issues/234
-"""
-
-import multiprocessing
-
-# CRITICAL: Use 'spawn' instead of 'fork' to avoid inheriting parent's
-# LibVIPS threading state which can cause hangs in gaussblur operations
-# https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
-try:
-    multiprocessing.set_start_method('spawn', force=False)
-except RuntimeError:
-    # Already set, ignore
-    pass
-
-
-def _worker_generate_diff(conn, img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height):
-    """
-    Worker: Generate diff visualization using LibvipsImageDiffHandler in isolated subprocess.
-
-    This runs in a separate process for complete memory isolation.
-    Uses print() instead of loguru to avoid forking issues.
-    """
-    try:
-        # Import handler inside worker
-        from .libvips_handler import LibvipsImageDiffHandler
-
-        print(f"[Worker] Initializing handler", flush=True)
-        handler = LibvipsImageDiffHandler()
-
-        # Load images using handler
-        img_from = handler.load_from_bytes(img_bytes_from)
-        img_to = handler.load_from_bytes(img_bytes_to)
-
-        # Ensure same size
-        w1, h1 = handler.get_dimensions(img_from)
-        w2, h2 = handler.get_dimensions(img_to)
-        if (w1, h1) != (w2, h2):
-            img_from = handler.resize(img_from, w2, h2)
-
-        # Downscale for faster diff visualization
-        img_from = handler.resize(img_from, max_width, max_height)
-        img_to = handler.resize(img_to, max_width, max_height)
-
-        # Convert to grayscale
-        gray_from = handler.to_grayscale(img_from)
-        gray_to = handler.to_grayscale(img_to)
-
-        # Optional blur - DISABLED due to LibVIPS threading issues in fork
-        # gray_from = handler.gaussian_blur(gray_from, blur_sigma)
-        # gray_to = handler.gaussian_blur(gray_to, blur_sigma)
-
-        # Calculate difference
-        diff = handler.absolute_difference(gray_from, gray_to)
-
-        # Threshold to get mask
-        _, diff_mask = handler.threshold(diff, int(threshold))
-
-        # Generate diff image with red overlay
-        diff_image_bytes = handler.apply_red_overlay(img_to, diff_mask)
-
-        print(f"[Worker] Generated diff ({len(diff_image_bytes)} bytes)", flush=True)
-        conn.send(diff_image_bytes)
-
-    except Exception as e:
-        print(f"[Worker] Error: {e}", flush=True)
-        import traceback
-        traceback.print_exc()
-        conn.send(None)
-    finally:
-        conn.close()
-
-
-def generate_diff_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height):
-    """
-    Generate diff visualization in isolated subprocess for memory leak prevention.
-
-    Args:
-        img_bytes_from: Previous screenshot bytes
-        img_bytes_to: Current screenshot bytes
-        threshold: Pixel difference threshold
-        blur_sigma: Gaussian blur sigma
-        max_width: Maximum width for diff
-        max_height: Maximum height for diff
-
-    Returns:
-        bytes: JPEG diff image or None on failure
-    """
-    parent_conn, child_conn = multiprocessing.Pipe()
-
-    p = multiprocessing.Process(
-        target=_worker_generate_diff,
-        args=(child_conn, img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height)
-    )
-    p.start()
-
-    result = None
-    try:
-        # Wait for result (30 second timeout)
-        if parent_conn.poll(30):
-            result = parent_conn.recv()
-    except Exception as e:
-        print(f"[Parent] Error receiving result: {e}", flush=True)
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown
-        p.join(timeout=5)
-        if p.is_alive():
-            print("[Parent] Process didn't exit gracefully, terminating", flush=True)
-            p.terminate()
-            p.join(timeout=3)
-
-        # Force kill if still alive
-        if p.is_alive():
-            print("[Parent] Process didn't terminate, killing", flush=True)
-            p.kill()
-            p.join(timeout=1)
-
-    return result
-
-
-def calculate_change_percentage_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma, max_width, max_height):
-    """
-    Calculate change percentage in isolated subprocess using handler.
-
-    Returns:
-        float: Change percentage
-    """
-    parent_conn, child_conn = multiprocessing.Pipe()
-
-    def _worker_calculate(conn):
-        try:
-            # Import handler inside worker
-            from .libvips_handler import LibvipsImageDiffHandler
-
-            handler = LibvipsImageDiffHandler()
-
-            # Load images
-            img_from = handler.load_from_bytes(img_bytes_from)
-            img_to = handler.load_from_bytes(img_bytes_to)
-
-            # Ensure same size
-            w1, h1 = handler.get_dimensions(img_from)
-            w2, h2 = handler.get_dimensions(img_to)
-            if (w1, h1) != (w2, h2):
-                img_from = handler.resize(img_from, w2, h2)
-
-            # Downscale
-            img_from = handler.resize(img_from, max_width, max_height)
-            img_to = handler.resize(img_to, max_width, max_height)
-
-            # Convert to grayscale
-            gray_from = handler.to_grayscale(img_from)
-            gray_to = handler.to_grayscale(img_to)
-
-            # Optional blur
-            gray_from = handler.gaussian_blur(gray_from, blur_sigma)
-            gray_to = handler.gaussian_blur(gray_to, blur_sigma)
-
-            # Calculate difference
-            diff = handler.absolute_difference(gray_from, gray_to)
-
-            # Threshold and get percentage
-            change_percentage, _ = handler.threshold(diff, int(threshold))
-
-            conn.send(float(change_percentage))
-
-        except Exception as e:
-            print(f"[Worker] Calculate error: {e}", flush=True)
-            conn.send(0.0)
-        finally:
-            conn.close()
-
-    p = multiprocessing.Process(target=_worker_calculate, args=(child_conn,))
-    p.start()
-
-    result = 0.0
-    try:
-        if parent_conn.poll(30):
-            result = parent_conn.recv()
-    except Exception as e:
-        print(f"[Parent] Calculate error receiving result: {e}", flush=True)
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown
-        p.join(timeout=5)
-        if p.is_alive():
-            print("[Parent] Calculate process didn't exit gracefully, terminating", flush=True)
-            p.terminate()
-            p.join(timeout=3)
-
-        # Force kill if still alive
-        if p.is_alive():
-            print("[Parent] Calculate process didn't terminate, killing", flush=True)
-            p.kill()
-            p.join(timeout=1)
-
-    return result
-
-
-def compare_images_isolated(img_bytes_from, img_bytes_to, threshold, blur_sigma, min_change_percentage, crop_region=None):
-    """
-    Compare images in isolated subprocess for change detection.
-
-    Args:
-        img_bytes_from: Previous screenshot bytes
-        img_bytes_to: Current screenshot bytes
-        threshold: Pixel difference threshold
-        blur_sigma: Gaussian blur sigma
-        min_change_percentage: Minimum percentage to trigger change detection
-        crop_region: Optional tuple (left, top, right, bottom) for cropping both images
-
-    Returns:
-        tuple: (changed_detected, change_percentage)
-    """
-    print(f"[Parent] Starting compare_images_isolated subprocess", flush=True)
-    parent_conn, child_conn = multiprocessing.Pipe()
-
-    def _worker_compare(conn):
-        try:
-            print(f"[Worker] Compare worker starting", flush=True)
-            # Import handler inside worker
-            from .libvips_handler import LibvipsImageDiffHandler
-
-            print(f"[Worker] Initializing handler", flush=True)
-            handler = LibvipsImageDiffHandler()
-
-            # Load images
-            print(f"[Worker] Loading images (from={len(img_bytes_from)} bytes, to={len(img_bytes_to)} bytes)", flush=True)
-            img_from = handler.load_from_bytes(img_bytes_from)
-            img_to = handler.load_from_bytes(img_bytes_to)
-            print(f"[Worker] Images loaded", flush=True)
-
-            # Crop if region specified
-            if crop_region:
-                print(f"[Worker] Cropping to region {crop_region}", flush=True)
-                left, top, right, bottom = crop_region
-                img_from = handler.crop(img_from, left, top, right, bottom)
-                img_to = handler.crop(img_to, left, top, right, bottom)
-                print(f"[Worker] Cropping completed", flush=True)
-
-            # Ensure same size
-            w1, h1 = handler.get_dimensions(img_from)
-            w2, h2 = handler.get_dimensions(img_to)
-            print(f"[Worker] Image dimensions: from={w1}x{h1}, to={w2}x{h2}", flush=True)
-            if (w1, h1) != (w2, h2):
-                print(f"[Worker] Resizing to match dimensions", flush=True)
-                img_from = handler.resize(img_from, w2, h2)
-
-            # Convert to grayscale
-            print(f"[Worker] Converting to grayscale", flush=True)
-            gray_from = handler.to_grayscale(img_from)
-            gray_to = handler.to_grayscale(img_to)
-
-            # Optional blur
-            # NOTE: gaussblur can hang in forked subprocesses due to LibVIPS threading
-            # Skip blur as a workaround - sigma=0.8 is subtle and comparison works without it
-            if blur_sigma > 0:
-                print(f"[Worker] Skipping blur (sigma={blur_sigma}) due to LibVIPS threading issues in fork", flush=True)
-                # gray_from = handler.gaussian_blur(gray_from, blur_sigma)
-                # gray_to = handler.gaussian_blur(gray_to, blur_sigma)
-
-            # Calculate difference
-            print(f"[Worker] Calculating difference", flush=True)
-            diff = handler.absolute_difference(gray_from, gray_to)
-
-            # Threshold and get percentage
-            print(f"[Worker] Applying threshold ({threshold})", flush=True)
-            change_percentage, _ = handler.threshold(diff, int(threshold))
-
-            # Determine if change detected
-            changed_detected = change_percentage > min_change_percentage
-
-            print(f"[Worker] Comparison complete: changed={changed_detected}, percentage={change_percentage:.2f}%", flush=True)
-            conn.send((changed_detected, float(change_percentage)))
-
-        except Exception as e:
-            print(f"[Worker] Compare error: {e}", flush=True)
-            import traceback
-            traceback.print_exc()
-            conn.send((False, 0.0))
-        finally:
-            conn.close()
-
-    p = multiprocessing.Process(target=_worker_compare, args=(child_conn,))
-    print(f"[Parent] Starting subprocess (pid will be assigned)", flush=True)
-    p.start()
-    print(f"[Parent] Subprocess started (pid={p.pid}), waiting for result (30s timeout)", flush=True)
-
-    result = (False, 0.0)
-    try:
-        if parent_conn.poll(30):
-            print(f"[Parent] Result available, receiving", flush=True)
-            result = parent_conn.recv()
-            print(f"[Parent] Result received: {result}", flush=True)
-        else:
-            print(f"[Parent] Timeout waiting for result after 30s", flush=True)
-    except Exception as e:
-        print(f"[Parent] Compare error receiving result: {e}", flush=True)
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown
-        import time
-        print(f"[Parent] Waiting for subprocess to exit (5s timeout)", flush=True)
-        join_start = time.time()
-        p.join(timeout=5)
-        join_elapsed = time.time() - join_start
-        print(f"[Parent] First join took {join_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print("[Parent] Compare process didn't exit gracefully, terminating", flush=True)
-            term_start = time.time()
-            p.terminate()
-            p.join(timeout=3)
-            term_elapsed = time.time() - term_start
-            print(f"[Parent] Terminate+join took {term_elapsed:.2f}s", flush=True)
-
-        # Force kill if still alive
-        if p.is_alive():
-            print("[Parent] Compare process didn't terminate, killing", flush=True)
-            kill_start = time.time()
-            p.kill()
-            p.join(timeout=1)
-            kill_elapsed = time.time() - kill_start
-            print(f"[Parent] Kill+join took {kill_elapsed:.2f}s", flush=True)
-
-        print(f"[Parent] Subprocess cleanup complete, returning result", flush=True)
-
-    return result

changedetectionio/processors/image_ssim_diff/image_handler/isolated_opencv.py

@@ -1,627 +0,0 @@
-"""
-OpenCV-based subprocess isolation for image comparison.
-
-OpenCV is much more stable in multiprocessing contexts than LibVIPS.
-No threading issues, no fork problems, picklable functions.
-"""
-
-import multiprocessing
-import numpy as np
-from .. import POLL_TIMEOUT_ABSOLUTE
-
-# Public implementation name for logging
-IMPLEMENTATION_NAME = "OpenCV"
-
-
-def _worker_compare(conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, crop_region):
-    """
-    Worker function for image comparison (must be top-level for pickling with spawn).
-
-    Args:
-        conn: Pipe connection for sending results
-        img_bytes_from: Previous screenshot bytes
-        img_bytes_to: Current screenshot bytes
-        pixel_difference_threshold: Pixel-level sensitivity (0-255) - how different must a pixel be to count as changed
-        blur_sigma: Gaussian blur sigma
-        crop_region: Optional (left, top, right, bottom) crop coordinates
-    """
-    import time
-    try:
-        import cv2
-
-        # CRITICAL: Disable OpenCV threading to prevent thread explosion
-        # With multiprocessing, each subprocess would otherwise spawn threads equal to CPU cores
-        # This causes excessive thread counts and memory overhead
-        # Research: https://medium.com/@rachittayal7/a-note-on-opencv-threads-performance-in-prod-d10180716fba
-        cv2.setNumThreads(1)
-
-        print(f"[{time.time():.3f}] [Worker] Compare worker starting (threads=1 for memory optimization)", flush=True)
-
-        # Decode images from bytes
-        print(f"[{time.time():.3f}] [Worker] Loading images (from={len(img_bytes_from)} bytes, to={len(img_bytes_to)} bytes)", flush=True)
-        img_from = cv2.imdecode(np.frombuffer(img_bytes_from, np.uint8), cv2.IMREAD_COLOR)
-        img_to = cv2.imdecode(np.frombuffer(img_bytes_to, np.uint8), cv2.IMREAD_COLOR)
-
-        # Check if decoding succeeded
-        if img_from is None:
-            raise ValueError("Failed to decode 'from' image - may be corrupt or unsupported format")
-        if img_to is None:
-            raise ValueError("Failed to decode 'to' image - may be corrupt or unsupported format")
-
-        print(f"[{time.time():.3f}] [Worker] Images loaded: from={img_from.shape}, to={img_to.shape}", flush=True)
-
-        # Crop if region specified
-        if crop_region:
-            print(f"[{time.time():.3f}] [Worker] Cropping to region {crop_region}", flush=True)
-            left, top, right, bottom = crop_region
-            img_from = img_from[top:bottom, left:right]
-            img_to = img_to[top:bottom, left:right]
-            print(f"[{time.time():.3f}] [Worker] Cropped: from={img_from.shape}, to={img_to.shape}", flush=True)
-
-        # Resize if dimensions don't match
-        if img_from.shape != img_to.shape:
-            print(f"[{time.time():.3f}] [Worker] Resizing to match dimensions", flush=True)
-            img_from = cv2.resize(img_from, (img_to.shape[1], img_to.shape[0]))
-
-        # Convert to grayscale
-        print(f"[{time.time():.3f}] [Worker] Converting to grayscale", flush=True)
-        gray_from = cv2.cvtColor(img_from, cv2.COLOR_BGR2GRAY)
-        gray_to = cv2.cvtColor(img_to, cv2.COLOR_BGR2GRAY)
-
-        # Optional Gaussian blur
-        if blur_sigma > 0:
-            print(f"[{time.time():.3f}] [Worker] Applying Gaussian blur (sigma={blur_sigma})", flush=True)
-            # OpenCV uses kernel size, convert sigma to kernel size: size = 2 * round(3*sigma) + 1
-            ksize = int(2 * round(3 * blur_sigma)) + 1
-            if ksize % 2 == 0:  # Must be odd
-                ksize += 1
-            gray_from = cv2.GaussianBlur(gray_from, (ksize, ksize), blur_sigma)
-            gray_to = cv2.GaussianBlur(gray_to, (ksize, ksize), blur_sigma)
-            print(f"[{time.time():.3f}] [Worker] Blur applied (kernel={ksize}x{ksize})", flush=True)
-
-        # Calculate absolute difference
-        print(f"[{time.time():.3f}] [Worker] Calculating absolute difference", flush=True)
-        diff = cv2.absdiff(gray_from, gray_to)
-
-        # Apply threshold
-        print(f"[{time.time():.3f}] [Worker] Applying pixel difference threshold ({pixel_difference_threshold})", flush=True)
-        _, thresholded = cv2.threshold(diff, int(pixel_difference_threshold), 255, cv2.THRESH_BINARY)
-
-        # Calculate change percentage
-        total_pixels = thresholded.size
-        changed_pixels = np.count_nonzero(thresholded)
-        change_percentage = (changed_pixels / total_pixels) * 100.0
-
-        print(f"[{time.time():.3f}] [Worker] Comparison complete: percentage={change_percentage:.2f}%", flush=True)
-        # Return only the score - let the caller decide if it's a "change"
-        conn.send(float(change_percentage))
-
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Worker] Error: {e}", flush=True)
-        import traceback
-        traceback.print_exc()
-        # Send error info as dict so parent can re-raise
-        conn.send({'error': str(e), 'traceback': traceback.format_exc()})
-    finally:
-        conn.close()
-
-
-async def compare_images_isolated(img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, crop_region=None):
-    """
-    Compare images in isolated subprocess using OpenCV (async-safe).
-
-    Args:
-        img_bytes_from: Previous screenshot bytes
-        img_bytes_to: Current screenshot bytes
-        pixel_difference_threshold: Pixel-level sensitivity (0-255) - how different must a pixel be to count as changed
-        blur_sigma: Gaussian blur sigma
-        crop_region: Optional (left, top, right, bottom) crop coordinates
-
-    Returns:
-        float: Change percentage (0-100)
-    """
-    import time
-    import asyncio
-    print(f"[{time.time():.3f}] [Parent] Starting OpenCV comparison subprocess", flush=True)
-
-    # Use spawn method for clean process (no fork issues)
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
-
-    p = ctx.Process(
-        target=_worker_compare,
-        args=(child_conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, crop_region)
-    )
-
-    print(f"[{time.time():.3f}] [Parent] Starting subprocess", flush=True)
-    p.start()
-    print(f"[{time.time():.3f}] [Parent] Subprocess started (pid={p.pid}), waiting for result ({POLL_TIMEOUT_ABSOLUTE}s timeout)", flush=True)
-
-    result = 0.0
-    try:
-        # Async-friendly polling: check in small intervals without blocking event loop
-        deadline = time.time() + POLL_TIMEOUT_ABSOLUTE
-        while time.time() < deadline:
-            # Run poll() in thread to avoid blocking event loop
-            has_data = await asyncio.to_thread(parent_conn.poll, 0.1)
-            if has_data:
-                print(f"[{time.time():.3f}] [Parent] Result available, receiving", flush=True)
-                result = await asyncio.to_thread(parent_conn.recv)
-                # Check if result is an error dict
-                if isinstance(result, dict) and 'error' in result:
-                    raise RuntimeError(f"Image comparison failed: {result['error']}")
-                print(f"[{time.time():.3f}] [Parent] Result received: {result:.2f}%", flush=True)
-                break
-            await asyncio.sleep(0)  # Yield control to event loop
-        else:
-            from loguru import logger
-            logger.critical(f"[OpenCV subprocess] Timeout waiting for compare_images result after {POLL_TIMEOUT_ABSOLUTE}s (subprocess may be hung)")
-            print(f"[{time.time():.3f}] [Parent] Timeout waiting for result after {POLL_TIMEOUT_ABSOLUTE}s", flush=True)
-            raise TimeoutError(f"Image comparison subprocess timeout after {POLL_TIMEOUT_ABSOLUTE}s")
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Parent] Error receiving result: {e}", flush=True)
-        raise
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown (async-safe)
-        print(f"[{time.time():.3f}] [Parent] Waiting for subprocess to exit (5s timeout)", flush=True)
-        join_start = time.time()
-        await asyncio.to_thread(p.join, 5)
-        join_elapsed = time.time() - join_start
-        print(f"[{time.time():.3f}] [Parent] First join took {join_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't exit gracefully, terminating", flush=True)
-            term_start = time.time()
-            p.terminate()
-            await asyncio.to_thread(p.join, 3)
-            term_elapsed = time.time() - term_start
-            print(f"[{time.time():.3f}] [Parent] Terminate+join took {term_elapsed:.2f}s", flush=True)
-
-        # Force kill if still alive
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't terminate, killing", flush=True)
-            kill_start = time.time()
-            p.kill()
-            await asyncio.to_thread(p.join, 1)
-            kill_elapsed = time.time() - kill_start
-            print(f"[{time.time():.3f}] [Parent] Kill+join took {kill_elapsed:.2f}s", flush=True)
-
-        print(f"[{time.time():.3f}] [Parent] Subprocess cleanup complete, returning result", flush=True)
-
-    return result
-
-
-def _worker_generate_diff(conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height):
-    """
-    Worker function for generating visual diff with red overlay.
-    """
-    import time
-    try:
-        import cv2
-
-        cv2.setNumThreads(1)
-        print(f"[{time.time():.3f}] [Worker] Generate diff worker starting", flush=True)
-
-        # Decode images
-        img_from = cv2.imdecode(np.frombuffer(img_bytes_from, np.uint8), cv2.IMREAD_COLOR)
-        img_to = cv2.imdecode(np.frombuffer(img_bytes_to, np.uint8), cv2.IMREAD_COLOR)
-
-        # Resize if needed to match dimensions
-        if img_from.shape != img_to.shape:
-            img_from = cv2.resize(img_from, (img_to.shape[1], img_to.shape[0]))
-
-        # Downscale to max dimensions for faster processing
-        h, w = img_to.shape[:2]
-        if w > max_width or h > max_height:
-            scale = min(max_width / w, max_height / h)
-            new_w = int(w * scale)
-            new_h = int(h * scale)
-            img_from = cv2.resize(img_from, (new_w, new_h))
-            img_to = cv2.resize(img_to, (new_w, new_h))
-
-        # Convert to grayscale
-        gray_from = cv2.cvtColor(img_from, cv2.COLOR_BGR2GRAY)
-        gray_to = cv2.cvtColor(img_to, cv2.COLOR_BGR2GRAY)
-
-        # Optional blur
-        if blur_sigma > 0:
-            ksize = int(2 * round(3 * blur_sigma)) + 1
-            if ksize % 2 == 0:
-                ksize += 1
-            gray_from = cv2.GaussianBlur(gray_from, (ksize, ksize), blur_sigma)
-            gray_to = cv2.GaussianBlur(gray_to, (ksize, ksize), blur_sigma)
-
-        # Calculate difference
-        diff = cv2.absdiff(gray_from, gray_to)
-
-        # Apply threshold to get mask
-        _, mask = cv2.threshold(diff, int(pixel_difference_threshold), 255, cv2.THRESH_BINARY)
-
-        # Create red overlay on original 'to' image
-        # Where mask is 255 (changed), blend 50% red
-        overlay = img_to.copy()
-        overlay[:, :, 2] = np.where(mask > 0,
-                                     np.clip(overlay[:, :, 2] * 0.5 + 127, 0, 255).astype(np.uint8),
-                                     overlay[:, :, 2])
-        overlay[:, :, 0:2] = np.where(mask[:, :, np.newaxis] > 0,
-                                       (overlay[:, :, 0:2] * 0.5).astype(np.uint8),
-                                       overlay[:, :, 0:2])
-
-        # Encode as JPEG
-        _, encoded = cv2.imencode('.jpg', overlay, [cv2.IMWRITE_JPEG_QUALITY, 85])
-        diff_bytes = encoded.tobytes()
-
-        print(f"[{time.time():.3f}] [Worker] Generated diff ({len(diff_bytes)} bytes)", flush=True)
-        conn.send(diff_bytes)
-
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Worker] Generate diff error: {e}", flush=True)
-        import traceback
-        traceback.print_exc()
-        # Send error info as dict so parent can re-raise
-        conn.send({'error': str(e), 'traceback': traceback.format_exc()})
-    finally:
-        conn.close()
-
-
-async def generate_diff_isolated(img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height):
-    """
-    Generate visual diff with red overlay in isolated subprocess (async-safe).
-
-    Returns:
-        bytes: JPEG diff image or None on failure
-    """
-    import time
-    import asyncio
-    print(f"[{time.time():.3f}] [Parent] Starting generate_diff subprocess", flush=True)
-
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
-
-    p = ctx.Process(
-        target=_worker_generate_diff,
-        args=(child_conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height)
-    )
-
-    print(f"[{time.time():.3f}] [Parent] Starting subprocess", flush=True)
-    p.start()
-    print(f"[{time.time():.3f}] [Parent] Subprocess started (pid={p.pid}), waiting for result ({POLL_TIMEOUT_ABSOLUTE}s timeout)", flush=True)
-
-    result = None
-    try:
-        # Async-friendly polling: check in small intervals without blocking event loop
-        deadline = time.time() + POLL_TIMEOUT_ABSOLUTE
-        while time.time() < deadline:
-            # Run poll() in thread to avoid blocking event loop
-            has_data = await asyncio.to_thread(parent_conn.poll, 0.1)
-            if has_data:
-                print(f"[{time.time():.3f}] [Parent] Result available, receiving", flush=True)
-                result = await asyncio.to_thread(parent_conn.recv)
-                # Check if result is an error dict
-                if isinstance(result, dict) and 'error' in result:
-                    raise RuntimeError(f"Generate diff failed: {result['error']}")
-                print(f"[{time.time():.3f}] [Parent] Result received ({len(result) if result else 0} bytes)", flush=True)
-                break
-            await asyncio.sleep(0)  # Yield control to event loop
-        else:
-            from loguru import logger
-            logger.critical(f"[OpenCV subprocess] Timeout waiting for generate_diff result after {POLL_TIMEOUT_ABSOLUTE}s (subprocess may be hung)")
-            print(f"[{time.time():.3f}] [Parent] Timeout waiting for result after {POLL_TIMEOUT_ABSOLUTE}s", flush=True)
-            raise TimeoutError(f"Generate diff subprocess timeout after {POLL_TIMEOUT_ABSOLUTE}s")
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Parent] Error receiving diff: {e}", flush=True)
-        raise
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown (async-safe)
-        print(f"[{time.time():.3f}] [Parent] Waiting for subprocess to exit (5s timeout)", flush=True)
-        join_start = time.time()
-        await asyncio.to_thread(p.join, 5)
-        join_elapsed = time.time() - join_start
-        print(f"[{time.time():.3f}] [Parent] First join took {join_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't exit gracefully, terminating", flush=True)
-            term_start = time.time()
-            p.terminate()
-            await asyncio.to_thread(p.join, 3)
-            term_elapsed = time.time() - term_start
-            print(f"[{time.time():.3f}] [Parent] Terminate+join took {term_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't terminate, killing", flush=True)
-            kill_start = time.time()
-            p.kill()
-            await asyncio.to_thread(p.join, 1)
-            kill_elapsed = time.time() - kill_start
-            print(f"[{time.time():.3f}] [Parent] Kill+join took {kill_elapsed:.2f}s", flush=True)
-
-        print(f"[{time.time():.3f}] [Parent] Subprocess cleanup complete, returning result", flush=True)
-
-    return result
-
-
-def _worker_draw_bounding_box(conn, img_bytes, x, y, width, height, color, thickness):
-    """
-    Worker function for drawing bounding box on image.
-    """
-    import time
-    try:
-        import cv2
-
-        cv2.setNumThreads(1)
-        print(f"[{time.time():.3f}] [Worker] Draw bounding box worker starting", flush=True)
-
-        # Decode image
-        img = cv2.imdecode(np.frombuffer(img_bytes, np.uint8), cv2.IMREAD_COLOR)
-        if img is None:
-            print(f"[{time.time():.3f}] [Worker] Failed to decode image", flush=True)
-            conn.send(None)
-            return
-
-        # Draw rectangle (BGR format)
-        cv2.rectangle(img, (x, y), (x + width, y + height), color, thickness)
-
-        # Encode back to PNG
-        _, encoded = cv2.imencode('.png', img)
-        result_bytes = encoded.tobytes()
-
-        print(f"[{time.time():.3f}] [Worker] Bounding box drawn ({len(result_bytes)} bytes)", flush=True)
-        conn.send(result_bytes)
-
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Worker] Draw bounding box error: {e}", flush=True)
-        import traceback
-        traceback.print_exc()
-        # Send error info as dict so parent can re-raise
-        conn.send({'error': str(e), 'traceback': traceback.format_exc()})
-    finally:
-        conn.close()
-
-
-async def draw_bounding_box_isolated(img_bytes, x, y, width, height, color=(255, 0, 0), thickness=3):
-    """
-    Draw bounding box on image in isolated subprocess (async-safe).
-
-    Args:
-        img_bytes: Image data as bytes
-        x: Left coordinate
-        y: Top coordinate
-        width: Box width
-        height: Box height
-        color: BGR color tuple (default: blue)
-        thickness: Line thickness in pixels
-
-    Returns:
-        bytes: PNG image with bounding box or None on failure
-    """
-    import time
-    import asyncio
-    print(f"[{time.time():.3f}] [Parent] Starting draw_bounding_box subprocess", flush=True)
-
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
-
-    p = ctx.Process(
-        target=_worker_draw_bounding_box,
-        args=(child_conn, img_bytes, x, y, width, height, color, thickness)
-    )
-
-    print(f"[{time.time():.3f}] [Parent] Starting subprocess", flush=True)
-    p.start()
-    print(f"[{time.time():.3f}] [Parent] Subprocess started (pid={p.pid}), waiting for result ({POLL_TIMEOUT_ABSOLUTE}s timeout)", flush=True)
-
-    result = None
-    try:
-        # Async-friendly polling: check in small intervals without blocking event loop
-        deadline = time.time() + POLL_TIMEOUT_ABSOLUTE
-        while time.time() < deadline:
-            # Run poll() in thread to avoid blocking event loop
-            has_data = await asyncio.to_thread(parent_conn.poll, 0.1)
-            if has_data:
-                print(f"[{time.time():.3f}] [Parent] Result available, receiving", flush=True)
-                # Run recv() in thread too
-                result = await asyncio.to_thread(parent_conn.recv)
-                # Check if result is an error dict
-                if isinstance(result, dict) and 'error' in result:
-                    raise RuntimeError(f"Draw bounding box failed: {result['error']}")
-                print(f"[{time.time():.3f}] [Parent] Result received ({len(result) if result else 0} bytes)", flush=True)
-                break
-            # Yield control to event loop
-            await asyncio.sleep(0)
-        else:
-            from loguru import logger
-            logger.critical(f"[OpenCV subprocess] Timeout waiting for draw_bounding_box result after {POLL_TIMEOUT_ABSOLUTE}s (subprocess may be hung)")
-            print(f"[{time.time():.3f}] [Parent] Timeout waiting for result after {POLL_TIMEOUT_ABSOLUTE}s", flush=True)
-            raise TimeoutError(f"Draw bounding box subprocess timeout after {POLL_TIMEOUT_ABSOLUTE}s")
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Parent] Error receiving result: {e}", flush=True)
-        raise
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown (run join in thread to avoid blocking)
-        print(f"[{time.time():.3f}] [Parent] Waiting for subprocess to exit (3s timeout)", flush=True)
-        join_start = time.time()
-        await asyncio.to_thread(p.join, 3)
-        join_elapsed = time.time() - join_start
-        print(f"[{time.time():.3f}] [Parent] First join took {join_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't exit gracefully, terminating", flush=True)
-            term_start = time.time()
-            p.terminate()
-            await asyncio.to_thread(p.join, 2)
-            term_elapsed = time.time() - term_start
-            print(f"[{time.time():.3f}] [Parent] Terminate+join took {term_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't terminate, killing", flush=True)
-            kill_start = time.time()
-            p.kill()
-            await asyncio.to_thread(p.join, 1)
-            kill_elapsed = time.time() - kill_start
-            print(f"[{time.time():.3f}] [Parent] Kill+join took {kill_elapsed:.2f}s", flush=True)
-
-        print(f"[{time.time():.3f}] [Parent] Subprocess cleanup complete, returning result", flush=True)
-
-    return result
-
-
-def _worker_calculate_percentage(conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height):
-    """
-    Worker function for calculating change percentage.
-    """
-    import time
-    try:
-        import cv2
-
-        cv2.setNumThreads(1)
-
-        # Decode images
-        img_from = cv2.imdecode(np.frombuffer(img_bytes_from, np.uint8), cv2.IMREAD_COLOR)
-        img_to = cv2.imdecode(np.frombuffer(img_bytes_to, np.uint8), cv2.IMREAD_COLOR)
-
-        # Resize if needed
-        if img_from.shape != img_to.shape:
-            img_from = cv2.resize(img_from, (img_to.shape[1], img_to.shape[0]))
-
-        # Downscale to max dimensions
-        h, w = img_to.shape[:2]
-        if w > max_width or h > max_height:
-            scale = min(max_width / w, max_height / h)
-            new_w = int(w * scale)
-            new_h = int(h * scale)
-            img_from = cv2.resize(img_from, (new_w, new_h))
-            img_to = cv2.resize(img_to, (new_w, new_h))
-
-        # Convert to grayscale
-        gray_from = cv2.cvtColor(img_from, cv2.COLOR_BGR2GRAY)
-        gray_to = cv2.cvtColor(img_to, cv2.COLOR_BGR2GRAY)
-
-        # Optional blur
-        if blur_sigma > 0:
-            ksize = int(2 * round(3 * blur_sigma)) + 1
-            if ksize % 2 == 0:
-                ksize += 1
-            gray_from = cv2.GaussianBlur(gray_from, (ksize, ksize), blur_sigma)
-            gray_to = cv2.GaussianBlur(gray_to, (ksize, ksize), blur_sigma)
-
-        # Calculate difference
-        diff = cv2.absdiff(gray_from, gray_to)
-
-        # Apply threshold
-        _, thresholded = cv2.threshold(diff, int(pixel_difference_threshold), 255, cv2.THRESH_BINARY)
-
-        # Calculate percentage
-        total_pixels = thresholded.size
-        changed_pixels = np.count_nonzero(thresholded)
-        change_percentage = (changed_pixels / total_pixels) * 100.0
-
-        conn.send(float(change_percentage))
-
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Worker] Calculate percentage error: {e}", flush=True)
-        import traceback
-        traceback.print_exc()
-        # Send error info as dict so parent can re-raise
-        conn.send({'error': str(e), 'traceback': traceback.format_exc()})
-    finally:
-        conn.close()
-
-
-async def calculate_change_percentage_isolated(img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height):
-    """
-    Calculate change percentage in isolated subprocess (async-safe).
-
-    Returns:
-        float: Change percentage
-    """
-    import time
-    import asyncio
-    print(f"[{time.time():.3f}] [Parent] Starting calculate_percentage subprocess", flush=True)
-
-    ctx = multiprocessing.get_context('spawn')
-    parent_conn, child_conn = ctx.Pipe()
-
-    p = ctx.Process(
-        target=_worker_calculate_percentage,
-        args=(child_conn, img_bytes_from, img_bytes_to, pixel_difference_threshold, blur_sigma, max_width, max_height)
-    )
-
-    print(f"[{time.time():.3f}] [Parent] Starting subprocess", flush=True)
-    p.start()
-    print(f"[{time.time():.3f}] [Parent] Subprocess started (pid={p.pid}), waiting for result ({POLL_TIMEOUT_ABSOLUTE}s timeout)", flush=True)
-
-    result = 0.0
-    try:
-        # Async-friendly polling: check in small intervals without blocking event loop
-        deadline = time.time() + POLL_TIMEOUT_ABSOLUTE
-        while time.time() < deadline:
-            # Run poll() in thread to avoid blocking event loop
-            has_data = await asyncio.to_thread(parent_conn.poll, 0.1)
-            if has_data:
-                print(f"[{time.time():.3f}] [Parent] Result available, receiving", flush=True)
-                result = await asyncio.to_thread(parent_conn.recv)
-                # Check if result is an error dict
-                if isinstance(result, dict) and 'error' in result:
-                    raise RuntimeError(f"Calculate change percentage failed: {result['error']}")
-                print(f"[{time.time():.3f}] [Parent] Result received: {result:.2f}%", flush=True)
-                break
-            await asyncio.sleep(0)  # Yield control to event loop
-        else:
-            from loguru import logger
-            logger.critical(f"[OpenCV subprocess] Timeout waiting for calculate_change_percentage result after {POLL_TIMEOUT_ABSOLUTE}s (subprocess may be hung)")
-            print(f"[{time.time():.3f}] [Parent] Timeout waiting for result after {POLL_TIMEOUT_ABSOLUTE}s", flush=True)
-            raise TimeoutError(f"Calculate change percentage subprocess timeout after {POLL_TIMEOUT_ABSOLUTE}s")
-    except Exception as e:
-        print(f"[{time.time():.3f}] [Parent] Error receiving percentage: {e}", flush=True)
-        raise
-    finally:
-        # Always close pipe first
-        try:
-            parent_conn.close()
-        except:
-            pass
-
-        # Try graceful shutdown (async-safe)
-        print(f"[{time.time():.3f}] [Parent] Waiting for subprocess to exit (5s timeout)", flush=True)
-        join_start = time.time()
-        await asyncio.to_thread(p.join, 5)
-        join_elapsed = time.time() - join_start
-        print(f"[{time.time():.3f}] [Parent] First join took {join_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't exit gracefully, terminating", flush=True)
-            term_start = time.time()
-            p.terminate()
-            await asyncio.to_thread(p.join, 3)
-            term_elapsed = time.time() - term_start
-            print(f"[{time.time():.3f}] [Parent] Terminate+join took {term_elapsed:.2f}s", flush=True)
-
-        if p.is_alive():
-            print(f"[{time.time():.3f}] [Parent] Process didn't terminate, killing", flush=True)
-            kill_start = time.time()
-            p.kill()
-            await asyncio.to_thread(p.join, 1)
-            kill_elapsed = time.time() - kill_start
-            print(f"[{time.time():.3f}] [Parent] Kill+join took {kill_elapsed:.2f}s", flush=True)
-
-        print(f"[{time.time():.3f}] [Parent] Subprocess cleanup complete, returning result", flush=True)
-
-    return result

changedetectionio/processors/image_ssim_diff/image_handler/libvips_handler.py

@@ -1,340 +0,0 @@
-"""
-LibVIPS implementation of ImageDiffHandler.
-
-Uses pyvips for high-performance image processing with streaming architecture
-and low memory footprint. Ideal for large screenshots (8000px+).
-"""
-
-from __future__ import annotations
-import os
-from typing import Tuple, Any, TYPE_CHECKING
-from loguru import logger
-
-if TYPE_CHECKING:
-    import pyvips
-
-try:
-    import pyvips
-    PYVIPS_AVAILABLE = True
-except ImportError:
-    PYVIPS_AVAILABLE = False
-    logger.warning("pyvips not available - install with: pip install pyvips")
-
-from . import ImageDiffHandler
-
-
-class LibvipsImageDiffHandler(ImageDiffHandler):
-    """
-    LibVIPS implementation using streaming architecture.
-
-    Benefits:
-    - 3x faster than ImageMagick
-    - 5x less memory than PIL
-    - Automatic multi-threading
-    - Streaming - processes images in chunks
-    """
-
-    def __init__(self):
-        if not PYVIPS_AVAILABLE:
-            raise ImportError("pyvips is not installed. Install with: pip install pyvips")
-
-    def load_from_bytes(self, img_bytes: bytes) -> pyvips.Image:
-        """Load image from bytes using libvips streaming."""
-        return pyvips.Image.new_from_buffer(img_bytes, '')
-
-    def save_to_bytes(self, img: pyvips.Image, format: str = 'png', quality: int = 85) -> bytes:
-        """
-        Save image to bytes using temp file.
-
-        Note: Uses temp file instead of write_to_buffer() to avoid C memory leak.
-        See: https://github.com/libvips/pyvips/issues/234
-        """
-        import tempfile
-
-        format = format.lower()
-
-        try:
-            if format == 'png':
-                suffix = '.png'
-                write_args = {'compression': 6}
-            elif format in ['jpg', 'jpeg']:
-                suffix = '.jpg'
-                write_args = {'Q': quality}
-            else:
-                raise ValueError(f"Unsupported format: {format}")
-
-            # Use temp file to avoid write_to_buffer() memory leak
-            with tempfile.NamedTemporaryFile(suffix=suffix, delete=False) as tmp:
-                temp_path = tmp.name
-
-            # Write to file
-            img.write_to_file(temp_path, **write_args)
-
-            # Read bytes and clean up
-            with open(temp_path, 'rb') as f:
-                image_bytes = f.read()
-
-            os.unlink(temp_path)
-            return image_bytes
-
-        except Exception as e:
-            logger.error(f"Failed to save via temp file: {e}")
-            # Fallback to write_to_buffer if temp file fails
-            if format == 'png':
-                return img.write_to_buffer('.png', compression=6)
-            else:
-                return img.write_to_buffer('.jpg', Q=quality)
-
-    def crop(self, img: pyvips.Image, left: int, top: int, right: int, bottom: int) -> pyvips.Image:
-        """Crop image using libvips."""
-        width = right - left
-        height = bottom - top
-        return img.crop(left, top, width, height)
-
-    def resize(self, img: pyvips.Image, max_width: int, max_height: int) -> pyvips.Image:
-        """
-        Resize image maintaining aspect ratio.
-
-        Uses thumbnail_image for efficient downscaling with streaming.
-        """
-        width, height = img.width, img.height
-
-        if width <= max_width and height <= max_height:
-            return img
-
-        # Calculate scaling to fit within max dimensions
-        width_ratio = max_width / width if width > max_width else 1.0
-        height_ratio = max_height / height if height > max_height else 1.0
-        ratio = min(width_ratio, height_ratio)
-
-        new_width = int(width * ratio)
-        new_height = int(height * ratio)
-
-        logger.debug(f"Resizing image: {width}x{height} -> {new_width}x{new_height}")
-
-        # thumbnail_image is faster than resize for downscaling
-        return img.thumbnail_image(new_width, height=new_height)
-
-    def get_dimensions(self, img: pyvips.Image) -> Tuple[int, int]:
-        """Get image dimensions."""
-        return (img.width, img.height)
-
-    def to_grayscale(self, img: pyvips.Image) -> pyvips.Image:
-        """Convert to grayscale using 'b-w' colorspace."""
-        return img.colourspace('b-w')
-
-    def gaussian_blur(self, img: pyvips.Image, sigma: float) -> pyvips.Image:
-        """Apply Gaussian blur."""
-        if sigma > 0:
-            return img.gaussblur(sigma)
-        return img
-
-    def absolute_difference(self, img1: pyvips.Image, img2: pyvips.Image) -> pyvips.Image:
-        """
-        Calculate absolute difference using operator overloading.
-
-        LibVIPS supports arithmetic operations between images.
-        """
-        return (img1 - img2).abs()
-
-    def threshold(self, img: pyvips.Image, threshold_value: int) -> Tuple[float, pyvips.Image]:
-        """
-        Apply threshold and calculate change percentage.
-
-        Uses ifthenelse for efficient thresholding.
-        """
-        # Create binary mask: pixels above threshold = 255, others = 0
-        mask = (img > threshold_value).ifthenelse(255, 0)
-
-        # Calculate percentage by averaging mask values
-        # avg() returns mean pixel value (0-255)
-        # Divide by 255 to get proportion, multiply by 100 for percentage
-        mean_value = mask.avg()
-        change_percentage = (mean_value / 255.0) * 100.0
-
-        return float(change_percentage), mask
-
-    def apply_red_overlay(self, img: pyvips.Image, mask: pyvips.Image) -> bytes:
-        """
-        Apply red overlay where mask is True (50% blend).
-
-        Args:
-            img: Color image (will be converted to RGB if needed)
-            mask: Binary mask (255 where changed, 0 elsewhere)
-
-        Returns:
-            JPEG bytes with red overlay
-        """
-        import tempfile
-
-        # Ensure RGB colorspace
-        if img.bands == 1:
-            img = img.colourspace('srgb')
-
-        # Normalize mask to 0-1 range for blending
-        mask_normalized = mask / 255.0
-
-        # Split into R, G, B channels
-        channels = img.bandsplit()
-        r, g, b = channels[0], channels[1], channels[2]
-
-        # Apply red overlay (50% blend):
-        # Where mask is 1: blend 50% original with 50% red (255)
-        # Where mask is 0: keep original
-        r = r * (1 - mask_normalized * 0.5) + 127.5 * mask_normalized
-        g = g * (1 - mask_normalized * 0.5)
-        b = b * (1 - mask_normalized * 0.5)
-
-        # Recombine channels
-        result = r.bandjoin([g, b])
-
-        # CRITICAL: Use temp file instead of write_to_buffer()
-        # write_to_buffer() leaks C memory that isn't returned to OS
-        # See: https://github.com/libvips/pyvips/issues/234
-        try:
-            with tempfile.NamedTemporaryFile(suffix='.jpg', delete=False) as tmp:
-                temp_path = tmp.name
-
-            # Write to file (doesn't leak like write_to_buffer)
-            result.write_to_file(temp_path, Q=85)
-
-            # Read bytes and clean up
-            with open(temp_path, 'rb') as f:
-                image_bytes = f.read()
-
-            os.unlink(temp_path)
-            return image_bytes
-
-        except Exception as e:
-            logger.error(f"Failed to write image via temp file: {e}")
-            # Fallback to write_to_buffer if temp file fails
-            return result.write_to_buffer('.jpg', Q=85)
-
-    def close(self, img: pyvips.Image) -> None:
-        """
-        LibVIPS uses automatic reference counting.
-
-        No explicit cleanup needed - memory freed when references drop to zero.
-        """
-        pass
-
-    def find_template(
-        self,
-        img: pyvips.Image,
-        template_img: pyvips.Image,
-        original_bbox: Tuple[int, int, int, int],
-        search_tolerance: float = 0.2
-    ) -> Tuple[int, int, int, int]:
-        """
-        Find template in image using OpenCV template matching.
-
-        Note: This temporarily converts to numpy for OpenCV operations since
-        libvips doesn't have template matching built-in.
-        """
-        import cv2
-        import numpy as np
-
-        try:
-            left, top, right, bottom = original_bbox
-            width = right - left
-            height = bottom - top
-
-            # Calculate search region
-            margin_x = int(width * search_tolerance)
-            margin_y = int(height * search_tolerance)
-
-            search_left = max(0, left - margin_x)
-            search_top = max(0, top - margin_y)
-            search_right = min(img.width, right + margin_x)
-            search_bottom = min(img.height, bottom + margin_y)
-
-            # Crop search region
-            search_region = self.crop(img, search_left, search_top, search_right, search_bottom)
-
-            # Convert to numpy arrays for OpenCV
-            search_array = np.ndarray(
-                buffer=search_region.write_to_memory(),
-                dtype=np.uint8,
-                shape=[search_region.height, search_region.width, search_region.bands]
-            )
-            template_array = np.ndarray(
-                buffer=template_img.write_to_memory(),
-                dtype=np.uint8,
-                shape=[template_img.height, template_img.width, template_img.bands]
-            )
-
-            # Convert to grayscale
-            if len(search_array.shape) == 3:
-                search_gray = cv2.cvtColor(search_array, cv2.COLOR_RGB2GRAY)
-            else:
-                search_gray = search_array
-
-            if len(template_array.shape) == 3:
-                template_gray = cv2.cvtColor(template_array, cv2.COLOR_RGB2GRAY)
-            else:
-                template_gray = template_array
-
-            logger.debug(f"Searching for template in region: ({search_left}, {search_top}) to ({search_right}, {search_bottom})")
-
-            # Perform template matching
-            result = cv2.matchTemplate(search_gray, template_gray, cv2.TM_CCOEFF_NORMED)
-            min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(result)
-
-            logger.debug(f"Template matching confidence: {max_val:.2%}")
-
-            # Check if match is good enough (80% confidence threshold)
-            if max_val >= 0.8:
-                # Calculate new bounding box in original image coordinates
-                match_x = search_left + max_loc[0]
-                match_y = search_top + max_loc[1]
-
-                new_bbox = (match_x, match_y, match_x + width, match_y + height)
-
-                # Calculate movement distance
-                move_x = abs(match_x - left)
-                move_y = abs(match_y - top)
-
-                logger.info(f"Template found at ({match_x}, {match_y}), "
-                           f"moved {move_x}px horizontally, {move_y}px vertically, "
-                           f"confidence: {max_val:.2%}")
-
-                return new_bbox
-            else:
-                logger.warning(f"Template match confidence too low: {max_val:.2%} (need 80%)")
-                return None
-
-        except Exception as e:
-            logger.error(f"Template matching error: {e}")
-            return None
-
-    def save_template(
-        self,
-        img: pyvips.Image,
-        bbox: Tuple[int, int, int, int],
-        output_path: str
-    ) -> bool:
-        """
-        Save a cropped region as a template file.
-        """
-        import os
-
-        try:
-            left, top, right, bottom = bbox
-            width = right - left
-            height = bottom - top
-
-            # Ensure output directory exists
-            os.makedirs(os.path.dirname(output_path), exist_ok=True)
-
-            # Crop template region
-            template = self.crop(img, left, top, right, bottom)
-
-            # Save as PNG
-            template.write_to_file(output_path, compression=6)
-
-            logger.info(f"Saved template: {output_path} ({width}x{height}px)")
-            return True
-
-        except Exception as e:
-            logger.error(f"Failed to save template: {e}")
-            return False

changedetectionio/processors/image_ssim_diff/preview.py

@@ -1,109 +0,0 @@
-"""
-Preview rendering for SSIM screenshot processor.
-
-Renders images properly in the browser instead of showing raw bytes.
-"""
-
-from loguru import logger
-
-
-def get_asset(asset_name, watch, datastore, request):
-    """
-    Get processor-specific binary assets for preview streaming.
-
-    This function supports serving images as separate HTTP responses instead
-    of embedding them as base64 in the HTML template, solving memory issues
-    with large screenshots.
-
-    Supported assets:
-    - 'screenshot': The screenshot for the specified version
-
-    Args:
-        asset_name: Name of the asset to retrieve ('screenshot')
-        watch: Watch object
-        datastore: Datastore object
-        request: Flask request (for version query param)
-
-    Returns:
-        tuple: (binary_data, content_type, cache_control_header) or None if not found
-    """
-    if asset_name != 'screenshot':
-        return None
-
-    versions = list(watch.history.keys())
-    if len(versions) == 0:
-        return None
-
-    # Get the version from query string (default: latest)
-    preferred_version = request.args.get('version')
-    timestamp = versions[-1]
-    if preferred_version and preferred_version in versions:
-        timestamp = preferred_version
-
-    try:
-        screenshot_bytes = watch.get_history_snapshot(timestamp=timestamp)
-
-        # Verify we got bytes (should always be bytes for image files)
-        if not isinstance(screenshot_bytes, bytes):
-            logger.error(f"Expected bytes but got {type(screenshot_bytes)} for screenshot at {timestamp}")
-            return None
-
-        # Detect image format using puremagic (same as Watch.py)
-        try:
-            import puremagic
-            detections = puremagic.magic_string(screenshot_bytes[:2048])
-            if detections:
-                mime_type = detections[0].mime_type
-                logger.trace(f"Detected MIME type: {mime_type}")
-            else:
-                mime_type = 'image/png'  # Default fallback
-        except Exception as e:
-            logger.warning(f"puremagic detection failed: {e}, using 'image/png' fallback")
-            mime_type = 'image/png'
-
-        return (screenshot_bytes, mime_type, 'public, max-age=10')
-
-    except Exception as e:
-        logger.error(f"Failed to load screenshot for preview asset: {e}")
-        return None
-
-
-def render(watch, datastore, request, url_for, render_template, flash, redirect):
-    """
-    Render the preview page for screenshot watches.
-
-    Args:
-        watch: Watch object
-        datastore: Datastore object
-        request: Flask request
-        url_for: Flask url_for function
-        render_template: Flask render_template function
-        flash: Flask flash function
-        redirect: Flask redirect function
-
-    Returns:
-        Rendered template or redirect
-    """
-    versions = list(watch.history.keys())
-
-    if len(versions) == 0:
-        flash("Preview unavailable - No snapshots captured yet", "error")
-        return redirect(url_for('watchlist.index'))
-
-    # Get the version to display (default: latest)
-    preferred_version = request.args.get('version')
-    timestamp = versions[-1]
-    if preferred_version and preferred_version in versions:
-        timestamp = preferred_version
-
-    # Render custom template for image preview
-    # Screenshot is now served via separate /processor-asset/ endpoint instead of base64
-    # This significantly reduces memory usage by not embedding large images in HTML
-    return render_template(
-        'image_ssim_diff/preview.html',
-        watch=watch,
-        uuid=watch.get('uuid'),
-        versions=versions,
-        timestamp=timestamp,
-        current_diff_url=watch['url']
-    )

changedetectionio/processors/image_ssim_diff/processor.py

@@ -1,241 +0,0 @@
-"""
-Core fast screenshot comparison processor.
-
-Uses OpenCV with subprocess isolation for high-performance, low-memory
-image processing. All operations run in isolated subprocesses for complete
-memory cleanup and stability.
-"""
-
-import hashlib
-import time
-from loguru import logger
-from changedetectionio.processors.exceptions import ProcessorException
-from . import SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT, PROCESSOR_CONFIG_NAME, OPENCV_BLUR_SIGMA
-from ..base import difference_detection_processor, SCREENSHOT_FORMAT_PNG
-
-# All image operations now use OpenCV via isolated_opencv subprocess handler
-# Template matching temporarily disabled pending OpenCV implementation
-
-name = 'Visual / Image screenshot change detection'
-description = 'Compares screenshots using fast OpenCV algorithm, 10-100x faster than SSIM'
-processor_weight = 2
-list_badge_text = "Visual"
-
-class perform_site_check(difference_detection_processor):
-    """Fast screenshot comparison processor using OpenCV."""
-
-    # Override to use PNG format for better image comparison (JPEG compression creates noise)
-    screenshot_format = SCREENSHOT_FORMAT_PNG
-
-    def run_changedetection(self, watch):
-        """
-        Perform screenshot comparison using OpenCV subprocess handler.
-
-        Returns:
-            tuple: (changed_detected, update_obj, screenshot_bytes)
-        """
-        now = time.time()
-        # Get the current screenshot
-        if not self.fetcher.screenshot:
-            raise ProcessorException(
-                message="No screenshot available. Ensure the watch is configured to use a real browser.",
-                url=watch.get('url')
-            )
-        self.screenshot = self.fetcher.screenshot
-        self.xpath_data = self.fetcher.xpath_data
-
-        # Quick MD5 check - skip expensive comparison if images are identical
-        from changedetectionio.content_fetchers.exceptions import checksumFromPreviousCheckWasTheSame
-        current_md5 = hashlib.md5(self.screenshot).hexdigest()
-        previous_md5 = watch.get('previous_md5')
-        if previous_md5 and current_md5 == previous_md5:
-            logger.debug(f"UUID: {watch.get('uuid')} - Screenshot MD5 unchanged ({current_md5}), skipping comparison")
-            raise checksumFromPreviousCheckWasTheSame()
-        else:
-            logger.debug(f"UUID: {watch.get('uuid')} - Screenshot MD5 changed")
-
-
-
-        # Check if bounding box is set (for drawn area mode)
-        # Read from processor-specific config JSON file (named after processor)
-        crop_region = None
-
-        processor_config = self.get_extra_watch_config(PROCESSOR_CONFIG_NAME)
-        bounding_box = processor_config.get('bounding_box') if processor_config else None
-
-
-        # Get pixel difference threshold sensitivity (per-watch > global)
-        # This controls how different a pixel must be (0-255 scale) to count as "changed"
-        pixel_difference_threshold_sensitivity = processor_config.get('pixel_difference_threshold_sensitivity')
-        if not pixel_difference_threshold_sensitivity:
-            pixel_difference_threshold_sensitivity = self.datastore.data['settings']['application'].get('pixel_difference_threshold_sensitivity', SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT)
-        try:
-            pixel_difference_threshold_sensitivity = int(pixel_difference_threshold_sensitivity)
-        except (ValueError, TypeError):
-            logger.warning(f"Invalid pixel_difference_threshold_sensitivity value '{pixel_difference_threshold_sensitivity}', using default")
-            pixel_difference_threshold_sensitivity = SCREENSHOT_COMPARISON_THRESHOLD_OPTIONS_DEFAULT
-
-
-        # Get minimum change percentage (per-watch > global > env var default)
-        # This controls what percentage of pixels must change to trigger a detection
-        min_change_percentage = processor_config.get('min_change_percentage')
-        if not min_change_percentage:
-            min_change_percentage = self.datastore.data['settings']['application'].get('min_change_percentage', 1)
-        try:
-            min_change_percentage = int(min_change_percentage)
-        except (ValueError, TypeError):
-            logger.warning(f"Invalid min_change_percentage value '{min_change_percentage}', using default 0.1")
-            min_change_percentage = 1
-
-        # Template matching for tracking content movement
-        template_matching_enabled = processor_config.get('auto_track_region', False) #@@todo disabled for now
-
-        if bounding_box:
-            try:
-                # Parse bounding box: "x,y,width,height"
-                parts = [int(p.strip()) for p in bounding_box.split(',')]
-                if len(parts) == 4:
-                    x, y, width, height = parts
-                    # Crop uses (left, top, right, bottom)
-                    crop_region = (max(0, x), max(0, y), x + width, y + height)
-                    logger.info(f"UUID: {watch.get('uuid')} - Bounding box enabled: cropping to region {crop_region} (x={x}, y={y}, w={width}, h={height})")
-                else:
-                    logger.warning(f"UUID: {watch.get('uuid')} - Invalid bounding box format: {bounding_box} (expected 4 values)")
-            except Exception as e:
-                logger.warning(f"UUID: {watch.get('uuid')} - Failed to parse bounding box '{bounding_box}': {e}")
-
-        # If no bounding box, check if visual selector (include_filters) is set for region-based comparison
-        if not crop_region:
-            include_filters = watch.get('include_filters', [])
-
-            if include_filters and len(include_filters) > 0:
-                # Get the first filter to use for cropping
-                first_filter = include_filters[0].strip()
-
-                if first_filter and self.xpath_data:
-                    try:
-                        import json
-                        # xpath_data is JSON string from browser
-                        xpath_data_obj = json.loads(self.xpath_data) if isinstance(self.xpath_data, str) else self.xpath_data
-
-                        # Find the bounding box for the first filter
-                        for element in xpath_data_obj.get('size_pos', []):
-                            # Match the filter with the element's xpath
-                            if element.get('xpath') == first_filter and element.get('highlight_as_custom_filter'):
-                                # Found the element - extract crop coordinates
-                                left = element.get('left', 0)
-                                top = element.get('top', 0)
-                                width = element.get('width', 0)
-                                height = element.get('height', 0)
-
-                                # Crop uses (left, top, right, bottom)
-                                crop_region = (max(0, left), max(0, top), left + width, top + height)
-
-                                logger.info(f"UUID: {watch.get('uuid')} - Visual selector enabled: cropping to region {crop_region} for filter: {first_filter}")
-                                break
-
-                    except Exception as e:
-                        logger.warning(f"UUID: {watch.get('uuid')} - Failed to parse xpath_data for visual selector: {e}")
-
-        # Store original crop region for template matching
-        original_crop_region = crop_region
-
-        # Check if this is the first check (no previous history)
-        history_keys = list(watch.history.keys())
-        if len(history_keys) == 0:
-            # First check - save baseline, no comparison
-            logger.info(f"UUID: {watch.get('uuid')} - First check for watch {watch.get('uuid')} - saving baseline screenshot")
-
-            # LibVIPS uses automatic reference counting - no explicit cleanup needed
-            update_obj = {
-                'previous_md5': hashlib.md5(self.screenshot).hexdigest(),
-                'last_error': False
-            }
-            logger.trace(f"Processed in {time.time() - now:.3f}s")
-            return False, update_obj, self.screenshot
-
-        # Get previous screenshot bytes from history
-        previous_timestamp = history_keys[-1]
-        previous_screenshot_bytes = watch.get_history_snapshot(timestamp=previous_timestamp)
-
-        # Screenshots are stored as PNG, so this should be bytes
-        if isinstance(previous_screenshot_bytes, str):
-            # If it's a string (shouldn't be for screenshots, but handle it)
-            previous_screenshot_bytes = previous_screenshot_bytes.encode('utf-8')
-
-        # Template matching is temporarily disabled pending OpenCV implementation
-        # crop_region calculated above will be used as-is
-
-        # Perform comparison in isolated subprocess to prevent memory leaks
-        try:
-            from .image_handler import isolated_opencv as process_screenshot_handler
-
-# stuff in watch doesnt need to be there
-            logger.debug(f"UUID: {watch.get('uuid')} - Starting isolated subprocess comparison (crop_region={crop_region})")
-
-            # Compare using isolated subprocess with OpenCV (async-safe to avoid blocking event loop)
-            # Pass raw bytes and crop region - subprocess handles all image operations
-            import asyncio
-            import threading
-
-            # Async-safe wrapper: runs coroutine in new thread with its own event loop
-            # This prevents blocking the async update worker's event loop
-            def run_async_in_thread():
-                return asyncio.run(
-                    process_screenshot_handler.compare_images_isolated(
-                        img_bytes_from=previous_screenshot_bytes,
-                        img_bytes_to=self.screenshot,
-                        pixel_difference_threshold=pixel_difference_threshold_sensitivity,
-                        blur_sigma=OPENCV_BLUR_SIGMA,
-                        crop_region=crop_region  # Pass crop region for isolated cropping
-                    )
-                )
-
-            # Run in thread to avoid blocking event loop when called from async update worker
-            result_container = [None]
-            exception_container = [None]
-
-            def thread_target():
-                try:
-                    result_container[0] = run_async_in_thread()
-                except Exception as e:
-                    exception_container[0] = e
-
-            thread = threading.Thread(target=thread_target)
-            thread.start()
-            thread.join(timeout=60)
-
-            if exception_container[0]:
-                raise exception_container[0]
-
-            # Subprocess returns only the change score - we decide if it's a "change"
-            change_score = result_container[0]
-            if change_score is None:
-                raise RuntimeError("Image comparison subprocess returned no result")
-
-            changed_detected = change_score > min_change_percentage
-            logger.info(f"UUID: {watch.get('uuid')} -  {process_screenshot_handler.IMPLEMENTATION_NAME}: {change_score:.2f}% pixels changed, pixel_diff_threshold_sensitivity: {pixel_difference_threshold_sensitivity:.0f} score={change_score:.2f}%, min_change_threshold={min_change_percentage}%")
-
-        except Exception as e:
-            logger.error(f"UUID: {watch.get('uuid')} - Failed to compare screenshots: {e}")
-            logger.trace(f"UUID: {watch.get('uuid')} - Processed in {time.time() - now:.3f}s")
-
-            raise ProcessorException(
-                message=f"UUID: {watch.get('uuid')} - Screenshot comparison failed: {e}",
-                url=watch.get('url')
-            )
-
-        # Return results
-        update_obj = {
-            'previous_md5': hashlib.md5(self.screenshot).hexdigest(),
-            'last_error': False
-        }
-
-        if changed_detected:
-            logger.info(f"UUID: {watch.get('uuid')} - Change detected using OpenCV! Score: {change_score:.2f}")
-        else:
-            logger.debug(f"UUID: {watch.get('uuid')} - No significant change using OpenCV. Score: {change_score:.2f}")
-        logger.trace(f"UUID: {watch.get('uuid')} - Processed in {time.time() - now:.3f}s")
-
-        return changed_detected, update_obj, self.screenshot
-

changedetectionio/processors/image_ssim_diff/templates/image_ssim_diff/diff.html

@@ -1,235 +0,0 @@
-{% extends 'base.html' %}
-{% from '_helpers.html' import render_field, render_checkbox_field, render_button %}
-
-{% block content %}
-<link rel="stylesheet" href="{{url_for('static_content', group='styles', filename='diff-image.css')}}?v={{ get_css_version() }}">
-<script src="{{url_for('static_content', group='js', filename='diff-overview.js')}}" defer></script>
-
-<div id="settings">
-    <form class="pure-form " action="{{ url_for('ui.ui_diff.diff_history_page', uuid=uuid) }}" method="GET" id="diff-form">
-        <fieldset class="diff-fieldset">
-            {% if versions|length >= 1 %}
-                <span style="white-space: nowrap;">
-                <label id="change-from" for="diff-from-version" class="from-to-label">From</label>
-                <select id="diff-from-version" name="from_version" class="needs-localtime">
-                    {%- for version in versions|reverse -%}
-                        <option value="{{ version }}" {% if version== from_version %} selected="" {% endif %}>
-                            {{ version }}
-                        </option>
-                    {%- endfor -%}
-                </select>
-                </span>
-                <span style="white-space: nowrap;">
-                <label id="change-to" for="diff-to-version" class="from-to-label">To</label>
-                <select id="diff-to-version" name="to_version" class="needs-localtime">
-                    {%- for version in versions|reverse -%}
-                        <option value="{{ version }}" {% if version== to_version %} selected="" {% endif %}>
-                            {{ version }}
-                        </option>
-                    {%- endfor -%}
-                </select>
-                </span>
-            {% endif %}
-        </fieldset>
-        <fieldset id="diff-style">
-            <span>
-                <strong>Change Detection:</strong> {{ "%.2f"|format(change_percentage) }}% of pixels changed
-                {% if change_percentage > 0.1 %}
-                    <span class="change-detected">⚠ Change Detected</span>
-                {% else %}
-                    <span class="no-change">✓ No Significant Change</span>
-                {% endif %}
-            </span>
-        </fieldset>
-        {%- if versions|length >= 2 -%}
-            <div id="keyboard-nav">
-                <strong>Keyboard: </strong>
-                <a href="" class="pure-button pure-button-primary" id="btn-previous"> &larr; Previous</a>
-                &nbsp; <a class="pure-button pure-button-primary" id="btn-next" href=""> &rarr; Next</a>
-            </div>
-        {%- endif -%}
-    </form>
-</div>
-
-<div id="screenshot-comparison">
-    <!-- Two-panel layout: Interactive slider + Static diff -->
-    <div class="comparison-grid">
-        <!-- Panel 1: Interactive Comparison Slider (Previous ↔ Current) -->
-        <div class="screenshot-panel">
-            <h3>Interactive Comparison</h3>
-            <div class="comparison-description">
-                Drag slider to compare Previous ({{ from_version|format_timestamp_timeago }})
-                vs Current ({{ to_version|format_timestamp_timeago }})
-            </div>
-            <div style="text-align: center; margin-bottom: 0.5em; display: flex; justify-content: center; gap: 1em;">
-                <a href="#" onclick="downloadImage('img-before', '{{ from_version }}'); return false;" class="download-link" title="Download previous snapshot">
-                    <svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" style="display: inline-block;">
-                        <path d="M8 12L3 7h3V1h4v6h3z"/>
-                        <path d="M1 14h14v2H1z"/>
-                    </svg>
-                    Previous
-                </a>
-                <a href="#" onclick="downloadImage('img-after', '{{ to_version }}'); return false;" class="download-link" title="Download current snapshot">
-                    <svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" style="display: inline-block;">
-                        <path d="M8 12L3 7h3V1h4v6h3z"/>
-                        <path d="M1 14h14v2H1z"/>
-                    </svg>
-                    Current
-                </a>
-            </div>
-
-            <div class="image-comparison" id="comparison-container">
-                <!-- Before image wrapper (Previous snapshot) -->
-                <div class="comparison-image-wrapper">
-                    <img id="img-before" src="{{ url_for('ui.ui_diff.processor_asset', uuid=uuid, asset_name='before', from_version=from_version, to_version=to_version) }}" alt="Previous screenshot">
-                </div>
-
-                <!-- After image wrapper (Current snapshot) -->
-                <div class="comparison-image-wrapper comparison-after">
-                    <img id="img-after" src="{{ url_for('ui.ui_diff.processor_asset', uuid=uuid, asset_name='after', from_version=from_version, to_version=to_version) }}" alt="Current screenshot">
-                </div>
-
-                <!-- Labels -->
-                <div class="comparison-labels">
-                    <span class="comparison-label">Previous</span>
-                    <span class="comparison-label">Current</span>
-                </div>
-
-                <!-- Draggable slider -->
-                <div class="comparison-slider" id="comparison-slider">
-                    <div class="comparison-handle"></div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Panel 2: Difference Visualization (Static) -->
-        <div class="screenshot-panel diff">
-            <h3>Difference Visualization</h3>
-            <div class="diff-section-header">
-                <span>Red = Changed Pixels</span>
-            </div>
-            <div style="text-align: center; margin-bottom: 0.5em;">
-                <a href="#" onclick="downloadImage('diff-image', '{{ to_version }}_diff'); return false;" class="download-link" title="Download difference image">
-                    <svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor" style="display: inline-block;">
-                        <path d="M8 12L3 7h3V1h4v6h3z"/>
-                        <path d="M1 14h14v2H1z"/>
-                    </svg>
-                    Download
-                </a>
-            </div>
-            <img id="diff-image" src="{{ url_for('ui.ui_diff.processor_asset', uuid=uuid, asset_name='rendered_diff', from_version=from_version, to_version=to_version) }}" alt="Difference visualization with red highlights">
-        </div>
-    </div>
-
-    {% if comparison_data and comparison_data.get('history') and comparison_data.history|length > 1 %}
-    <div class="comparison-history-section">
-        <h3>Comparison History</h3>
-        <p>Recent comparison results (last {{ comparison_data.history|length }} checks)</p>
-        <div style="overflow-x: auto;">
-            <table class="pure-table pure-table-striped" style="width: 100%;">
-                <thead>
-                    <tr>
-                        <th>Timestamp</th>
-                        <th>Change %</th>
-                        <th>Method</th>
-                        <th>Changed?</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for entry in comparison_data.history|reverse %}
-                    <tr>
-                        <td>{{ entry.timestamp|format_timestamp_timeago }}</td>
-                        <td>{{ "%.2f"|format(entry.change_percentage) }}%</td>
-                        <td>{{ entry.method }}</td>
-                        <td>
-                            {% if entry.changed %}
-                                <span class="history-changed-yes">Yes</span>
-                            {% else %}
-                                <span class="history-changed-no">No</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
-    {% endif %}
-</div>
-
-<script>
-function downloadImage(imageId, filename) {
-    // Get the image element
-    const img = document.getElementById(imageId);
-    const base64Data = img.src;
-
-    // Convert base64 to blob
-    const byteString = atob(base64Data.split(',')[1]);
-    const mimeString = base64Data.split(',')[0].split(':')[1].split(';')[0];
-
-    const ab = new ArrayBuffer(byteString.length);
-    const ia = new Uint8Array(ab);
-    for (let i = 0; i < byteString.length; i++) {
-        ia[i] = byteString.charCodeAt(i);
-    }
-
-    const blob = new Blob([ab], { type: mimeString });
-
-    // Determine file extension from MIME type
-    const extension = mimeString.includes('jpeg') ? '.jpeg' : '.png';
-
-    // Create download link
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = filename + extension;
-    document.body.appendChild(a);
-    a.click();
-
-    // Cleanup
-    setTimeout(() => {
-        document.body.removeChild(a);
-        URL.revokeObjectURL(url);
-    }, 100);
-}
-
-/**
- * Synchronize comparison slider width with diff image width
- * This ensures both panels display images at the same max-width
- */
-function syncComparisonWidth() {
-    const diffImage = document.getElementById('diff-image');
-    const comparisonContainer = document.getElementById('comparison-container');
-
-    if (!diffImage || !comparisonContainer) return;
-
-    // Wait for diff image to load to get its actual rendered width
-    if (diffImage.complete) {
-        applyWidth();
-    } else {
-        diffImage.addEventListener('load', applyWidth);
-    }
-
-    function applyWidth() {
-        const diffImageWidth = diffImage.offsetWidth;
-        if (diffImageWidth > 0) {
-            comparisonContainer.style.maxWidth = diffImageWidth + 'px';
-            comparisonContainer.style.margin = '0 auto';
-        }
-    }
-}
-
-// Run on page load
-if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', syncComparisonWidth);
-} else {
-    syncComparisonWidth();
-}
-
-// Re-sync on window resize
-window.addEventListener('resize', syncComparisonWidth);
-</script>
-
-<script src="{{ url_for('static_content', group='js', filename='comparison-slider.js') }}" defer></script>
-
-{% endblock %}

changedetectionio/processors/image_ssim_diff/templates/image_ssim_diff/preview.html

@@ -1,35 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<script src="{{ url_for('static_content', group='js', filename='preview.js') }}" defer></script>
-    {% if versions|length >= 2 %}
-        <div id="diff-form" style="text-align: center;">
-            <form class="pure-form " action="" method="GET">
-                <fieldset>
-                    <label for="preview-version">Select timestamp</label> <select id="preview-version"
-                                                                                 name="version"
-                                                                                 class="needs-localtime">
-                    {% for version in versions|reverse %}
-                        <option value="{{ version }}" {% if version == timestamp %} selected="" {% endif %}>
-                            {{ version }}
-                        </option>
-                    {% endfor %}
-                </select>
-                    <button type="submit" class="pure-button pure-button-primary">Go</button>
-
-                </fieldset>
-            </form>
-                <br>
-                <strong>Keyboard: </strong><a href="" class="pure-button pure-button-primary" id="btn-previous">
-                &larr; Previous</a> &nbsp; <a class="pure-button pure-button-primary" id="btn-next" href="">
-                &rarr; Next</a>
-        </div>
-    {% endif %}
-
-    <div id="screenshot-container" style="text-align: center; border: 1px solid #ddd; padding: 2em; background: #fafafa; border-radius: 4px;">
-        <h3 style="margin-top: 0;">Screenshot from {{ timestamp|format_timestamp_timeago }}</h3>
-        <img src="{{ url_for('ui.ui_preview.processor_asset', uuid=uuid, asset_name='screenshot', version=timestamp) }}"
-             alt="Screenshot preview"
-             style="max-width: 100%; height: auto; border: 1px solid #ccc; box-shadow: 0 2px 8px rgba(0,0,0,0.1); border-radius: 2px;">
-    </div>
-{% endblock %}

changedetectionio/processors/image_ssim_diff/util.py

@@ -1,22 +0,0 @@
-"""
-DEPRECATED: All multiprocessing functions have been removed.
-
-The image_ssim_diff processor now uses LibVIPS via ImageDiffHandler abstraction,
-which provides superior performance and memory efficiency through streaming
-architecture and automatic threading.
-
-All image operations are now handled by:
-- imagehandler.py: Abstract base class defining the interface
-- libvips_handler.py: LibVIPS implementation with streaming and threading
-
-Historical note: This file previously contained multiprocessing workers for:
-- Template matching (find_region_with_template_matching_isolated)
-- Template regeneration (regenerate_template_isolated)
-- Image cropping (crop_image_isolated, crop_pil_image_isolated)
-
-These have been replaced by handler methods which are:
-- Faster (no subprocess overhead)
-- More memory efficient (LibVIPS streaming)
-- Cleaner (no multiprocessing deadlocks)
-- Better tested (no logger/forking issues)
-"""

changedetectionio/processors/magic.py

@@ -103,15 +103,15 @@ class guess_stream_type():
             self.is_json = True
         elif 'pdf' in magic_content_header:
             self.is_pdf = True
+        elif has_html_patterns or http_content_header == 'text/html':
+            self.is_html = True
+        elif any(s in magic_content_header for s in JSON_CONTENT_TYPES):
+            self.is_json = True
         # magic will call a rss document 'xml'
         # Rarely do endpoints give the right header, usually just text/xml, so we check also for <rss
         # This also triggers the automatic CDATA text parser so the RSS goes back a nice content list
         elif '<rss' in test_content_normalized or '<feed' in test_content_normalized or any(s in magic_content_header for s in RSS_XML_CONTENT_TYPES) or '<rdf:' in test_content_normalized:
             self.is_rss = True
-        elif has_html_patterns or http_content_header == 'text/html':
-            self.is_html = True
-        elif any(s in magic_content_header for s in JSON_CONTENT_TYPES):
-            self.is_json = True
         elif any(s in http_content_header for s in XML_CONTENT_TYPES):
             # Only mark as generic XML if not already detected as RSS
             if not self.is_rss:

changedetectionio/processors/restock_diff/forms.py

@@ -6,35 +6,34 @@ from wtforms import (
 from wtforms.fields.choices import RadioField
 from wtforms.fields.form import FormField
 from wtforms.form import Form
-from flask_babel import lazy_gettext as _l
 
 from changedetectionio.forms import processor_text_json_diff_form
 
 
 class RestockSettingsForm(Form):
-    in_stock_processing = RadioField(label=_l('Re-stock detection'), choices=[
-        ('in_stock_only', _l("In Stock only (Out Of Stock -> In Stock only)")),
-        ('all_changes', _l("Any availability changes")),
-        ('off', _l("Off, don't follow availability/restock")),
+    in_stock_processing = RadioField(label='Re-stock detection', choices=[
+        ('in_stock_only', "In Stock only (Out Of Stock -> In Stock only)"),
+        ('all_changes', "Any availability changes"),
+        ('off', "Off, don't follow availability/restock"),
     ], default="in_stock_only")
 
-    price_change_min = FloatField(_l('Below price to trigger notification'), [validators.Optional()],
-                                  render_kw={"placeholder": _l("No limit"), "size": "10"})
-    price_change_max = FloatField(_l('Above price to trigger notification'), [validators.Optional()],
-                                  render_kw={"placeholder": _l("No limit"), "size": "10"})
-    price_change_threshold_percent = FloatField(_l('Threshold in %% for price changes since the original price'), validators=[
+    price_change_min = FloatField('Below price to trigger notification', [validators.Optional()],
+                                  render_kw={"placeholder": "No limit", "size": "10"})
+    price_change_max = FloatField('Above price to trigger notification', [validators.Optional()],
+                                  render_kw={"placeholder": "No limit", "size": "10"})
+    price_change_threshold_percent = FloatField('Threshold in % for price changes since the original price', validators=[
 
         validators.Optional(),
-        validators.NumberRange(min=0, max=100, message=_l("Should be between 0 and 100")),
+        validators.NumberRange(min=0, max=100, message="Should be between 0 and 100"),
     ], render_kw={"placeholder": "0%", "size": "5"})
 
-    follow_price_changes = BooleanField(_l('Follow price changes'), default=True)
+    follow_price_changes = BooleanField('Follow price changes', default=True)
 
 class processor_settings_form(processor_text_json_diff_form):
     restock_settings = FormField(RestockSettingsForm)
 
     def extra_tab_content(self):
-        return _l('Restock & Price Detection')
+        return 'Restock & Price Detection'
 
     def extra_form_content(self):
         output = ""

changedetectionio/processors/restock_diff/processor.py

@@ -1,4 +1,4 @@
-from ..base import difference_detection_processor
+from .. import difference_detection_processor
 from ..exceptions import ProcessorException
 from . import Restock
 from loguru import logger
@@ -7,11 +7,8 @@ import urllib3
 import time
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-# Translatable strings - extracted by pybabel, translated at runtime in __init__.py
-name = 'Re-stock & Price detection for pages with a SINGLE product'  # _()
-description = 'Detects if the product goes back to in-stock'  # _()
-processor_weight = 1
-list_badge_text = "Restock"  # _()
+name = 'Re-stock & Price detection for pages with a SINGLE product'
+description = 'Detects if the product goes back to in-stock'
 
 class UnableToExtractRestockData(Exception):
     def __init__(self, status_code):
@@ -190,8 +187,6 @@ class perform_site_check(difference_detection_processor):
 
 
         itemprop_availability = {}
-
-        # Try built-in extraction first, this will scan metadata in the HTML
         try:
             itemprop_availability = get_itemprop_availability(self.fetcher.content)
         except MoreThanOnePriceFound as e:
@@ -203,33 +198,6 @@ class perform_site_check(difference_detection_processor):
                                      xpath_data=self.fetcher.xpath_data
                                      )
 
-        # If built-in extraction didn't get both price AND availability, try plugin override
-        # Only check plugin if this watch is using a fetcher that might provide better data
-        has_price = itemprop_availability.get('price') is not None
-        has_availability = itemprop_availability.get('availability') is not None
-
-        # @TODO !!! some setting like "Use as fallback" or "always use", "t
-        if not (has_price and has_availability) or True:
-            from changedetectionio.pluggy_interface import get_itemprop_availability_from_plugin
-            fetcher_name = watch.get('fetch_backend', 'html_requests')
-
-            # Only try plugin override if not using system default (which might be anything)
-            if fetcher_name and fetcher_name != 'system':
-                logger.debug("Calling extra plugins for getting item price/availability")
-                plugin_availability = get_itemprop_availability_from_plugin(self.fetcher.content, fetcher_name, self.fetcher, watch.link)
-
-                if plugin_availability:
-                    # Plugin provided better data, use it
-                    plugin_has_price = plugin_availability.get('price') is not None
-                    plugin_has_availability = plugin_availability.get('availability') is not None
-
-                    # Only use plugin data if it's actually better than what we have
-                    if plugin_has_price or plugin_has_availability:
-                        itemprop_availability = plugin_availability
-                        logger.info(f"Using plugin-provided availability data for fetcher '{fetcher_name}' (built-in had price={has_price}, availability={has_availability}; plugin has price={plugin_has_price}, availability={plugin_has_availability})")
-                if not plugin_availability:
-                    logger.debug("No item price/availability from plugins")
-
         # Something valid in get_itemprop_availability() by scraping metadata ?
         if itemprop_availability.get('price') or itemprop_availability.get('availability'):
             # Store for other usage

changedetectionio/processors/templates/extract.html

@@ -1,47 +0,0 @@
-{% extends 'base.html' %}
-{% from '_helpers.html' import render_field, render_checkbox_field, render_button %}
-{% block content %}
-    <div class="tabs">
-    <ul>
-        {% if last_error_text %}<li class="tab" id="error-text-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page', uuid=uuid)}}#error-text">Error Text</a></li> {% endif %}
-        {% if last_error_screenshot %}<li class="tab" id="error-screenshot-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page', uuid=uuid)}}#error-screenshot">Error Screenshot</a></li> {% endif %}
-        <li class="tab" id=""><a href="{{ url_for('ui.ui_diff.diff_history_page', uuid=uuid)}}#text">Text</a></li>
-        <li class="tab" id="screenshot-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page', uuid=uuid)}}#screenshot">Screenshot</a></li>
-        <li class="tab active" id="extract-tab"><a href="{{ url_for('ui.ui_diff.diff_history_page_extract_GET', uuid=uuid)}}">Extract Data</a></li>
-    </ul>
-</div>
-
-    <div id="diff-ui">
-
- <div class="xxxxtab-pane-inner" id="extract">
-        <form id="extract-data-form" class="pure-form pure-form-stacked edit-form"  action="{{ url_for('ui.ui_diff.diff_history_page_extract_POST', uuid=uuid) }}"  method="POST">
-            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-
-            <p>This tool will extract text data from all of the watch history.</p>
-
-            <div class="pure-control-group">
-                {{ render_field(extract_form.extract_regex) }}
-                <span class="pure-form-message-inline">
-                    A <strong>RegEx</strong> is a pattern that identifies exactly which part inside of the text that you want to extract.<br>
-
-                    <p>
-                        For example, to extract only the numbers from text &dash;<br>
-                        <strong>Raw text</strong>: <code>Temperature <span style="color: red">5.5</span>°C in Sydney</code><br>
-                        <strong>RegEx to extract:</strong> <code>Temperature <span style="color: red">([0-9\.]+)</span></code><br>
-                    </p>
-                    <p>
-                        <a href="https://RegExr.com/">Be sure to test your RegEx here.</a>
-                    </p>
-                    <p>
-                        Each RegEx group bracket <code>()</code> will be in its own column, the first column value is always the date.
-                    </p>
-                </span>
-            </div>
-            <div class="pure-control-group">
-                {{ render_button(extract_form.extract_submit_button) }}
-            </div>
-        </form>
-    </div>
-</div>
-
-{% endblock %}

changedetectionio/processors/text_json_diff/__init__.py

@@ -45,7 +45,6 @@ def prepare_filter_prevew(datastore, watch_uuid, form_data):
     text_before_filter = ''
     trigger_line_numbers = []
     ignore_line_numbers = []
-    blocked_line_numbers = []
 
     tmp_watch = deepcopy(datastore.data['watching'].get(watch_uuid))
 
@@ -105,23 +104,14 @@ def prepare_filter_prevew(datastore, watch_uuid, form_data):
     except Exception as e:
         text_before_filter = f"Error: {str(e)}"
 
-    try:
-        blocked_line_numbers = html_tools.strip_ignore_text(content=text_after_filter,
-                                                           wordlist=tmp_watch.get('text_should_not_be_present', []) + datastore.data['settings']['application'].get('text_should_not_be_present', []),
-                                                           mode='line numbers'
-                                                           )
-    except Exception as e:
-        text_before_filter = f"Error: {str(e)}"
-
     logger.trace(f"Parsed in {time.time() - now:.3f}s")
 
     return ({
-        'after_filter': text_after_filter,
-        'before_filter': text_before_filter.decode('utf-8') if isinstance(text_before_filter, bytes) else text_before_filter,
-        'blocked_line_numbers': blocked_line_numbers,
-        'duration': time.time() - now,
-        'ignore_line_numbers': ignore_line_numbers,
-        'trigger_line_numbers': trigger_line_numbers,
+            'after_filter': text_after_filter,
+            'before_filter': text_before_filter.decode('utf-8') if isinstance(text_before_filter, bytes) else text_before_filter,
+            'duration': time.time() - now,
+            'trigger_line_numbers': trigger_line_numbers,
+            'ignore_line_numbers': ignore_line_numbers,
         })
 
 

changedetectionio/processors/text_json_diff/difference.py

@@ -1,232 +0,0 @@
-"""
-History/diff rendering for text_json_diff processor.
-
-This module handles the visualization of text/HTML/JSON changes by rendering
-a side-by-side or unified diff view with syntax highlighting and change markers.
-"""
-
-import os
-import time
-from loguru import logger
-
-from changedetectionio import diff, strtobool
-from changedetectionio.diff import (
-    REMOVED_STYLE, ADDED_STYLE, REMOVED_INNER_STYLE, ADDED_INNER_STYLE,
-    REMOVED_PLACEMARKER_OPEN, REMOVED_PLACEMARKER_CLOSED,
-    ADDED_PLACEMARKER_OPEN, ADDED_PLACEMARKER_CLOSED,
-    CHANGED_PLACEMARKER_OPEN, CHANGED_PLACEMARKER_CLOSED,
-    CHANGED_INTO_PLACEMARKER_OPEN, CHANGED_INTO_PLACEMARKER_CLOSED
-)
-from changedetectionio.notification.handler import apply_html_color_to_body
-
-
-def build_diff_cell_visualizer(content, resolution=100):
-    """
-    Build a visual cell grid for the diff visualizer.
-
-    Analyzes the content for placemarkers indicating changes and creates a
-    grid of cells representing the document, with each cell marked as:
-    - 'deletion' for removed content
-    - 'insertion' for added content
-    - 'mixed' for cells containing both deletions and insertions
-    - empty string for cells with no changes
-
-    Args:
-        content: The diff content with placemarkers
-        resolution: Number of cells to create (default 100)
-
-    Returns:
-        List of dicts with 'class' key for each cell's CSS class
-    """
-    if not content:
-        return [{'class': ''} for _ in range(resolution)]
-    now = time.time()
-    # Work with character positions for better accuracy
-    content_length = len(content)
-
-    if content_length == 0:
-        return [{'class': ''} for _ in range(resolution)]
-
-    chars_per_cell = max(1, content_length / resolution)
-
-    # Track change type for each cell
-    cell_data = {}
-
-    # Placemarkers to detect
-    change_markers = {
-        REMOVED_PLACEMARKER_OPEN: 'deletion',
-        ADDED_PLACEMARKER_OPEN: 'insertion',
-        CHANGED_PLACEMARKER_OPEN: 'deletion',
-        CHANGED_INTO_PLACEMARKER_OPEN: 'insertion',
-    }
-
-    # Find all occurrences of each marker
-    for marker, change_type in change_markers.items():
-        pos = 0
-        while True:
-            pos = content.find(marker, pos)
-            if pos == -1:
-                break
-
-            # Calculate which cell this marker falls into
-            cell_index = min(int(pos / chars_per_cell), resolution - 1)
-
-            if cell_index not in cell_data:
-                cell_data[cell_index] = change_type
-            elif cell_data[cell_index] != change_type:
-                # Mixed changes in this cell
-                cell_data[cell_index] = 'mixed'
-
-            pos += len(marker)
-
-    # Build the cell list
-    cells = []
-    for i in range(resolution):
-        change_type = cell_data.get(i, '')
-        cells.append({'class': change_type})
-
-    logger.debug(f"Built diff cell visualizer: {len([c for c in cells if c['class']])} cells with changes out of {resolution} in {time.time() - now:.2f}s")
-
-    return cells
-
-# Diff display preferences configuration - single source of truth
-DIFF_PREFERENCES_CONFIG = {
-    'changesOnly': {'default': True, 'type': 'bool'},
-    'ignoreWhitespace': {'default': False, 'type': 'bool'},
-    'removed': {'default': True, 'type': 'bool'},
-    'added': {'default': True, 'type': 'bool'},
-    'replaced': {'default': True, 'type': 'bool'},
-    'type': {'default': 'diffLines', 'type': 'value'},
-}
-
-def render(watch, datastore, request, url_for, render_template, flash, redirect, extract_form=None):
-    """
-    Render the history/diff view for text/JSON/HTML changes.
-
-    Args:
-        watch: The watch object
-        datastore: The ChangeDetectionStore instance
-        request: Flask request object
-        url_for: Flask url_for function
-        render_template: Flask render_template function
-        flash: Flask flash function
-        redirect: Flask redirect function
-        extract_form: Optional pre-built extract form (for error cases)
-
-    Returns:
-        Rendered HTML response
-    """
-    from changedetectionio import forms
-
-    uuid = watch.get('uuid')
-
-    extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
-
-    # Use provided form or create a new one
-    if extract_form is None:
-        extract_form = forms.extractDataForm(formdata=request.form,
-                                             data={'extract_regex': request.form.get('extract_regex', '')}
-                                             )
-    history = watch.history
-    dates = list(history.keys())
-
-    # If a "from_version" was requested, then find it (or the closest one)
-    # Also set "from version" to be the closest version to the one that was last viewed.
-
-    best_last_viewed_timestamp = watch.get_from_version_based_on_last_viewed
-    from_version_timestamp = best_last_viewed_timestamp if best_last_viewed_timestamp else dates[-2]
-    from_version = request.args.get('from_version', from_version_timestamp )
-
-    # Use the current one if nothing was specified
-    to_version = request.args.get('to_version', str(dates[-1]))
-
-    try:
-        to_version_file_contents = watch.get_history_snapshot(timestamp=to_version)
-    except Exception as e:
-        logger.error(f"Unable to read watch history to-version for version {to_version}: {str(e)}")
-        to_version_file_contents = f"Unable to read to-version at {to_version}.\n"
-
-    try:
-        from_version_file_contents = watch.get_history_snapshot(timestamp=from_version)
-    except Exception as e:
-        logger.error(f"Unable to read watch history from-version for version {from_version}: {str(e)}")
-        from_version_file_contents = f"Unable to read to-version {from_version}.\n"
-
-    screenshot_url = watch.get_screenshot()
-
-    system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
-
-    is_html_webdriver = False
-    if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver' or watch.get('fetch_backend', '').startswith('extra_browser_'):
-        is_html_webdriver = True
-
-    password_enabled_and_share_is_off = False
-    if datastore.data['settings']['application'].get('password') or os.getenv("SALTED_PASS", False):
-        password_enabled_and_share_is_off = not datastore.data['settings']['application'].get('shared_diff_access')
-
-    datastore.set_last_viewed(uuid, time.time())
-
-    # Parse diff preferences from request using config as single source of truth
-    # Check if this is a user submission (any diff pref param exists in query string)
-    user_submitted = any(key in request.args for key in DIFF_PREFERENCES_CONFIG.keys())
-
-    diff_prefs = {}
-    for key, config in DIFF_PREFERENCES_CONFIG.items():
-        if user_submitted:
-            # User submitted form - missing checkboxes are explicitly OFF
-            if config['type'] == 'bool':
-                diff_prefs[key] = strtobool(request.args.get(key, 'off'))
-            else:
-                diff_prefs[key] = request.args.get(key, config['default'])
-        else:
-            # Initial load - use defaults from config
-            diff_prefs[key] = config['default']
-
-    content = diff.render_diff(previous_version_file_contents=from_version_file_contents,
-                               newest_version_file_contents=to_version_file_contents,
-                               include_replaced=diff_prefs['replaced'],
-                               include_added=diff_prefs['added'],
-                               include_removed=diff_prefs['removed'],
-                               include_equal=diff_prefs['changesOnly'],
-                               ignore_junk=diff_prefs['ignoreWhitespace'],
-                               word_diff=diff_prefs['type'] == 'diffWords',
-                               )
-
-    # Build cell grid visualizer before applying HTML color (so we can detect placemarkers)
-    diff_cell_grid = build_diff_cell_visualizer(content)
-
-    content = apply_html_color_to_body(n_body=content)
-    offscreen_content = render_template("diff-offscreen-options.html")
-
-    note = ''
-    if str(from_version) != str(dates[-2]) or str(to_version) != str(dates[-1]):
-        note = 'Note: You are not viewing the latest changes.'
-
-    output = render_template("diff.html",
-                             #initial_scroll_line_number=100,
-                             bottom_horizontal_offscreen_contents=offscreen_content,
-                             content=content,
-                             current_diff_url=watch['url'],
-                             diff_cell_grid=diff_cell_grid,
-                             diff_prefs=diff_prefs,
-                             extra_classes='difference-page',
-                             extra_stylesheets=extra_stylesheets,
-                             extra_title=f" - {watch.label} - History",
-                             extract_form=extract_form,
-                             from_version=str(from_version),
-                             is_html_webdriver=is_html_webdriver,
-                             last_error=watch['last_error'],
-                             last_error_screenshot=watch.get_error_snapshot(),
-                             last_error_text=watch.get_error_text(),
-                             newest=to_version_file_contents,
-                             newest_version_timestamp=dates[-1],
-                             note=note,
-                             password_enabled_and_share_is_off=password_enabled_and_share_is_off,
-                             pure_menu_fixed=False,
-                             screenshot=screenshot_url,
-                             to_version=str(to_version),
-                             uuid=uuid,
-                             versions=dates,  # All except current/last
-                             watch_a=watch,
-                             )
-    return output

changedetectionio/processors/text_json_diff/processor.py

@@ -7,10 +7,11 @@ import re
 import urllib3
 
 from changedetectionio.conditions import execute_ruleset_against_all_plugins
-from ..base import difference_detection_processor
+from changedetectionio.diff import ADDED_PLACEMARKER_OPEN
+from changedetectionio.processors import difference_detection_processor
 from changedetectionio.html_tools import PERL_STYLE_REGEX, cdata_in_document_to_text, TRANSLATE_WHITESPACE_TABLE
 from changedetectionio import html_tools, content_fetchers
-from changedetectionio.blueprint.price_data_follower import PRICE_DATA_TRACK_ACCEPT
+from changedetectionio.blueprint.price_data_follower import PRICE_DATA_TRACK_ACCEPT, PRICE_DATA_TRACK_REJECT
 from loguru import logger
 
 from changedetectionio.processors.magic import guess_stream_type
@@ -19,8 +20,6 @@ urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
 name = 'Webpage Text/HTML, JSON and PDF changes'
 description = 'Detects all text changes where possible'
-processor_weight = -100
-list_badge_text = "Text"
 
 JSON_FILTER_PREFIXES = ['json:', 'jq:', 'jqraw:']
 
@@ -299,7 +298,7 @@ class ContentProcessor:
                     xpath_filter=filter_rule.replace('xpath:', ''),
                     html_content=content,
                     append_pretty_line_formatting=not self.watch.is_source_type_url,
-                    is_xml=stream_content_type.is_rss or stream_content_type.is_xml
+                    is_rss=stream_content_type.is_rss
                 )
 
             # XPath1 filters (first match only)
@@ -308,7 +307,7 @@ class ContentProcessor:
                     xpath_filter=filter_rule.replace('xpath1:', ''),
                     html_content=content,
                     append_pretty_line_formatting=not self.watch.is_source_type_url,
-                    is_xml=stream_content_type.is_rss or stream_content_type.is_xml
+                    is_rss=stream_content_type.is_rss
                 )
 
             # JSON filters
@@ -469,7 +468,6 @@ class perform_site_check(difference_detection_processor):
                 c = ChecksumCalculator.calculate(text_content_before_ignored_filter, ignore_whitespace=True)
                 return False, {'previous_md5': c}, text_content_before_ignored_filter.encode('utf-8')
 
-
         # === EMPTY PAGE CHECK ===
         empty_pages_are_a_change = self.datastore.data['settings']['application'].get('empty_pages_are_a_change', False)
         if not stream_content_type.is_json and not empty_pages_are_a_change and len(stripped_text.strip()) == 0:
@@ -586,6 +584,7 @@ class perform_site_check(difference_detection_processor):
             include_added=watch.get('filter_text_added', True),
             include_removed=watch.get('filter_text_removed', True),
             include_replaced=watch.get('filter_text_replaced', True),
+            line_feed_sep="\n",
             include_change_type_prefix=False
         )
 

changedetectionio/queue_handlers.py

@@ -89,20 +89,20 @@ class RecheckPriorityQueue:
         try:
             # Wait for notification
             self.sync_q.get(block=block, timeout=timeout)
-
+            
             # Get highest priority item
             with self._lock:
                 if not self._priority_items:
                     logger.critical(f"CRITICAL: Queue notification received but no priority items available")
                     raise Exception("Priority queue inconsistency")
                 item = heapq.heappop(self._priority_items)
-
+            
             # Emit signals
             self._emit_get_signals()
-
+            
             logger.debug(f"Successfully retrieved item: {self._get_item_uuid(item)}")
             return item
-
+            
         except Exception as e:
             logger.critical(f"CRITICAL: Failed to get item from queue: {str(e)}")
             raise
@@ -141,20 +141,20 @@ class RecheckPriorityQueue:
         try:
             # Wait for notification
             await self.async_q.get()
-
+            
             # Get highest priority item
             with self._lock:
                 if not self._priority_items:
                     logger.critical(f"CRITICAL: Async queue notification received but no priority items available")
                     raise Exception("Priority queue inconsistency")
                 item = heapq.heappop(self._priority_items)
-
+            
             # Emit signals
             self._emit_get_signals()
-
+            
             logger.debug(f"Successfully async retrieved item: {self._get_item_uuid(item)}")
             return item
-
+            
         except Exception as e:
             logger.critical(f"CRITICAL: Failed to async get item from queue: {str(e)}")
             raise

changedetectionio/realtime/events.py

@@ -5,7 +5,7 @@ from blinker import signal
 
 def register_watch_operation_handlers(socketio, datastore):
     """Register Socket.IO event handlers for watch operations"""
-
+    
     @socketio.on('watch_operation')
     def handle_watch_operation(data):
         """Handle watch operations like pause, mute, recheck via Socket.IO"""

changedetectionio/realtime/socket_server.py

@@ -1,6 +1,5 @@
 import timeago
 from flask_socketio import SocketIO
-from flask_babel import gettext, get_locale
 
 import time
 import os
@@ -8,7 +7,6 @@ from loguru import logger
 from blinker import signal
 
 from changedetectionio import strtobool
-from changedetectionio.languages import get_timeago_locale
 
 
 class SignalHandler:
@@ -34,31 +32,11 @@ class SignalHandler:
         watch_favicon_bumped_signal = signal('watch_favicon_bump')
         watch_favicon_bumped_signal.connect(self.handle_watch_bumped_favicon_signal, weak=False)
 
-        watch_small_status_comment_signal = signal('watch_small_status_comment')
-        watch_small_status_comment_signal.connect(self.handle_watch_small_status_update, weak=False)
-
         # Connect to the notification_event signal
         notification_event_signal = signal('notification_event')
         notification_event_signal.connect(self.handle_notification_event, weak=False)
         logger.info("SignalHandler: Connected to notification_event signal")
 
-
-    def handle_watch_small_status_update(self, *args, **kwargs):
-        """Small simple status update, for example 'Connecting...'"""
-        watch_uuid = kwargs.get('watch_uuid')
-        status = kwargs.get('status')
-
-        if watch_uuid and status:
-            logger.debug(f"Socket.IO: Received watch small status update '{status}' for UUID {watch_uuid}")
-            # Emit the status update to all connected clients
-            self.socketio_instance.emit("watch_small_status_comment", {
-                "uuid": watch_uuid,
-                "status": status,
-                "event_timestamp": time.time()
-            })
-
-
-
     def handle_signal(self, *args, **kwargs):
         logger.trace(f"SignalHandler: Signal received with {len(args)} args and {len(kwargs)} kwargs")
         # Safely extract the watch UUID from kwargs
@@ -168,7 +146,7 @@ def handle_watch_update(socketio, **kwargs):
             'has_error': True if error_texts else False,
             'has_favicon': True if watch.get_favicon_filename() else False,
             'history_n': watch.history_n,
-            'last_changed_text': timeago.format(int(watch.last_changed), time.time(), get_timeago_locale(str(get_locale()))) if watch.history_n >= 2 and int(watch.last_changed) > 0 else gettext('Not yet'),
+            'last_changed_text': timeago.format(int(watch.last_changed), time.time()) if watch.history_n >= 2 and int(watch.last_changed) > 0 else 'Not yet',
             'last_checked': watch.get('last_checked'),
             'last_checked_text': _jinja2_filter_datetime(watch),
             'notification_muted': True if watch.get('notification_muted') else False,

changedetectionio/rss_tools.py

@@ -29,135 +29,16 @@ def cdata_in_document_to_text(html_content: str, render_anchor_tag_content=False
     return re.sub(pattern, repl, html_content)
 
 
-# Jinja2 template for formatting RSS/Atom feed entries
-# Covers all common feedparser entry fields including namespaced elements
-# Outputs HTML that will be converted to text via html_to_text
-# @todo - This could be a UI setting in the future
-RSS_ENTRY_TEMPLATE = """<article class="rss-item" id="{{ entry.id|replace('"', '')|replace(' ', '-') }}">{%- if entry.title -%}Title: {{ entry.title }}<br>{%- endif -%}
-{%- if entry.link -%}<strong>Link:</strong> <a href="{{ entry.link }}">{{ entry.link }}</a><br>
-{%- endif -%}
-{%- if entry.id -%}
-<strong>Guid:</strong> {{ entry.id }}<br>
-{%- endif -%}
-{%- if entry.published -%}
-<strong>PubDate:</strong> {{ entry.published }}<br>
-{%- endif -%}
-{%- if entry.updated and entry.updated != entry.published -%}
-<strong>Updated:</strong> {{ entry.updated }}<br>
-{%- endif -%}
-{%- if entry.author -%}
-<strong>Author:</strong> {{ entry.author }}<br>
-{%- elif entry.author_detail and entry.author_detail.name -%}
-<strong>Author:</strong> {{ entry.author_detail.name }}
-{%- if entry.author_detail.email %} ({{ entry.author_detail.email }}){% endif -%}
-<br>
-{%- endif -%}
-{%- if entry.contributors -%}
-<strong>Contributors:</strong> {% for contributor in entry.contributors -%}
-{{ contributor.name if contributor.name else contributor }}
-{%- if not loop.last %}, {% endif -%}
-{%- endfor %}<br>
-{%- endif -%}
-{%- if entry.publisher -%}
-<strong>Publisher:</strong> {{ entry.publisher }}<br>
-{%- endif -%}
-{%- if entry.rights -%}
-<strong>Rights:</strong> {{ entry.rights }}<br>
-{%- endif -%}
-{%- if entry.license -%}
-<strong>License:</strong> {{ entry.license }}<br>
-{%- endif -%}
-{%- if entry.language -%}
-<strong>Language:</strong> {{ entry.language }}<br>
-{%- endif -%}
-{%- if entry.tags -%}
-<strong>Tags:</strong> {% for tag in entry.tags -%}
-{{ tag.term if tag.term else tag }}
-{%- if not loop.last %}, {% endif -%}
-{%- endfor %}<br>
-{%- endif -%}
-{%- if entry.category -%}
-<strong>Category:</strong> {{ entry.category }}<br>
-{%- endif -%}
-{%- if entry.comments -%}
-<strong>Comments:</strong> <a href="{{ entry.comments }}">{{ entry.comments }}</a><br>
-{%- endif -%}
-{%- if entry.slash_comments -%}
-<strong>Comment Count:</strong> {{ entry.slash_comments }}<br>
-{%- endif -%}
-{%- if entry.enclosures -%}
-<strong>Enclosures:</strong><br>
-{%- for enclosure in entry.enclosures %}
-- <a href="{{ enclosure.href }}">{{ enclosure.href }}</a> ({{ enclosure.type if enclosure.type else 'unknown type' }}
-{%- if enclosure.length %}, {{ enclosure.length }} bytes{% endif -%}
-)<br>
-{%- endfor -%}
-{%- endif -%}
-{%- if entry.media_content -%}
-<strong>Media:</strong><br>
-{%- for media in entry.media_content %}
-- <a href="{{ media.url }}">{{ media.url }}</a>
-{%- if media.type %} ({{ media.type }}){% endif -%}
-{%- if media.width and media.height %} {{ media.width }}x{{ media.height }}{% endif -%}
-<br>
-{%- endfor -%}
-{%- endif -%}
-{%- if entry.media_thumbnail -%}
-<strong>Thumbnail:</strong> <a href="{{ entry.media_thumbnail[0].url if entry.media_thumbnail[0].url else entry.media_thumbnail[0] }}">{{ entry.media_thumbnail[0].url if entry.media_thumbnail[0].url else entry.media_thumbnail[0] }}</a><br>
-{%- endif -%}
-{%- if entry.media_description -%}
-<strong>Media Description:</strong> {{ entry.media_description }}<br>
-{%- endif -%}
-{%- if entry.itunes_duration -%}
-<strong>Duration:</strong> {{ entry.itunes_duration }}<br>
-{%- endif -%}
-{%- if entry.itunes_author -%}
-<strong>Podcast Author:</strong> {{ entry.itunes_author }}<br>
-{%- endif -%}
-{%- if entry.dc_identifier -%}
-<strong>Identifier:</strong> {{ entry.dc_identifier }}<br>
-{%- endif -%}
-{%- if entry.dc_source -%}
-<strong>DC Source:</strong> {{ entry.dc_source }}<br>
-{%- endif -%}
-{%- if entry.dc_type -%}
-<strong>Type:</strong> {{ entry.dc_type }}<br>
-{%- endif -%}
-{%- if entry.dc_format -%}
-<strong>Format:</strong> {{ entry.dc_format }}<br>
-{%- endif -%}
-{%- if entry.dc_relation -%}
-<strong>Related:</strong> {{ entry.dc_relation }}<br>
-{%- endif -%}
-{%- if entry.dc_coverage -%}
-<strong>Coverage:</strong> {{ entry.dc_coverage }}<br>
-{%- endif -%}
-{%- if entry.source and entry.source.title -%}
-<strong>Source:</strong> {{ entry.source.title }}
-{%- if entry.source.link %} (<a href="{{ entry.source.link }}">{{ entry.source.link }}</a>){% endif -%}
-<br>
-{%- endif -%}
-{%- if entry.dc_content -%}
-<strong>Content:</strong> {{ entry.dc_content | safe }}
-{%- elif entry.content and entry.content[0].value -%}
-<strong>Content:</strong> {{ entry.content[0].value | safe }}
-{%- elif entry.summary -%}
-<strong>Summary:</strong> {{ entry.summary | safe }}
-{%- endif -%}</article>
-"""
-
-
 def format_rss_items(rss_content: str, render_anchor_tag_content=False) -> str:
     """
-    Format RSS/Atom feed items in a readable text format using feedparser and Jinja2.
+    Format RSS/Atom feed items in a readable text format using feedparser.
 
-    Converts RSS <item> or Atom <entry> elements to formatted text with all available fields:
-    - Basic fields: title, link, id/guid, published date, updated date
-    - Author fields: author, author_detail, contributors, publisher
-    - Content fields: content, summary, description
-    - Metadata: tags, category, rights, license
-    - Media: enclosures, media_content, media_thumbnail
-    - Dublin Core elements: dc:creator, dc:date, dc:publisher, etc. (mapped by feedparser)
+    Converts RSS <item> or Atom <entry> elements to formatted text with:
+    - <title> → <h1>Title</h1>
+    - <link> → Link: [url]
+    - <guid> → Guid: [id]
+    - <pubDate> → PubDate: [date]
+    - <description> or <content> → Raw HTML content (CDATA and entities automatically handled)
 
     Args:
         rss_content: The RSS/Atom feed content
@@ -168,19 +49,65 @@ def format_rss_items(rss_content: str, render_anchor_tag_content=False) -> str:
     """
     try:
         import feedparser
-        from changedetectionio.jinja2_custom import safe_jinja
+        from xml.sax.saxutils import escape as xml_escape
 
         # Parse the feed - feedparser handles all RSS/Atom variants, CDATA, entity unescaping, etc.
         feed = feedparser.parse(rss_content)
 
-        # Determine feed type for appropriate labels
+        formatted_items = []
+
+        # Determine feed type for appropriate labels when fields are missing
+        # feedparser sets feed.version to things like 'rss20', 'atom10', etc.
         is_atom = feed.version and 'atom' in feed.version
 
-        formatted_items = []
         for entry in feed.entries:
-            # Render the entry using Jinja2 template
-            rendered = safe_jinja.render(RSS_ENTRY_TEMPLATE, entry=entry, is_atom=is_atom)
-            formatted_items.append(rendered.strip())
+            item_parts = []
+
+            # Title - feedparser handles CDATA and entity unescaping automatically
+            if hasattr(entry, 'title') and entry.title:
+                item_parts.append(f'<h1>{xml_escape(entry.title)}</h1>')
+
+            # Link
+            if hasattr(entry, 'link') and entry.link:
+                item_parts.append(f'Link: {xml_escape(entry.link)}<br>')
+
+            # GUID/ID
+            if hasattr(entry, 'id') and entry.id:
+                item_parts.append(f'Guid: {xml_escape(entry.id)}<br>')
+
+            # Date - feedparser normalizes all date field names to 'published'
+            if hasattr(entry, 'published') and entry.published:
+                item_parts.append(f'PubDate: {xml_escape(entry.published)}<br>')
+
+            # Description/Content - feedparser handles CDATA and entity unescaping automatically
+            # Only add "Summary:" label for Atom <summary> tags
+            content = None
+            add_label = False
+
+            if hasattr(entry, 'content') and entry.content:
+                # Atom <content> - no label, just content
+                content = entry.content[0].value if entry.content[0].value else None
+            elif hasattr(entry, 'summary'):
+                # Could be RSS <description> or Atom <summary>
+                # feedparser maps both to entry.summary
+                content = entry.summary if entry.summary else None
+                # Only add "Summary:" label for Atom feeds (which use <summary> tag)
+                if is_atom:
+                    add_label = True
+
+            # Add content with or without label
+            if content:
+                if add_label:
+                    item_parts.append(f'Summary:<br>{content}')
+                else:
+                    item_parts.append(content)
+            else:
+                # No content - just show <none>
+                item_parts.append('&lt;none&gt;')
+
+            # Join all parts of this item
+            if item_parts:
+                formatted_items.append('\n'.join(item_parts))
 
         # Wrap each item in a div with classes (first, last, item-N)
         items_html = []
@@ -195,8 +122,7 @@ def format_rss_items(rss_content: str, render_anchor_tag_content=False) -> str:
 
             class_str = ' '.join(classes)
             items_html.append(f'<div class="{class_str}">{item}</div>')
-
-        return '<html><body>\n' + "\n<br>".join(items_html) + '\n</body></html>'
+        return '<html><body>\n'+"\n<br><br>".join(items_html)+'\n</body></html>'
 
     except Exception as e:
         logger.warning(f"Error formatting RSS items: {str(e)}")

changedetectionio/run_basic_tests.sh

@@ -61,27 +61,15 @@ data_sanity_test () {
 
 data_sanity_test
 
-echo "-------------------- Running rest of tests in parallel -------------------------------"
-
 # REMOVE_REQUESTS_OLD_SCREENSHOTS disabled so that we can write a screenshot and send it in test_notifications.py without a real browser
-REMOVE_REQUESTS_OLD_SCREENSHOTS=false \
-pytest tests/test_*.py \
-  -n 30 \
-  --dist=load \
-  -vvv \
-  -s \
-  --capture=no \
-  --log-cli-level=DEBUG \
-  --log-cli-format="%(asctime)s [%(process)d] [%(levelname)s] %(name)s: %(message)s"
-
-echo "---------------------------- DONE parallel test ---------------------------------------"
+REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -n 30 --dist load  tests/test_*.py
 
+#time pytest -n auto --dist loadfile -vv --tb=long tests/test_*.py
 echo "RUNNING WITH BASE_URL SET"
 
 # Now re-run some tests with BASE_URL enabled
 # 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
 
 

changedetectionio/static/js/comparison-slider.js

@@ -1,173 +0,0 @@
-/**
- * Interactive Image Comparison Slider
- *
- * Allows users to drag a vertical slider to reveal differences between
- * two images (before/after comparison).
- */
-(function() {
-    'use strict';
-
-    function initComparisonSlider() {
-        const container = document.getElementById('comparison-container');
-        const slider = document.getElementById('comparison-slider');
-        const afterWrapper = container ? container.querySelector('.comparison-after') : null;
-        const handle = slider ? slider.querySelector('.comparison-handle') : null;
-
-        if (!container || !slider || !afterWrapper || !handle) {
-            return;
-        }
-
-        let isDragging = false;
-        let isMouseOverContainer = false;
-        let mouseY = 0;
-
-        /**
-         * Update handle position - follows mouse if hovering, or viewport center
-         */
-        function updateHandlePosition() {
-            const containerRect = container.getBoundingClientRect();
-            let handleTop;
-
-            if (isMouseOverContainer) {
-                // Mouse is over container - follow the mouse Y position
-                handleTop = mouseY - containerRect.top;
-            } else {
-                // Mouse not over container - use viewport center
-                const viewportCenter = window.innerHeight / 2;
-
-                if (containerRect.top > viewportCenter) {
-                    // Container is below viewport center - position handle at container top
-                    handleTop = 0;
-                } else if (containerRect.bottom < viewportCenter) {
-                    // Container is above viewport center - position handle at container bottom
-                    handleTop = containerRect.height;
-                } else {
-                    // Container spans viewport center - position handle at viewport center
-                    handleTop = viewportCenter - containerRect.top;
-                }
-            }
-
-            // Ensure handle stays within container bounds
-            handleTop = Math.max(24, Math.min(handleTop, containerRect.height - 24));
-
-            handle.style.top = handleTop + 'px';
-        }
-
-        /**
-         * Track mouse position over container
-         */
-        function onMouseMoveContainer(e) {
-            mouseY = e.clientY;
-            updateHandlePosition();
-        }
-
-        /**
-         * Mouse enters container
-         */
-        function onMouseEnter() {
-            isMouseOverContainer = true;
-        }
-
-        /**
-         * Mouse leaves container
-         */
-        function onMouseLeave() {
-            isMouseOverContainer = false;
-            updateHandlePosition();
-        }
-
-        /**
-         * Update slider position and clip-path
-         */
-        function updateSlider(clientX) {
-            const rect = container.getBoundingClientRect();
-            const pos = Math.max(0, Math.min(clientX - rect.left, rect.width));
-            const percentage = (pos / rect.width) * 100;
-
-            slider.style.left = percentage + '%';
-            afterWrapper.style.clipPath = `inset(0 0 0 ${percentage}%)`;
-        }
-
-        /**
-         * Handle move events (mouse or touch)
-         */
-        function onMove(e) {
-            if (!isDragging) return;
-            e.preventDefault();
-
-            const clientX = e.type.includes('touch') ? e.touches[0].clientX : e.clientX;
-            updateSlider(clientX);
-        }
-
-        /**
-         * Start dragging
-         */
-        function onStart(e) {
-            isDragging = true;
-            const clientX = e.type.includes('touch') ? e.touches[0].clientX : e.clientX;
-            updateSlider(clientX);
-        }
-
-        /**
-         * Stop dragging
-         */
-        function onEnd() {
-            isDragging = false;
-        }
-
-        /**
-         * Click anywhere on container to jump slider to that position
-         */
-        function onClick(e) {
-            if (e.target !== slider && !slider.contains(e.target)) {
-                const clientX = e.clientX;
-                updateSlider(clientX);
-            }
-        }
-
-        // Mouse events
-        slider.addEventListener('mousedown', onStart);
-        document.addEventListener('mousemove', onMove);
-        document.addEventListener('mouseup', onEnd);
-
-        // Touch events
-        slider.addEventListener('touchstart', onStart, { passive: false });
-        document.addEventListener('touchmove', onMove, { passive: false });
-        document.addEventListener('touchend', onEnd);
-
-        // Click anywhere on container to move slider
-        container.addEventListener('click', onClick);
-
-        // Track mouse position over container for handle following
-        container.addEventListener('mouseenter', onMouseEnter);
-        container.addEventListener('mouseleave', onMouseLeave);
-        container.addEventListener('mousemove', onMouseMoveContainer, { passive: true });
-
-        // Update handle position on scroll and resize
-        window.addEventListener('scroll', updateHandlePosition, { passive: true });
-        window.addEventListener('resize', updateHandlePosition, { passive: true });
-
-        // Initial position
-        updateHandlePosition();
-
-        // Cleanup on page unload
-        window.addEventListener('beforeunload', function() {
-            document.removeEventListener('mousemove', onMove);
-            document.removeEventListener('mouseup', onEnd);
-            document.removeEventListener('touchmove', onMove);
-            document.removeEventListener('touchend', onEnd);
-            container.removeEventListener('mouseenter', onMouseEnter);
-            container.removeEventListener('mouseleave', onMouseLeave);
-            container.removeEventListener('mousemove', onMouseMoveContainer);
-            window.removeEventListener('scroll', updateHandlePosition);
-            window.removeEventListener('resize', updateHandlePosition);
-        });
-    }
-
-    // Initialize when DOM is ready
-    if (document.readyState === 'loading') {
-        document.addEventListener('DOMContentLoaded', initComparisonSlider);
-    } else {
-        initComparisonSlider();
-    }
-})();

changedetectionio/static/js/diff-overview.js

@@ -1,92 +1,11 @@
-function setupDiffNavigation() {
-    var $fromSelect = $('#diff-from-version');
-    var $toSelect = $('#diff-to-version');
-    var $fromSelected = $fromSelect.find('option:selected');
-    var $toSelected = $toSelect.find('option:selected');
-
-    if ($fromSelected.length && $toSelected.length) {
-        // Find the previous pair (move both back one position)
-        var $prevFrom = $fromSelected.prev();
-        var $prevTo = $toSelected.prev();
-
-        // Find the next pair (move both forward one position)
-        var $nextFrom = $fromSelected.next();
-        var $nextTo = $toSelected.next();
-
-        // Build URL with current diff preferences
-        var currentParams = new URLSearchParams(window.location.search);
-
-        // Previous button: only show if both can move back
-        if ($prevFrom.length && $prevTo.length) {
-            currentParams.set('from_version', $prevFrom.val());
-            currentParams.set('to_version', $prevTo.val());
-            $('#btn-previous').attr('href', '?' + currentParams.toString());
-        } else {
-            $('#btn-previous').remove();
-        }
-
-        // Next button: only show if both can move forward
-        if ($nextFrom.length && $nextTo.length) {
-            currentParams.set('from_version', $nextFrom.val());
-            currentParams.set('to_version', $nextTo.val());
-            $('#btn-next').attr('href', '?' + currentParams.toString());
-        } else {
-            $('#btn-next').remove();
-        }
-    }
-
-    // Keyboard navigation
-    window.addEventListener('keydown', function (event) {
-        // Don't trigger if user is typing in an input field
-        if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA' || event.target.tagName === 'SELECT') {
-            return;
-        }
-
-        var $fromSelected = $fromSelect.find('option:selected');
-        var $toSelected = $toSelect.find('option:selected');
-
-        if ($fromSelected.length && $toSelected.length) {
-            if (event.key === 'ArrowLeft') {
-                var $prevFrom = $fromSelected.prev();
-                var $prevTo = $toSelected.prev();
-                if ($prevFrom.length && $prevTo.length) {
-                    var prevHref = $('#btn-previous').attr('href');
-                    if (prevHref) {
-                        event.preventDefault();
-                        window.location.href = prevHref;
-                    }
-                }
-            } else if (event.key === 'ArrowRight') {
-                var $nextFrom = $fromSelected.next();
-                var $nextTo = $toSelected.next();
-                if ($nextFrom.length && $nextTo.length) {
-                    var nextHref = $('#btn-next').attr('href');
-                    if (nextHref) {
-                        event.preventDefault();
-                        window.location.href = nextHref;
-                    }
-                }
-            }
-        }
-    }, false);
-}
-
 $(document).ready(function () {
     $('.needs-localtime').each(function () {
         for (var option of this.options) {
             var dateObject = new Date(option.value * 1000);
-            var formattedDate = dateObject.toLocaleString(undefined, {dateStyle: "full", timeStyle: "medium"});
-            // Preserve any existing text in the label (like "(Previous)" or "(Current)")
-            var existingText = option.text.replace(option.value, '').trim();
-            option.label = existingText ? formattedDate + ' ' + existingText : formattedDate;
+            option.label = dateObject.toLocaleString(undefined, {dateStyle: "full", timeStyle: "medium"});
         }
     });
 
-    // Setup keyboard navigation for diff versions
-    if ($('#diff-from-version').length && $('#diff-to-version').length) {
-        setupDiffNavigation();
-    }
-
     // Load it when the #screenshot tab is in use, so we dont give a slow experience when waiting for the text diff to load
     window.addEventListener('hashchange', function (e) {
         toggle(location.hash);
@@ -108,51 +27,16 @@ $(document).ready(function () {
         }
     }
 
-    const article = $('#difference')[0];
+    const article = $('.highlightable-filter')[0];
 
     // We could also add the  'touchend' event for touch devices, but since
     // most iOS/Android browsers already show a dialog when you select
     // text (often with a Share option) we'll skip that
-    if (article) {
-        article.addEventListener('mousedown', clean, false);
-    }
-
-    // Because they might 'mouse up' outside the article but on the page
-    const d_page = $(".difference-page")[0]
-    if (d_page ) {
-        d_page.addEventListener('mouseup', dragTextHandler, false);
-    }
-
-
-    $('#highlightSnippetActions a').bind('click', function (e) {
-        if (!window.getSelection().toString().trim().length) {
-            alert('Oops no text selected!');
-            return;
-        }
-
-        $.ajax({
-            type: "POST",
-            url: highlight_submit_ignore_url,
-            data: {'mode': $(this).data('mode'), 'selection': window.getSelection().toString()},
-            statusCode: {
-                400: function () {
-                    // More than likely the CSRF token was lost when the server restarted
-                    alert("There was a problem processing the request, please reload the page.");
-                }
-            }
-        }).done(function (data) {
-            // @todo some feedback
-            alert("'Ignore' Filters for this watch were updated.")
-            clean();
-
-        }).fail(function (data) {
-            console.log(data);
-            alert('There was an error communicating with the server.');
-        })
-    });
+    article.addEventListener('mouseup', dragTextHandler, false);
+    article.addEventListener('mousedown', clean, false);
 
     function clean(event) {
-        $('#bottom-horizontal-offscreen').hide();
+      $("#highlightSnippet").remove();
     }
 
     // Listen for Escape key press
@@ -167,9 +51,46 @@ $(document).ready(function () {
 
         // Check if any text was selected
         if (window.getSelection().toString().length > 0) {
-            $('#bottom-horizontal-offscreen').show();
-        } else {
-            clean();
+
+            // Find out how much (if any) user has scrolled
+            var scrollTop = (window.pageYOffset !== undefined) ? window.pageYOffset : (document.documentElement || document.body.parentNode || document.body).scrollTop;
+
+            // Get cursor position
+            const posX = event.clientX;
+            const posY = event.clientY + 20 + scrollTop;
+
+            // Append HTML to the body, create the "Tweet Selection" dialog
+            document.body.insertAdjacentHTML('beforeend', '<div id="highlightSnippet" style="position: absolute; top: ' + posY + 'px; left: ' + posX + 'px;"><div class="pure-form-message-inline" style="font-size: 70%">Ignore any change on any line which contains the selected text.</div><br><a data-mode="exact" href="javascript:void(0);" class="pure-button button-secondary button-xsmall">Ignore exact text</a>&nbsp;</div>');
+
+            if (/\d/.test(window.getSelection().toString())) {
+                // Offer regex replacement
+                document.getElementById("highlightSnippet").insertAdjacentHTML('beforeend', '<a data-mode="digit-regex"  href="javascript:void(0);" class="pure-button button-secondary button-xsmall">Ignore text including number changes</a>');
+            }
+
+            $('#highlightSnippet a').bind('click', function (e) {
+                if(!window.getSelection().toString().trim().length) {
+                    alert('Oops no text selected!');
+                    return;
+                }
+
+                $.ajax({
+                    type: "POST",
+                    url: highlight_submit_ignore_url,
+                    data: {'mode': $(this).data('mode'), 'selection': window.getSelection().toString()},
+                    statusCode: {
+                        400: function () {
+                            // More than likely the CSRF token was lost when the server restarted
+                            alert("There was a problem processing the request, please reload the page.");
+                        }
+                    }
+                }).done(function (data) {
+                    $("#highlightSnippet").html(data)
+                }).fail(function (data) {
+                    console.log(data);
+                    alert('There was an error communicating with the server.');
+                });
+            });
+
         }
     }
 
@@ -179,12 +100,4 @@ $(document).ready(function () {
             alert('Error - You are trying to compare the same version.');
         }
     });
-
-    // Auto-submit form on change of any input elements (checkboxes, radio buttons, dropdowns)
-    $('#diff-form').on('change', 'input[type="checkbox"], input[type="radio"], select', function (e) {
-        // Check if we're trying to compare the same version before submitting
-        if ($('select[name=from_version]').val() !== $('select[name=to_version]').val()) {
-            $('#diff-form').submit();
-        }
-    });
 });

changedetectionio/static/js/diff-render.js

@@ -1,152 +1,115 @@
 $(document).ready(function () {
-
-    // Find all <span> elements inside pre#difference
-    var inputs = $('#difference span').toArray();
-    inputs.current = 0;
-
-    // Setup visual minimap of difference locations (cells are pre-built in Python)
-    var $visualizer = $('#cell-diff-jump-visualiser');
-    var $difference = $('#difference');
-    var $cells = $visualizer.find('> div');
-    var visualizerResolutionCells = $cells.length;
-    var cellHeight;
-
-    if ($difference.length && visualizerResolutionCells > 0) {
-        var docHeight = $difference[0].scrollHeight;
-        cellHeight = docHeight / visualizerResolutionCells;
-
-        // Add click handlers to pre-built cells
-        $cells.each(function(i) {
-            $(this).data('cellIndex', i);
-            $(this).on('click', function() {
-                var cellIndex = $(this).data('cellIndex');
-                var targetPositionInDifference = cellIndex * cellHeight;
-                var viewportHeight = $(window).height();
-
-                // Scroll so target is at viewport center (where eyes expect it)
-                window.scrollTo({
-                    top: $difference.offset().top + targetPositionInDifference - (viewportHeight / 2),
-                    behavior: "smooth"
-                });
-            });
-        });
-    }
+    var a = document.getElementById("a");
+    var b = document.getElementById("b");
+    var result = document.getElementById("result");
+    var inputs;
 
     $('#jump-next-diff').click(function () {
-        if (!inputs || inputs.length === 0) return;
 
-        // Find the next change after current scroll position
-        var currentScrollPos = $(window).scrollTop();
-        var viewportHeight = $(window).height();
-        var currentCenter = currentScrollPos + (viewportHeight / 2);
-
-        // Add small buffer (50px) to jump past changes already near center
-        var searchFromPosition = currentCenter + 50;
-
-        var nextElement = null;
-        for (var i = 0; i < inputs.length; i++) {
-            var elementTop = $(inputs[i]).offset().top;
-            if (elementTop > searchFromPosition) {
-                nextElement = inputs[i];
-                break;
-            }
-        }
-
-        // If no element found ahead, wrap to first element
-        if (!nextElement) {
-            nextElement = inputs[0];
-        }
-
-        // Scroll to position the element at viewport center
-        var elementTop = $(nextElement).offset().top;
-        var targetScrollPos = elementTop - (viewportHeight / 2);
+        var element = inputs[inputs.current];
+        var headerOffset = 80;
+        var elementPosition = element.getBoundingClientRect().top;
+        var offsetPosition = elementPosition - headerOffset + window.scrollY;
 
         window.scrollTo({
-            top: targetScrollPos,
+            top: offsetPosition,
             behavior: "smooth",
         });
+
+        inputs.current++;
+        if (inputs.current >= inputs.length) {
+            inputs.current = 0;
+        }
     });
 
-    // Track current scroll position in visualizer
-    function updateVisualizerPosition() {
-        if (!$difference.length || visualizerResolutionCells === 0) return;
+    function changed() {
+        // https://github.com/kpdecker/jsdiff/issues/389
+        // I would love to use `{ignoreWhitespace: true}` here but it breaks the formatting
+        options = {
+            ignoreWhitespace: document.getElementById("ignoreWhitespace").checked,
+        };
 
-        var scrollTop = $(window).scrollTop();
-        var viewportHeight = $(window).height();
-        var viewportCenter = scrollTop + (viewportHeight / 2);
-        var differenceTop = $difference.offset().top;
-        var differenceHeight = $difference[0].scrollHeight;
-        var positionInDifference = viewportCenter - differenceTop;
-
-        // Handle edge case: if we're at max scroll, show last cell
-        // This prevents shorter documents from never reaching 100%
-        var maxScrollTop = $(document).height() - viewportHeight;
-        var isAtBottom = scrollTop >= maxScrollTop - 10; // 10px tolerance
-
-        // Calculate which cell we're currently viewing
-        var currentCell;
-        if (isAtBottom) {
-            currentCell = visualizerResolutionCells - 1;
-        } else {
-            currentCell = Math.floor(positionInDifference / cellHeight);
-            currentCell = Math.max(0, Math.min(currentCell, visualizerResolutionCells - 1));
-        }
-
-        // Remove previous active marker and add to current cell
-        $visualizer.find('> div').removeClass('current-position');
-        $visualizer.find('> div').eq(currentCell).addClass('current-position');
-    }
-
-    // Recalculate cellHeight on window resize
-    function handleResize() {
-        if ($difference.length) {
-            var docHeight = $difference[0].scrollHeight;
-            cellHeight = docHeight / visualizerResolutionCells;
-            updateVisualizerPosition();
-        }
-    }
-
-    // Debounce scroll and resize events to reduce CPU usage
-    $(window).on('scroll', updateVisualizerPosition.debounce(5));
-    $(window).on('resize', handleResize.debounce(100));
-
-    // Initial scroll to specific line if requested
-    if (typeof initialScrollToLineNumber !== 'undefined' && initialScrollToLineNumber !== null && $difference.length) {
-        // Convert line number to text position and scroll to it
-        var diffText = $difference.text();
-        var lines = diffText.split('\n');
-
-        if (initialScrollToLineNumber > 0 && initialScrollToLineNumber <= lines.length) {
-            // Calculate character position of the target line
-            var charPosition = 0;
-            for (var i = 0; i < initialScrollToLineNumber - 1; i++) {
-                charPosition += lines[i].length + 1; // +1 for newline
+        var diff = Diff[window.diffType](a.textContent, b.textContent, options);
+        var fragment = document.createDocumentFragment();
+        for (var i = 0; i < diff.length; i++) {
+            if (diff[i].added && diff[i + 1] && diff[i + 1].removed) {
+                var swap = diff[i];
+                diff[i] = diff[i + 1];
+                diff[i + 1] = swap;
             }
 
-            // Estimate vertical position based on average line height
-            var totalChars = diffText.length;
-            var totalHeight = $difference[0].scrollHeight;
-            var estimatedTop = (charPosition / totalChars) * totalHeight;
-
-            // Scroll to position with line at viewport center
-            var viewportHeight = $(window).height();
-            setTimeout(function() {
-                window.scrollTo({
-                    top: $difference.offset().top + estimatedTop - (viewportHeight / 2),
-                    behavior: "smooth"
-                });
-            }, 100); // Small delay to ensure page is fully loaded
+            var node;
+            if (diff[i].removed) {
+                node = document.createElement("del");
+                node.classList.add("change");
+                const wrapper = node.appendChild(document.createElement("span"));
+                wrapper.appendChild(document.createTextNode(diff[i].value));
+            } else if (diff[i].added) {
+                node = document.createElement("ins");
+                node.classList.add("change");
+                const wrapper = node.appendChild(document.createElement("span"));
+                wrapper.appendChild(document.createTextNode(diff[i].value));
+            } else {
+                node = document.createTextNode(diff[i].value);
+            }
+            fragment.appendChild(node);
         }
+
+        result.textContent = "";
+        result.appendChild(fragment);
+
+        // For nice mouse-over hover/title information
+        const removed_current_option = $('#diff-version option:selected')
+        if (removed_current_option) {
+            $('del').each(function () {
+                $(this).prop('title', 'Removed '+removed_current_option[0].label);
+            });
+        }
+        const inserted_current_option = $('#current-version option:selected')
+        if (removed_current_option) {
+            $('ins').each(function () {
+                $(this).prop('title', 'Inserted '+inserted_current_option[0].label);
+            });
+        }
+        // Set the list of possible differences to jump to
+        inputs = document.querySelectorAll('#diff-ui .change')
+        // Set the "current" diff pointer
+        inputs.current = 0;
+        // Goto diff
+        $('#jump-next-diff').click();
     }
 
-    // Initial position update
-    if ($difference.length && cellHeight) {
-        updateVisualizerPosition();
+
+    onDiffTypeChange(
+        document.querySelector('#settings [name="diff_type"]:checked'),
+    );
+    changed();
+
+    a.onpaste = a.onchange = b.onpaste = b.onchange = changed;
+
+    if ("oninput" in a) {
+        a.oninput = b.oninput = changed;
+    } else {
+        a.onkeyup = b.onkeyup = changed;
     }
 
-    function changed() {
-        //$('#jump-next-diff').click();
+    function onDiffTypeChange(radio) {
+        window.diffType = radio.value;
+        // Not necessary
+        //	document.title = "Diff " + radio.value.slice(4);
     }
 
+    var radio = document.getElementsByName("diff_type");
+    for (var i = 0; i < radio.length; i++) {
+        radio[i].onchange = function (e) {
+            onDiffTypeChange(e.target);
+            changed();
+        };
+    }
+
+    document.getElementById("ignoreWhitespace").onchange = function (e) {
+        changed();
+    };
+
 });
 

changedetectionio/static/js/global-settings.js

@@ -24,19 +24,6 @@ $(document).ready(function () {
         $(target).toggle();
     });
 
-    // Handle processor radio button changes - update body class
-    $('input[name="processor"]').on('change', function() {
-        var selectedProcessor = $(this).val();
-
-        // Remove any existing processor-* classes from body
-        $('body').removeClass(function(index, className) {
-            return (className.match(/\bprocessor-\S+/g) || []).join(' ');
-        });
-
-        // Add the new processor class
-        $('body').addClass('processor-' + selectedProcessor);
-    });
-
     // Time zone config related
     $(".local-time").each(function (e) {
         $(this).text(new Date($(this).data("utc")).toLocaleString());

changedetectionio/static/js/language-selector.js

@@ -1,55 +0,0 @@
-/**
- * Language selector modal functionality
- * 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');
-
-  if (!languageButton || !languageModal) {
-    return;
-  }
-
-  // Open modal when language button is clicked
-  languageButton.addEventListener('click', function(e) {
-    e.preventDefault();
-    languageModal.showModal();
-  });
-
-  // Close modal when cancel button is clicked
-  if (closeButton) {
-    closeButton.addEventListener('click', function() {
-      languageModal.close();
-    });
-  }
-
-  // Close modal when clicking outside (on backdrop)
-  languageModal.addEventListener('click', function(e) {
-    const rect = languageModal.getBoundingClientRect();
-    if (
-      e.clientY < rect.top ||
-      e.clientY > rect.bottom ||
-      e.clientX < rect.left ||
-      e.clientX > rect.right
-    ) {
-      languageModal.close();
-    }
-  });
-
-  // Close modal on Escape key
-  languageModal.addEventListener('cancel', function(e) {
-    e.preventDefault();
-    languageModal.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');
-    }
-  });
-});

changedetectionio/static/js/modal.js

@@ -1,194 +0,0 @@
-/**
- * Modern modal dialog system using HTML5 <dialog> element
- * Provides accessible, animated confirmation dialogs
- */
-
-const ModalDialog = {
-  /**
-   * Show a confirmation dialog
-   * @param {Object} options - Configuration options
-   * @param {string} options.title - Dialog title
-   * @param {string} options.message - Dialog message (can include HTML)
-   * @param {string} options.type - Dialog type: 'danger', 'warning', or 'info' (default: 'info')
-   * @param {string} options.confirmText - Confirm button text (default: 'Confirm')
-   * @param {string} options.cancelText - Cancel button text (default: 'Cancel')
-   * @param {Function} options.onConfirm - Callback when confirmed
-   * @param {Function} options.onCancel - Callback when cancelled (optional)
-   * @returns {Promise} Resolves with true if confirmed, false if cancelled
-   */
-  confirm: function(options) {
-    return new Promise((resolve) => {
-      const defaults = {
-        title: 'Confirm Action',
-        message: 'Are you sure?',
-        type: 'info',
-        confirmText: 'Confirm',
-        cancelText: 'Cancel',
-        onConfirm: null,
-        onCancel: null
-      };
-
-      const config = { ...defaults, ...options };
-
-      // Icon mapping
-      const icons = {
-        danger: '⚠️',
-        warning: '⚠️',
-        info: 'ℹ️'
-      };
-
-      // Create dialog element
-      const dialog = document.createElement('dialog');
-      dialog.className = 'modal-dialog';
-      dialog.setAttribute('aria-labelledby', 'modal-title');
-      dialog.setAttribute('aria-describedby', 'modal-body');
-
-      // Build dialog content
-      dialog.innerHTML = `
-        <div class="modal-header">
-          <span class="modal-icon ${config.type}">${icons[config.type] || icons.info}</span>
-          <h2 class="modal-title" id="modal-title">${config.title}</h2>
-        </div>
-        <div class="modal-body" id="modal-body">
-          ${config.message}
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="modal-btn-cancel pure-button" data-action="cancel">
-            ${config.cancelText}
-          </button>
-          <button type="button" class="modal-btn-${config.type} pure-button" data-action="confirm">
-            ${config.confirmText}
-          </button>
-        </div>
-      `;
-
-      // Append to body
-      document.body.appendChild(dialog);
-
-      // Handle button clicks
-      const handleClose = (confirmed) => {
-        dialog.close();
-        setTimeout(() => {
-          dialog.remove();
-        }, 200);
-
-        if (confirmed && config.onConfirm) {
-          config.onConfirm();
-        } else if (!confirmed && config.onCancel) {
-          config.onCancel();
-        }
-
-        resolve(confirmed);
-      };
-
-      // Attach event listeners
-      dialog.querySelector('[data-action="confirm"]').addEventListener('click', () => {
-        handleClose(true);
-      });
-
-      dialog.querySelector('[data-action="cancel"]').addEventListener('click', () => {
-        handleClose(false);
-      });
-
-      // Handle Escape key
-      dialog.addEventListener('cancel', (e) => {
-        e.preventDefault();
-        handleClose(false);
-      });
-
-      // Handle backdrop click
-      dialog.addEventListener('click', (e) => {
-        const rect = dialog.getBoundingClientRect();
-        if (
-          e.clientY < rect.top ||
-          e.clientY > rect.bottom ||
-          e.clientX < rect.left ||
-          e.clientX > rect.right
-        ) {
-          handleClose(false);
-        }
-      });
-
-      // Show dialog
-      dialog.showModal();
-
-      // Focus confirm button for accessibility
-      setTimeout(() => {
-        dialog.querySelector('[data-action="confirm"]').focus();
-      }, 100);
-    });
-  },
-
-  /**
-   * Helper method for delete confirmations
-   * @param {string} itemName - Name of the item being deleted
-   * @param {Function} onConfirm - Callback when confirmed
-   */
-  confirmDelete: function(itemName, onConfirm) {
-    return this.confirm({
-      title: 'Delete ' + itemName + '?',
-      message: `<p>Are you sure you want to delete <strong>${itemName}</strong>?</p><p>This action cannot be undone.</p>`,
-      type: 'danger',
-      confirmText: 'Delete',
-      cancelText: 'Cancel',
-      onConfirm: onConfirm
-    });
-  },
-
-  /**
-   * Helper method for unlink confirmations
-   * @param {string} itemName - Name of the item being unlinked
-   * @param {Function} onConfirm - Callback when confirmed
-   */
-  confirmUnlink: function(itemName, onConfirm) {
-    return this.confirm({
-      title: 'Unlink ' + itemName + '?',
-      message: `<p>Are you sure you want to unlink all watches from <strong>${itemName}</strong>?</p><p>The tag will be kept but watches will be removed from it.</p>`,
-      type: 'warning',
-      confirmText: 'Unlink',
-      cancelText: 'Cancel',
-      onConfirm: onConfirm
-    });
-  }
-};
-
-// Make available globally
-window.ModalDialog = ModalDialog;
-
-/**
- * Auto-attach modal confirmations to links with data-requires-confirm attribute
- * Usage in HTML:
- * <a href="/delete"
- *    data-requires-confirm
- *    data-confirm-type="danger"
- *    data-confirm-title="Delete Item?"
- *    data-confirm-message="Are you sure?"
- *    data-confirm-button="Delete">
- */
-$(document).ready(function() {
-  $(document).on('click', 'a[data-requires-confirm], button[data-requires-confirm]', function(e) {
-    e.preventDefault();
-    const $element = $(this);
-    const url = $element.attr('href');
-
-    const config = {
-      type: $element.data('confirm-type') || 'danger',
-      title: $element.data('confirm-title') || 'Confirm Action',
-      message: $element.data('confirm-message') || '<p>Are you sure you want to proceed?</p>',
-      confirmText: $element.data('confirm-button') || 'Confirm',
-      cancelText: $element.data('cancel-button') || 'Cancel',
-      onConfirm: function() {
-        // If it's a link, navigate to the URL
-        if ($element.is('a')) {
-          window.location.href = url;
-        }
-        // If it's a button in a form, submit the form
-        else if ($element.is('button')) {
-          $element.closest('form').submit();
-        }
-      }
-    };
-
-    ModalDialog.confirm(config);
-  });
-});

changedetectionio/static/js/plugins.js

@@ -62,12 +62,15 @@
             const textContent = $pre.text();
             const lines = textContent.split(/\r?\n/); // Handles both \n and \r\n line endings
 
-            // Build a map of line numbers to their configuration index
-            const lineConfigIndex = {};
+            // Build a map of line numbers to styles
+            const lineStyles = {};
 
-            configurations.forEach((config, index) =>
-                config.lines.forEach(lineNumber => lineConfigIndex[lineNumber] = index)
-            );
+            configurations.forEach(config => {
+                const {color, lines: lineNumbers} = config;
+                lineNumbers.forEach(lineNumber => {
+                    lineStyles[lineNumber] = color;
+                });
+            });
 
             // Function to escape HTML characters
             function escapeHtml(text) {
@@ -80,12 +83,11 @@
             const processedLines = lines.map((line, index) => {
                 const lineNumber = index + 1; // Line numbers start at 1
                 const escapedLine = escapeHtml(line);
-                const configIndex = lineConfigIndex[lineNumber];
+                const color = lineStyles[lineNumber];
 
-                if (configIndex !== undefined) {
-                    const config = configurations[configIndex];
+                if (color) {
                     // Wrap the line in a span with inline style
-                    return `<span title="${config.title}" style="background-color: ${config.color}">${escapedLine}</span>`;
+                    return `<span style="background-color: ${color}">${escapedLine}</span>`;
                 } else {
                     return escapedLine;
                 }
@@ -98,7 +100,6 @@
             $pre.html(newContent);
         });
     };
-
     $.fn.miniTabs = function (tabsConfig, options) {
         const settings = {
             tabClass: 'minitab',

changedetectionio/static/js/preview.js

@@ -53,21 +53,11 @@ $(document).ready(function () {
     if ($('#preview-version').length) {
         setupDateWidget();
     }
-    $('pre#difference').highlightLines([
+
+    $('#diff-col > pre').highlightLines([
         {
-            'color': 'var(--highlight-trigger-text-bg-color)',
-            'lines': triggered_line_numbers,
-            'title': "Triggers a change if this text appears, AND something changed in the document."
-        },
-        {
-            'color': 'var(--highlight-ignored-text-bg-color)',
-            'lines': ignored_line_numbers,
-            'title': "Ignored for calculating changes, but still shown."
-        },
-        {
-            'color': 'var(--highlight-blocked-text-bg-color)',
-            'lines': blocked_line_numbers,
-            'title': "No change-detection will occur because this text exists."
+            'color': '#ee0000',
+            'lines': triggered_line_numbers
         }
     ]);
 });

changedetectionio/static/js/realtime.js

@@ -29,45 +29,18 @@ $(document).ready(function () {
 
         $('#checkbox-operations button').on('click.socketHandlerNamespace', function (e) {
             e.preventDefault();
-            const $button = $(this);
-            const op = $button.val();
+            const op = $(this).val();
             const checkedUuids = $('input[name="uuids"]:checked').map(function () {
                 return this.value.trim();
             }).get();
-
-            // Check if this button requires confirmation
-            console.log('Button clicked, op:', op, 'requires-confirm:', $button.is('[data-requires-confirm]'));
-            if ($button.is('[data-requires-confirm]')) {
-                console.log('Showing modal confirmation for operation:', op);
-                const config = {
-                    type: $button.data('confirm-type') || 'danger',
-                    title: $button.data('confirm-title') || 'Confirm Action',
-                    message: $button.data('confirm-message') || '<p>Are you sure you want to proceed?</p>',
-                    confirmText: $button.data('confirm-button') || 'Confirm',
-                    cancelText: $button.data('cancel-button') || 'Cancel',
-                    onConfirm: function() {
-                        console.log(`Socket.IO: Sending watch operation '${op}' for UUIDs:`, checkedUuids);
-                        socket.emit('checkbox-operation', {
-                            op: op,
-                            uuids: checkedUuids,
-                            extra_data: $('#op_extradata').val()
-                        });
-                        $('input[name="uuids"]:checked').prop('checked', false);
-                        $('#check-all:checked').prop('checked', false);
-                    }
-                };
-                ModalDialog.confirm(config);
-            } else {
-                console.log(`Socket.IO: Sending watch operation '${op}' for UUIDs:`, checkedUuids);
-                socket.emit('checkbox-operation', {
-                    op: op,
-                    uuids: checkedUuids,
-                    extra_data: $('#op_extradata').val()
-                });
-                $('input[name="uuids"]:checked').prop('checked', false);
-                $('#check-all:checked').prop('checked', false);
-            }
-
+            console.log(`Socket.IO: Sending watch operation '${op}' for UUIDs:`, checkedUuids);
+            socket.emit('checkbox-operation', {
+                op: op,
+                uuids: checkedUuids,
+                extra_data: $('#op_extradata').val() // Set by the alert() handler
+            });
+            $('input[name="uuids"]:checked').prop('checked', false);
+            $('#check-all:checked').prop('checked', false);
             return false;
         });
 
@@ -128,11 +101,6 @@ $(document).ready(function () {
                 }
             });
 
-            socket.on('watch_small_status_comment', function (data) {
-                console.log(`Socket.IO: Operation  watch_small_status_comment'${data.uuid}' status ${data.status}`);
-                $('tr[data-watch-uuid="' + data.uuid + '"] td.last-checked .status-text').html("&nbsp;").text(data.status);
-            });
-
             socket.on('notification_event', function (data) {
                 console.log(`Stub handler for notification_event ${data.watch_uuid}`)
             });

changedetectionio/static/js/snippet-to-image.js

@@ -1,729 +0,0 @@
-/**
- * snippet-to-image.js
- * Converts selected diff content to a shareable JPEG image with metadata
- */
-
-// Constants
-const IMAGE_PADDING = 5;
-const JPEG_QUALITY = 0.95;
-const CANVAS_SCALE = 1;
-const RENDER_DELAY_MS = 50;
-
-/**
- * Utility: Get the target URL from global watch_url or fallback to current URL
- */
-function getTargetUrl() {
-    return (typeof watch_url !== 'undefined' && watch_url) ? watch_url : window.location.href;
-}
-
-/**
- * Utility: Get formatted current date with timezone
- */
-function getFormattedDate() {
-    return new Date().toLocaleString(undefined, {
-        year: 'numeric',
-        month: 'long',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit',
-        second: '2-digit',
-        timeZoneName: 'short'
-    });
-}
-
-/**
- * Utility: Get version comparison info from the diff selectors
- */
-function getVersionInfo() {
-    const fromSelect = document.getElementById('diff-from-version');
-    const toSelect = document.getElementById('diff-to-version');
-
-    if (!fromSelect || !toSelect) {
-        return '';
-    }
-
-    const fromOption = fromSelect.options[fromSelect.selectedIndex];
-    const toOption = toSelect.options[toSelect.selectedIndex];
-    const fromLabel = fromOption ? (fromOption.getAttribute('label') || fromOption.text) : 'Unknown';
-    const toLabel = toOption ? (toOption.getAttribute('label') || toOption.text) : 'Unknown';
-
-    return `Change comparison from <strong>${fromLabel}</strong> to <strong>${toLabel}</strong>`;
-}
-
-/**
- * Helper: Find text node containing newline in a given direction
- */
-function findTextNodeWithNewline(node, searchBackwards = false) {
-    if (node.nodeType === Node.TEXT_NODE) {
-        const text = node.textContent;
-        const idx = searchBackwards ? text.lastIndexOf('\n') : text.indexOf('\n');
-        if (idx !== -1) {
-            return { node, offset: searchBackwards ? idx + 1 : idx };
-        }
-    } else {
-        const walker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT);
-        let textNode;
-        while (textNode = walker.nextNode()) {
-            const text = textNode.textContent;
-            const idx = searchBackwards ? text.lastIndexOf('\n') : text.indexOf('\n');
-            if (idx !== -1) {
-                return { node: textNode, offset: searchBackwards ? idx + 1 : idx };
-            }
-        }
-    }
-    return null;
-}
-
-/**
- * Helper: Walk through siblings in a given direction to find line boundary
- */
-function findLineBoundary(node, container, searchBackwards = false) {
-    let currentNode = node;
-
-    while (currentNode && currentNode !== container) {
-        const sibling = searchBackwards ? currentNode.previousSibling : currentNode.nextSibling;
-        let currentSibling = sibling;
-
-        while (currentSibling) {
-            const result = findTextNodeWithNewline(currentSibling, searchBackwards);
-            if (result) {
-                return result;
-            }
-            currentSibling = searchBackwards ? currentSibling.previousSibling : currentSibling.nextSibling;
-        }
-
-        currentNode = currentNode.parentNode;
-    }
-
-    return null;
-}
-
-/**
- * Helper: Get the last text node in a container
- */
-function getLastTextNode(container) {
-    const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT);
-    let lastNode = null;
-    let textNode;
-    while (textNode = walker.nextNode()) {
-        lastNode = textNode;
-    }
-    return lastNode;
-}
-
-/**
- * Expands a selection range to include complete lines
- * If a user selects partial text, this ensures full lines are captured
- */
-function expandRangeToFullLines(range, container) {
-    const newRange = range.cloneRange();
-
-    // Expand start to line beginning
-    if (newRange.startContainer.nodeType === Node.TEXT_NODE) {
-        const text = newRange.startContainer.textContent;
-        const lastNewline = text.lastIndexOf('\n', newRange.startOffset - 1);
-        if (lastNewline !== -1) {
-            newRange.setStart(newRange.startContainer, lastNewline + 1);
-        } else {
-            const lineStart = findLineBoundary(newRange.startContainer, container, true);
-            if (lineStart) {
-                newRange.setStart(lineStart.node, lineStart.offset);
-            } else {
-                newRange.setStart(container, 0);
-            }
-        }
-    }
-
-    // Expand end to line end
-    if (newRange.endContainer.nodeType === Node.TEXT_NODE) {
-        const text = newRange.endContainer.textContent;
-        const nextNewline = text.indexOf('\n', newRange.endOffset);
-        if (nextNewline !== -1) {
-            newRange.setEnd(newRange.endContainer, nextNewline);
-        } else {
-            const lineEnd = findLineBoundary(newRange.endContainer, container, false);
-            if (lineEnd) {
-                newRange.setEnd(lineEnd.node, lineEnd.offset);
-            } else {
-                const lastNode = getLastTextNode(container);
-                newRange.setEnd(
-                    lastNode || container,
-                    lastNode ? lastNode.textContent.length : container.childNodes.length
-                );
-            }
-        }
-    }
-
-    return newRange;
-}
-
-/**
- * Create a temporary element with the selected content styled for capture
- */
-function createCaptureElement(selectedFragment, originalElement) {
-    const originalStyles = window.getComputedStyle(originalElement);
-
-    // Create container with watermark background
-    const container = document.createElement("div");
-    container.innerHTML = `
-        <div style="
-            position: absolute;
-            left: -9999px;
-            top: 0;
-            padding: 2px;
-            background-color: transparent;
-        ">
-        <div style="
-            background-color: #ffffff;
-            width: ${originalElement.offsetWidth}px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            overflow: hidden;
-        ">
-            <!-- Watermark background -->
-            <div style="
-                position: absolute;
-                top: 0;
-                left: 0;
-                width: 100%;
-                height: 100%;
-                overflow: hidden;
-                pointer-events: none;
-                z-index: 0;
-                background-image: url(&quot;data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='400' height='200' viewBox='0 0 400 200'><g font-family='Arial' font-size='18' font-weight='700' fill='%23e8e8e8' transform='rotate(-45 200 100)'><text x='0' y='40'>changedetection.io   changedetection.io   changedetection.io</text><text x='0' y='100'>changedetection.io   changedetection.io   changedetection.io</text><text x='0' y='160'>changedetection.io   changedetection.io   changedetection.io</text></g></svg>&quot;);
-                background-repeat: repeat;
-                background-size: 400px 200px;
-            "></div>
-
-            <!-- Content -->
-            <pre id="temp-capture-element" style="
-                position: relative;
-                z-index: 1;
-                white-space: ${originalStyles.whiteSpace};
-                font-family: ${originalStyles.fontFamily};
-                font-size: ${originalStyles.fontSize};
-                line-height: ${originalStyles.lineHeight};
-                color: ${originalStyles.color};
-                word-wrap: ${originalStyles.wordWrap};
-                overflow-wrap: ${originalStyles.overflowWrap};
-                background-color: transparent;
-                padding: ${IMAGE_PADDING}px;
-                border: ${originalStyles.border};
-                box-sizing: border-box;
-                margin: 0;
-            "></pre>
-        </div>
-        </div>
-    `;
-
-    const outerWrapper = container.firstElementChild;
-    const innerWrapper = outerWrapper.querySelector('div');
-    const tempElement = innerWrapper.querySelector('#temp-capture-element');
-    tempElement.appendChild(selectedFragment);
-
-    // Store innerWrapper for footer appending
-    outerWrapper._innerWrapper = innerWrapper;
-
-    return outerWrapper;
-}
-
-/**
- * Count lines in a text string or document fragment
- */
-function countLines(content) {
-    if (!content) return 0;
-
-    let text = '';
-    if (typeof content === 'string') {
-        text = content;
-    } else if (content.textContent) {
-        text = content.textContent;
-    }
-
-    // Count newlines + 1 (for the last line)
-    const lines = text.split('\n').length;
-    return lines > 0 ? lines : 1;
-}
-
-/**
- * Create footer with metadata (URL, version info, line count)
- */
-function createFooter(selectedLines, totalLines) {
-    const url = getTargetUrl();
-    const versionInfo = getVersionInfo();
-    const lineInfo = (selectedLines && totalLines) ? ` - ${selectedLines} of ${totalLines} lines selected` : '';
-
-    const footer = document.createElement("div");
-    footer.innerHTML = `
-        <div style="
-            position: relative;
-            z-index: 1;
-            background-color: #1324fd;
-            color: #fff;
-            padding: 10px;
-            margin-top: 10px;
-            font-size: 12px;
-            font-family: Arial, sans-serif;
-            line-height: 1.5;
-            border-top: 1px solid #ccc;
-        ">
-            Watched URL: <strong>${url}</strong><br>
-            ${versionInfo}${lineInfo}<br>
-            Monitored via automated content change detection on public webpages. Data reflects observed text updates, not editorial verification.
-        </div>
-    `;
-
-    return footer.firstElementChild;
-}
-
-/**
- * Add EXIF metadata to JPEG image
- */
-function addExifMetadata(jpegDataUrl) {
-    if (typeof piexif === 'undefined') {
-        return jpegDataUrl;
-    }
-
-    try {
-        const url = getTargetUrl();
-        const timestamp = new Date().toISOString();
-
-        const exifObj = {
-            "0th": {
-                [piexif.ImageIFD.Software]: "changedetection.io",
-                [piexif.ImageIFD.ImageDescription]: `Diff snapshot from ${url}`,
-                [piexif.ImageIFD.Copyright]: "Generated by changedetection.io"
-            },
-            "Exif": {
-                [piexif.ExifIFD.DateTimeOriginal]: timestamp,
-                [piexif.ExifIFD.UserComment]: `URL: ${url} | Captured: ${timestamp} | Source: changedetection.io`
-            }
-        };
-
-        const exifBytes = piexif.dump(exifObj);
-        return piexif.insert(exifBytes, jpegDataUrl);
-    } catch (error) {
-        console.warn("Failed to add EXIF metadata:", error);
-        return jpegDataUrl;
-    }
-}
-
-/**
- * Convert data URL to Blob for sharing
- */
-function dataURLtoBlob(dataURL) {
-    const parts = dataURL.split(',');
-    const byteString = atob(parts[1]);
-    const mimeString = parts[0].split(':')[1].split(';')[0];
-    const ab = new ArrayBuffer(byteString.length);
-    const ia = new Uint8Array(ab);
-    for (let i = 0; i < byteString.length; i++) {
-        ia[i] = byteString.charCodeAt(i);
-    }
-    return new Blob([ab], { type: mimeString });
-}
-
-/**
- * Download the image
- */
-function downloadImage(jpegDataUrl) {
-    const a = document.createElement("a");
-    a.href = jpegDataUrl;
-    a.download = "changedetection-diff-" + Date.now() + ".jpg";
-    a.click();
-}
-
-/**
- * Copy image to clipboard
- */
-async function copyImageToClipboard(jpegDataUrl) {
-    try {
-        const blob = dataURLtoBlob(jpegDataUrl);
-        await navigator.clipboard.write([
-            new ClipboardItem({ 'image/jpeg': blob })
-        ]);
-        alert('Image copied to clipboard!');
-    } catch (error) {
-        console.error('Failed to copy image:', error);
-        alert('Failed to copy image. Your browser may not support this feature.');
-    }
-}
-
-/**
- * Share via Web Share API or fallback to platform-specific sharing
- */
-async function shareImage(platform, jpegDataUrl) {
-    const url = getTargetUrl();
-    const shareText = `Check out this change detected on ${url} via changedetection.io`;
-    const filename = "changedetection-diff-" + Date.now() + ".jpg";
-
-    // Try Web Share API first (works on mobile and some desktop browsers)
-    if (platform === 'native' && navigator.share) {
-        try {
-            const blob = dataURLtoBlob(jpegDataUrl);
-            const file = new File([blob], filename, { type: 'image/jpeg' });
-
-            await navigator.share({
-                title: 'Change Detection Diff',
-                text: shareText,
-                files: [file]
-            });
-            return;
-        } catch (error) {
-            if (error.name !== 'AbortError') {
-                console.error('Web Share API failed:', error);
-            }
-            return;
-        }
-    }
-
-    // Platform-specific fallbacks
-    const encodedText = encodeURIComponent(shareText);
-    const encodedUrl = encodeURIComponent(url);
-
-    let shareUrl;
-    switch (platform) {
-        case 'twitter':
-            shareUrl = `https://twitter.com/intent/tweet?text=${encodedText}`;
-            break;
-        case 'facebook':
-            shareUrl = `https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}&quote=${encodedText}`;
-            break;
-        case 'linkedin':
-            shareUrl = `https://www.linkedin.com/sharing/share-offsite/?url=${encodedUrl}`;
-            break;
-        case 'reddit':
-            shareUrl = `https://reddit.com/submit?url=${encodedUrl}&title=${encodeURIComponent('Change Detection Diff')}`;
-            break;
-        case 'email':
-            shareUrl = `mailto:?subject=${encodeURIComponent('Change Detection Diff')}&body=${encodedText}`;
-            break;
-        default:
-            return;
-    }
-
-    window.open(shareUrl, '_blank', 'width=600,height=400');
-}
-
-/**
- * Display or download the generated image
- */
-function displayImage(jpegDataUrl) {
-    const win = window.open();
-    if (win) {
-        win.document.write(`
-            <html>
-                <head>
-                    <title>Diff Screenshot</title>
-                    <style>
-                        body {
-                            margin: 0;
-                            padding: 20px;
-                            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Arial, sans-serif;
-                            background: #f5f5f5;
-                        }
-                        .container {
-                            max-width: 1200px;
-                            margin: 0 auto;
-                            background: white;
-                            padding: 20px;
-                            border-radius: 8px;
-                            box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-                        }
-                        img {
-                            max-width: 100%;
-                            display: block;
-                            margin-bottom: 20px;
-                            border: 1px solid #ddd;
-                            border-radius: 4px;
-                        }
-                        .share-section {
-                            padding: 20px 0;
-                            border-top: 2px solid #e0e0e0;
-                        }
-                        .share-section h3 {
-                            margin: 0 0 15px 0;
-                            color: #333;
-                            font-size: 18px;
-                        }
-                        .share-buttons {
-                            display: flex;
-                            flex-wrap: wrap;
-                            gap: 10px;
-                        }
-                        .share-btn {
-                            padding: 10px 20px;
-                            border: none;
-                            border-radius: 6px;
-                            font-size: 14px;
-                            font-weight: 600;
-                            cursor: pointer;
-                            transition: all 0.2s;
-                            text-decoration: none;
-                            display: inline-flex;
-                            align-items: center;
-                            gap: 8px;
-                        }
-                        .share-btn:hover {
-                            transform: translateY(-2px);
-                            box-shadow: 0 4px 12px rgba(0,0,0,0.15);
-                        }
-                        .btn-download {
-                            background: #4CAF50;
-                            color: white;
-                        }
-                        .btn-native {
-                            background: #2196F3;
-                            color: white;
-                        }
-                        .btn-twitter {
-                            background: #000000;
-                            color: white;
-                        }
-                        .btn-facebook {
-                            background: #1877F2;
-                            color: white;
-                        }
-                        .btn-linkedin {
-                            background: #0A66C2;
-                            color: white;
-                        }
-                        .btn-reddit {
-                            background: #FF4500;
-                            color: white;
-                        }
-                        .btn-email {
-                            background: #757575;
-                            color: white;
-                        }
-                    </style>
-                </head>
-                <body>
-                    <div class="container">
-                        <img src="${jpegDataUrl}" alt="Diff Screenshot" id="diffImage"/>
-
-                        <div class="share-section">
-                            <h3>Share or Download</h3>
-                            <p style="margin: 0 0 15px 0; padding: 12px; background: #f0f7ff; border-left: 4px solid #2196F3; color: #333; font-size: 14px; line-height: 1.5;">
-                                <strong>💡 Tip:</strong> Right-click the image above and select "Copy Image", then click a share button below and paste it into your post (Ctrl+V or right-click → Paste).
-                            </p>
-                            <div class="share-buttons">
-                                <button class="share-btn btn-download" onclick="downloadImage()">
-                                    📥 Download Image
-                                </button>
-                                ${navigator.share ? '<button class="share-btn btn-native" onclick="shareNative()">📤 Share...</button>' : ''}
-                                <button class="share-btn btn-twitter" onclick="shareToTwitter()">
-                                    𝕏 Share to X
-                                </button>
-                                <button class="share-btn btn-facebook" onclick="shareToFacebook()">
-                                    Share to Facebook
-                                </button>
-                                <button class="share-btn btn-linkedin" onclick="shareToLinkedIn()">
-                                    Share to LinkedIn
-                                </button>
-                                <button class="share-btn btn-reddit" onclick="shareToReddit()">
-                                    Share to Reddit
-                                </button>
-                                <button class="share-btn btn-email" onclick="shareViaEmail()">
-                                    📧 Share via Email
-                                </button>
-                            </div>
-                        </div>
-                    </div>
-
-                    <script>
-                        const imageDataUrl = "${jpegDataUrl}";
-
-                        function dataURLtoBlob(dataURL) {
-                            const parts = dataURL.split(',');
-                            const byteString = atob(parts[1]);
-                            const mimeString = parts[0].split(':')[1].split(';')[0];
-                            const ab = new ArrayBuffer(byteString.length);
-                            const ia = new Uint8Array(ab);
-                            for (let i = 0; i < byteString.length; i++) {
-                                ia[i] = byteString.charCodeAt(i);
-                            }
-                            return new Blob([ab], { type: mimeString });
-                        }
-
-                        function downloadImage() {
-                            const a = document.createElement("a");
-                            a.href = imageDataUrl;
-                            a.download = "changedetection-diff-" + Date.now() + ".jpg";
-                            a.click();
-                        }
-
-                        async function shareNative() {
-                            try {
-                                const blob = dataURLtoBlob(imageDataUrl);
-                                const file = new File([blob], "changedetection-diff-" + Date.now() + ".jpg", { type: 'image/jpeg' });
-                                await navigator.share({
-                                    title: 'Change Detection Diff',
-                                    text: 'Check out this change detected via changedetection.io',
-                                    files: [file]
-                                });
-                            } catch (error) {
-                                if (error.name !== 'AbortError') {
-                                    console.error('Share failed:', error);
-                                }
-                            }
-                        }
-
-                        function shareToTwitter() {
-                            const text = encodeURIComponent('Check out this change detected via changedetection.io');
-                            window.open('https://twitter.com/intent/tweet?text=' + text, '_blank', 'width=600,height=400');
-                        }
-
-                        function shareToFacebook() {
-                            const cdUrl = encodeURIComponent('https://changedetection.io');
-                            window.open('https://www.facebook.com/sharer/sharer.php?u=' + cdUrl, '_blank', 'width=600,height=400');
-                        }
-
-                        function shareToLinkedIn() {
-                            const cdUrl = encodeURIComponent('https://changedetection.io');
-                            window.open('https://www.linkedin.com/sharing/share-offsite/?url=' + cdUrl, '_blank', 'width=600,height=400');
-                        }
-
-                        function shareToReddit() {
-                            const cdUrl = encodeURIComponent('https://changedetection.io');
-                            const title = encodeURIComponent('Change Detection Tool');
-                            window.open('https://reddit.com/submit?url=' + cdUrl + '&title=' + title, '_blank', 'width=600,height=400');
-                        }
-
-                        function shareViaEmail() {
-                            const subject = encodeURIComponent('Change Detection Diff');
-                            const body = encodeURIComponent('Check out this change detected via changedetection.io');
-                            window.location.href = 'mailto:?subject=' + subject + '&body=' + body;
-                        }
-                    </script>
-                </body>
-            </html>
-        `);
-    } else {
-        // Fallback: trigger download if popup is blocked
-        const a = document.createElement("a");
-        a.href = jpegDataUrl;
-        a.download = "changedetection-diff-" + Date.now() + ".jpg";
-        a.click();
-    }
-}
-
-/**
- * Update button UI state
- */
-function setButtonState(button, isLoading, originalHtml = '') {
-    if (!button) return;
-
-    if (isLoading) {
-        button.innerHTML = 'Generating...';
-        button.style.opacity = "0.5";
-        button.style.pointerEvents = "none";
-    } else {
-        button.innerHTML = originalHtml;
-        button.style.opacity = "1";
-        button.style.pointerEvents = "auto";
-    }
-}
-
-/**
- * Main function: Convert selected diff text to a shareable JPEG image
- *
- * Features:
- * - Expands partial selections to full lines
- * - Preserves all diff highlighting and formatting
- * - Adds metadata footer with URL and version info
- * - Embeds EXIF metadata in the JPEG
- * - Opens in new window or downloads if popup blocked
- */
-async function diffToJpeg() {
-    // Validate dependencies
-    if (typeof html2canvas === 'undefined') {
-        alert("html2canvas library is not loaded yet. Please wait a moment and try again.");
-        return;
-    }
-
-    // Validate selection
-    const selection = window.getSelection();
-    if (!selection || selection.rangeCount === 0 || selection.isCollapsed) {
-        alert("Please select the text/lines you want to capture first by highlighting with your mouse.");
-        return;
-    }
-
-    const originalRange = selection.getRangeAt(0);
-    const differenceElement = document.getElementById("difference");
-
-    if (!differenceElement || !differenceElement.contains(originalRange.commonAncestorContainer)) {
-        alert("Please select text within the diff content.");
-        return;
-    }
-
-    // Setup UI state
-    const btn = document.getElementById("share-as-image-btn");
-    const originalBtnHtml = btn ? btn.innerHTML : '';
-    setButtonState(btn, true);
-
-    let tempElement = null;
-
-    try {
-        // Expand selection to full lines and clone content
-        const expandedRange = expandRangeToFullLines(originalRange, differenceElement);
-        const selectedFragment = expandedRange.cloneContents();
-
-        // Count lines for footer
-        const selectedLines = countLines(selectedFragment);
-        const totalLines = countLines(differenceElement);
-
-        // Create temporary element with proper styling
-        tempElement = createCaptureElement(selectedFragment, differenceElement);
-        // Append footer to innerWrapper (inside the border), not outerWrapper
-        tempElement._innerWrapper.appendChild(createFooter(selectedLines, totalLines));
-
-        // Add to DOM for rendering
-        document.body.appendChild(tempElement);
-
-        // Wait for rendering
-        await new Promise(resolve => setTimeout(resolve, RENDER_DELAY_MS));
-
-        // Capture to canvas
-        const canvas = await html2canvas(tempElement, {
-            scale: CANVAS_SCALE,
-            useCORS: true,
-            allowTaint: true,
-            logging: false,
-            backgroundColor: '#ffffff',
-            scrollX: 0,
-            scrollY: 0
-        });
-
-        // Validate canvas
-        if (canvas.width === 0 || canvas.height === 0) {
-            throw new Error("Canvas is empty - no content captured");
-        }
-
-        // Convert to JPEG
-        let jpeg = canvas.toDataURL("image/jpeg", JPEG_QUALITY);
-
-        if (jpeg === "data:," || jpeg.length < 100) {
-            throw new Error("Failed to generate image data");
-        }
-
-        // Add EXIF metadata
-        jpeg = addExifMetadata(jpeg);
-
-        // Display the image
-        displayImage(jpeg);
-
-        // Clear selection
-        selection.removeAllRanges();
-
-    } catch (error) {
-        console.error("Error generating image:", error);
-        alert("Failed to generate image: " + error.message);
-    } finally {
-        // Cleanup
-        if (tempElement && tempElement.parentNode) {
-            tempElement.parentNode.removeChild(tempElement);
-        }
-        setButtonState(btn, false, originalBtnHtml);
-    }
-}

changedetectionio/static/js/visual-selector.js

@@ -11,18 +11,6 @@ $(document).ready(() => {
     let c, xctx, ctx;
     let xScale = 1, yScale = 1;
     let selectorImage, selectorImageRect, selectorData;
-    let elementHandlers = {}; // Store references to element selection handlers (needed for draw mode toggling)
-
-    // Box drawing mode variables (for image_ssim_diff processor)
-    let drawMode = false;
-    let isDrawing = false;
-    let isDragging = false;
-    let drawStartX, drawStartY;
-    let dragOffsetX, dragOffsetY;
-    let drawnBox = null;
-    let resizeHandle = null;
-    const HANDLE_SIZE = 8;
-    const isImageProcessor = $('input[value="image_ssim_diff"]').is(':checked');
 
 
     // Global jQuery selectors with "Elem" appended
@@ -153,10 +141,6 @@ $(document).ready(() => {
 
             setScale();
             reflowSelector();
-
-            // Initialize draw mode after everything is set up
-            initializeDrawMode();
-
             $fetchingUpdateNoticeElem.fadeOut();
         });
     }
@@ -217,14 +201,9 @@ $(document).ready(() => {
         highlightCurrentSelected();
         updateFiltersText();
 
-        // Store handler references for later use
-        elementHandlers.handleMouseMove = handleMouseMove.debounce(5);
-        elementHandlers.handleMouseDown = handleMouseDown.debounce(5);
-        elementHandlers.handleMouseLeave = highlightCurrentSelected.debounce(5);
-
-        $selectorCanvasElem.bind('mousemove', elementHandlers.handleMouseMove);
-        $selectorCanvasElem.bind('mousedown', elementHandlers.handleMouseDown);
-        $selectorCanvasElem.bind('mouseleave', elementHandlers.handleMouseLeave);
+        $selectorCanvasElem.bind('mousemove', handleMouseMove.debounce(5));
+        $selectorCanvasElem.bind('mousedown', handleMouseDown.debounce(5));
+        $selectorCanvasElem.bind('mouseleave', highlightCurrentSelected.debounce(5));
 
         function handleMouseMove(e) {
             if (!e.offsetX && !e.offsetY) {
@@ -278,372 +257,4 @@ $(document).ready(() => {
             xctx.strokeRect(sel.left * xScale, sel.top * yScale, sel.width * xScale, sel.height * yScale);
         });
     }
-
-    // ============= BOX DRAWING MODE (for image_ssim_diff processor) =============
-
-    function initializeDrawMode() {
-        if (!isImageProcessor || !c) return;
-
-        const $selectorModeRadios = $('input[name="selector-mode"]');
-        const $boundingBoxField = $('#bounding_box');
-        const $selectionModeField = $('#selection_mode');
-
-        // Load existing selection mode if present
-        const savedMode = $selectionModeField.val();
-        if (savedMode && (savedMode === 'element' || savedMode === 'draw')) {
-            $selectorModeRadios.filter(`[value="${savedMode}"]`).prop('checked', true);
-            console.log('Loaded saved mode:', savedMode);
-        }
-
-        // Load existing bounding box if present
-        const existingBox = $boundingBoxField.val();
-        if (existingBox) {
-            try {
-                const parts = existingBox.split(',').map(p => parseFloat(p));
-                if (parts.length === 4) {
-                    drawnBox = {
-                        x: parts[0] * xScale,
-                        y: parts[1] * yScale,
-                        width: parts[2] * xScale,
-                        height: parts[3] * yScale
-                    };
-                    console.log('Loaded saved bounding box:', existingBox);
-                }
-            } catch (e) {
-                console.error('Failed to parse existing bounding box:', e);
-            }
-        }
-
-        // Update mode when radio changes
-        $selectorModeRadios.off('change').on('change', function() {
-            const newMode = $(this).val();
-            drawMode = newMode === 'draw';
-            console.log('Mode changed to:', newMode);
-
-            // Save the mode to the hidden field
-            $selectionModeField.val(newMode);
-
-            if (drawMode) {
-                enableDrawMode();
-            } else {
-                disableDrawMode();
-            }
-        });
-
-        // Set initial mode based on which radio is checked
-        drawMode = $selectorModeRadios.filter(':checked').val() === 'draw';
-        console.log('Initial mode:', drawMode ? 'draw' : 'element');
-
-        // Save initial mode
-        $selectionModeField.val(drawMode ? 'draw' : 'element');
-
-        if (drawMode) {
-            enableDrawMode();
-        }
-    }
-
-    function enableDrawMode() {
-        console.log('Enabling draw mode...');
-
-        // Unbind element selection handlers
-        $selectorCanvasElem.unbind('mousemove mousedown mouseleave');
-
-        // Set cursor to crosshair
-        $selectorCanvasElem.css('cursor', 'crosshair');
-
-        // Bind draw mode handlers
-        $selectorCanvasElem.on('mousedown', handleDrawMouseDown);
-        $selectorCanvasElem.on('mousemove', handleDrawMouseMove);
-        $selectorCanvasElem.on('mouseup', handleDrawMouseUp);
-        $selectorCanvasElem.on('mouseleave', handleDrawMouseUp);
-
-        // Clear element selections and xpath display
-        currentSelections = [];
-        $includeFiltersElem.val('');
-        $selectorCurrentXpathElem.html('Draw mode - click and drag to select an area');
-
-        // Clear the canvas
-        if (ctx && xctx) {
-            ctx.clearRect(0, 0, c.width, c.height);
-            xctx.clearRect(0, 0, c.width, c.height);
-        }
-
-        // Redraw if we have an existing box
-        if (drawnBox) {
-            drawBox();
-        }
-    }
-
-    function disableDrawMode() {
-        console.log('Disabling draw mode, switching to element mode...');
-
-        // Unbind draw handlers
-        $selectorCanvasElem.unbind('mousedown mousemove mouseup mouseleave');
-
-        // Reset cursor
-        $selectorCanvasElem.css('cursor', 'default');
-
-        // Clear drawn box
-        drawnBox = null;
-        $('#bounding_box').val('');
-
-        // Clear the canvases
-        if (ctx && xctx) {
-            ctx.clearRect(0, 0, c.width, c.height);
-            xctx.clearRect(0, 0, c.width, c.height);
-        }
-
-        // Restore element selections from include_filters
-        currentSelections = [];
-        if (selectorData && selectorData['size_pos']) {
-            let existingFilters = splitToList($includeFiltersElem.val());
-
-            selectorData['size_pos'].forEach(sel => {
-                if ((!runInClearMode && sel.highlight_as_custom_filter) || existingFilters.includes(sel.xpath)) {
-                    console.log("Restoring selection: " + sel.xpath);
-                    currentSelections.push(sel);
-                }
-            });
-        }
-
-        // Re-enable element selection handlers using stored references
-        if (elementHandlers.handleMouseMove) {
-            $selectorCanvasElem.bind('mousemove', elementHandlers.handleMouseMove);
-            $selectorCanvasElem.bind('mousedown', elementHandlers.handleMouseDown);
-            $selectorCanvasElem.bind('mouseleave', elementHandlers.handleMouseLeave);
-        }
-
-        // Restore the element selection display
-        $selectorCurrentXpathElem.html('Hover over elements to select');
-
-        // Highlight the restored selections
-        highlightCurrentSelected();
-    }
-
-    function handleDrawMouseDown(e) {
-        const rect = c.getBoundingClientRect();
-        const x = e.clientX - rect.left;
-        const y = e.clientY - rect.top;
-
-        // Check if clicking on a resize handle
-        if (drawnBox) {
-            resizeHandle = getResizeHandle(x, y);
-            if (resizeHandle) {
-                isDrawing = true;
-                drawStartX = x;
-                drawStartY = y;
-                return;
-            }
-
-            // Check if clicking inside the box (for dragging)
-            if (isInsideBox(x, y)) {
-                isDragging = true;
-                dragOffsetX = x - drawnBox.x;
-                dragOffsetY = y - drawnBox.y;
-                $selectorCanvasElem.css('cursor', 'move');
-                return;
-            }
-        }
-
-        // Start new box
-        isDrawing = true;
-        drawStartX = x;
-        drawStartY = y;
-        drawnBox = { x: x, y: y, width: 0, height: 0 };
-    }
-
-    function handleDrawMouseMove(e) {
-        const rect = c.getBoundingClientRect();
-        const x = e.clientX - rect.left;
-        const y = e.clientY - rect.top;
-
-        // Update cursor based on position
-        if (!isDrawing && !isDragging && drawnBox) {
-            const handle = getResizeHandle(x, y);
-            if (handle) {
-                $selectorCanvasElem.css('cursor', getHandleCursor(handle));
-            } else if (isInsideBox(x, y)) {
-                $selectorCanvasElem.css('cursor', 'move');
-            } else {
-                $selectorCanvasElem.css('cursor', 'crosshair');
-            }
-        }
-
-        // Handle dragging the box
-        if (isDragging) {
-            drawnBox.x = x - dragOffsetX;
-            drawnBox.y = y - dragOffsetY;
-            drawBox();
-            return;
-        }
-
-        if (!isDrawing) return;
-
-        if (resizeHandle) {
-            // Resize existing box
-            resizeBox(x, y);
-        } else {
-            // Draw new box
-            drawnBox.width = x - drawStartX;
-            drawnBox.height = y - drawStartY;
-        }
-
-        drawBox();
-    }
-
-    function handleDrawMouseUp(e) {
-        if (!isDrawing && !isDragging) return;
-
-        isDrawing = false;
-        isDragging = false;
-        resizeHandle = null;
-
-        if (drawnBox) {
-            // Normalize box (handle negative dimensions)
-            if (drawnBox.width < 0) {
-                drawnBox.x += drawnBox.width;
-                drawnBox.width = Math.abs(drawnBox.width);
-            }
-            if (drawnBox.height < 0) {
-                drawnBox.y += drawnBox.height;
-                drawnBox.height = Math.abs(drawnBox.height);
-            }
-
-            // Constrain to canvas bounds
-            drawnBox.x = Math.max(0, Math.min(drawnBox.x, c.width - drawnBox.width));
-            drawnBox.y = Math.max(0, Math.min(drawnBox.y, c.height - drawnBox.height));
-
-            // Save to form field (convert from scaled to natural coordinates)
-            const naturalX = Math.round(drawnBox.x / xScale);
-            const naturalY = Math.round(drawnBox.y / yScale);
-            const naturalWidth = Math.round(drawnBox.width / xScale);
-            const naturalHeight = Math.round(drawnBox.height / yScale);
-
-            $('#bounding_box').val(`${naturalX},${naturalY},${naturalWidth},${naturalHeight}`);
-
-            drawBox();
-        }
-    }
-
-    function drawBox() {
-        if (!drawnBox) return;
-
-        // Clear and redraw
-        ctx.clearRect(0, 0, c.width, c.height);
-        xctx.clearRect(0, 0, c.width, c.height);
-
-        // Draw box
-        ctx.strokeStyle = STROKE_STYLE_REDLINE;
-        ctx.fillStyle = FILL_STYLE_REDLINE;
-        ctx.lineWidth = 3;
-
-        const drawX = drawnBox.width >= 0 ? drawnBox.x : drawnBox.x + drawnBox.width;
-        const drawY = drawnBox.height >= 0 ? drawnBox.y : drawnBox.y + drawnBox.height;
-        const drawW = Math.abs(drawnBox.width);
-        const drawH = Math.abs(drawnBox.height);
-
-        ctx.strokeRect(drawX, drawY, drawW, drawH);
-        ctx.fillRect(drawX, drawY, drawW, drawH);
-
-        // Draw resize handles
-        if (!isDrawing) {
-            drawResizeHandles(drawX, drawY, drawW, drawH);
-        }
-    }
-
-    function drawResizeHandles(x, y, w, h) {
-        ctx.fillStyle = '#fff';
-        ctx.strokeStyle = '#000';
-        ctx.lineWidth = 1;
-
-        const handles = [
-            { x: x, y: y },                    // top-left
-            { x: x + w, y: y },                // top-right
-            { x: x, y: y + h },                // bottom-left
-            { x: x + w, y: y + h }             // bottom-right
-        ];
-
-        handles.forEach(handle => {
-            ctx.fillRect(handle.x - HANDLE_SIZE/2, handle.y - HANDLE_SIZE/2, HANDLE_SIZE, HANDLE_SIZE);
-            ctx.strokeRect(handle.x - HANDLE_SIZE/2, handle.y - HANDLE_SIZE/2, HANDLE_SIZE, HANDLE_SIZE);
-        });
-    }
-
-    function isInsideBox(x, y) {
-        if (!drawnBox) return false;
-
-        const drawX = drawnBox.width >= 0 ? drawnBox.x : drawnBox.x + drawnBox.width;
-        const drawY = drawnBox.height >= 0 ? drawnBox.y : drawnBox.y + drawnBox.height;
-        const drawW = Math.abs(drawnBox.width);
-        const drawH = Math.abs(drawnBox.height);
-
-        return x >= drawX && x <= drawX + drawW && y >= drawY && y <= drawY + drawH;
-    }
-
-    function getResizeHandle(x, y) {
-        if (!drawnBox) return null;
-
-        const drawX = drawnBox.width >= 0 ? drawnBox.x : drawnBox.x + drawnBox.width;
-        const drawY = drawnBox.height >= 0 ? drawnBox.y : drawnBox.y + drawnBox.height;
-        const drawW = Math.abs(drawnBox.width);
-        const drawH = Math.abs(drawnBox.height);
-
-        const handles = {
-            'tl': { x: drawX, y: drawY },
-            'tr': { x: drawX + drawW, y: drawY },
-            'bl': { x: drawX, y: drawY + drawH },
-            'br': { x: drawX + drawW, y: drawY + drawH }
-        };
-
-        for (const [key, handle] of Object.entries(handles)) {
-            if (Math.abs(x - handle.x) <= HANDLE_SIZE && Math.abs(y - handle.y) <= HANDLE_SIZE) {
-                return key;
-            }
-        }
-
-        return null;
-    }
-
-    function getHandleCursor(handle) {
-        const cursors = {
-            'tl': 'nw-resize',
-            'tr': 'ne-resize',
-            'bl': 'sw-resize',
-            'br': 'se-resize'
-        };
-        return cursors[handle] || 'crosshair';
-    }
-
-    function resizeBox(x, y) {
-        const dx = x - drawStartX;
-        const dy = y - drawStartY;
-
-        const originalBox = { ...drawnBox };
-
-        switch (resizeHandle) {
-            case 'tl':
-                drawnBox.x = x;
-                drawnBox.y = y;
-                drawnBox.width = originalBox.x + originalBox.width - x;
-                drawnBox.height = originalBox.y + originalBox.height - y;
-                break;
-            case 'tr':
-                drawnBox.y = y;
-                drawnBox.width = x - originalBox.x;
-                drawnBox.height = originalBox.y + originalBox.height - y;
-                break;
-            case 'bl':
-                drawnBox.x = x;
-                drawnBox.width = originalBox.x + originalBox.width - x;
-                drawnBox.height = y - originalBox.y;
-                break;
-            case 'br':
-                drawnBox.width = x - originalBox.x;
-                drawnBox.height = y - originalBox.y;
-                break;
-        }
-
-        drawStartX = x;
-        drawStartY = y;
-    }
 });