Compare commits

..

18 Commits

Author SHA1 Message Date
dgtlmoon
e3a967db57 Possible RSS watch UUID bugfix 2026-01-13 16:05:57 +01:00
dgtlmoon
13f18dc7ea Extra help 2026-01-13 16:00:45 +01:00
dgtlmoon
8bc99eb0ce Simplify 2026-01-13 15:47:08 +01:00
dgtlmoon
4f2f1e094a Changes to checking state and if jobs are free in tests 2026-01-13 15:44:25 +01:00
dgtlmoon
c58710bf4c test tweak 2026-01-13 15:20:05 +01:00
dgtlmoon
4552ff25b5 Remove problematic github check (worked elsewhere) 2026-01-13 15:11:33 +01:00
dgtlmoon
87bce81d5a hmm 2026-01-13 14:56:59 +01:00
dgtlmoon
170d6652c8 Add note 2026-01-13 14:49:47 +01:00
dgtlmoon
819af84db6 Misc fixes 2026-01-13 14:44:17 +01:00
dgtlmoon
96dfd67633 Adjust test 2026-01-13 14:35:03 +01:00
dgtlmoon
e48ab5afc2 Lazy safety check 2026-01-13 14:22:58 +01:00
dgtlmoon
70a0ee77f0 Improve thread labeling 2026-01-13 14:20:25 +01:00
dgtlmoon
aabe818024 oops 2026-01-13 14:16:34 +01:00
dgtlmoon
95ed02d99e Improve slow worker / async detection 2026-01-13 14:12:52 +01:00
dgtlmoon
380d5862f7 Give threads a useful name for debugging 2026-01-13 14:02:30 +01:00
dgtlmoon
5f6e346a35 Remove thread override, it happens by default 2026-01-13 14:02:13 +01:00
dgtlmoon
41321889bb Async worker updates and increase testing 2026-01-13 13:52:21 +01:00
dgtlmoon
6f37efb0ca Test - Minor changes and strengthen Brotli compression tests 2026-01-13 12:46:46 +01:00
76 changed files with 5346 additions and 5064 deletions

View File

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

View File

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

View File

@@ -2,7 +2,7 @@
# Read more https://github.com/dgtlmoon/changedetection.io/wiki
# Semver means never use .01, or 00. Should be .1.
__version__ = '0.52.6'
__version__ = '0.52.1'
from changedetectionio.strtobool import strtobool
from json.decoder import JSONDecodeError
@@ -41,10 +41,9 @@ from loguru import logger
#
# IMPLEMENTATION:
# 1. Explicit contexts everywhere (primary protection):
# - Watch.py: ctx = multiprocessing.get_context('spawn')
# - playwright.py: ctx = multiprocessing.get_context('spawn')
# - puppeteer.py: ctx = multiprocessing.get_context('spawn')
# - isolated_opencv.py: ctx = multiprocessing.get_context('spawn')
# - isolated_libvips.py: ctx = multiprocessing.get_context('spawn')
#
# 2. Global default (defense-in-depth, below):
# - Safety net if future code forgets explicit context
@@ -287,9 +286,7 @@ def main():
return dict(right_sticky="v{}".format(datastore.data['version_tag']),
new_version_available=app.config['NEW_VERSION_AVAILABLE'],
has_password=datastore.data['settings']['application']['password'] != False,
socket_io_enabled=datastore.data['settings']['application']['ui'].get('socket_io_enabled', True),
all_paused=datastore.data['settings']['application'].get('all_paused', False),
all_muted=datastore.data['settings']['application'].get('all_muted', False)
socket_io_enabled=datastore.data['settings']['application']['ui'].get('socket_io_enabled', True)
)
# Monitored websites will not receive a Referer header when a user clicks on an outgoing link.

View File

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

View File

@@ -1,5 +1,4 @@
import os
import threading
from changedetectionio.validate_url import is_safe_valid_url
@@ -439,8 +438,7 @@ class CreateWatch(Resource):
new_uuid = self.datastore.add_watch(url=url, extras=extras, tag=tags)
if new_uuid:
# Dont queue because the scheduler will check that it hasnt been checked before anyway
# worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': new_uuid}))
return {'uuid': new_uuid}, 201
else:
return "Invalid or unsupported URL", 400
@@ -470,29 +468,8 @@ class CreateWatch(Resource):
}
if request.args.get('recheck_all'):
# Collect all watches to queue
watches_to_queue = self.datastore.data['watching'].keys()
# If less than 20 watches, queue synchronously for immediate feedback
if len(watches_to_queue) < 20:
for uuid in watches_to_queue:
worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
return {'status': f'OK, queued {len(watches_to_queue)} watches for rechecking'}, 200
else:
# 20+ watches - queue in background thread to avoid blocking API response
def queue_all_watches_background():
"""Background thread to queue all watches - discarded after completion."""
try:
for uuid in watches_to_queue:
worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
logger.info(f"Background queueing complete: {len(watches_to_queue)} watches queued")
except Exception as e:
logger.error(f"Error in background queueing all watches: {e}")
# Start background thread and return immediately
thread = threading.Thread(target=queue_all_watches_background, daemon=True, name="QueueAllWatches-Background")
thread.start()
return {'status': f'OK, queueing {len(watches_to_queue)} watches in background'}, 202
for uuid in self.datastore.data['watching'].keys():
worker_handler.queue_item_async_safe(self.update_q, queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid}))
return {'status': "OK"}, 200
return list, 200

View File

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

View File

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

View File

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

View File

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

View File

@@ -25,9 +25,6 @@
<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="pure-menu-item menu-collapsible {% if request.endpoint.startswith('backups.') %}active{% endif %}">
<a href="{{ url_for('backups.index') }}" class="pure-menu-link">{{ _('Backups') }}</a>
</li>
<li class="tab"><a href="#timedate">{{ _('Time & Date') }}</a></li>
<li class="tab"><a href="#proxies">{{ _('CAPTCHA & Proxies') }}</a></li>
{% if plugin_tabs %}

View File

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

View File

@@ -50,8 +50,7 @@
<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>
<a href="{{ url_for('ui.form_watch_checknow', tag=uuid) }}" class="pure-button pure-button-primary" >{{ _('Recheck') }}</a>
<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

View File

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

View File

@@ -52,13 +52,7 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
redirect(url_for('ui_edit.edit_page', uuid=uuid))
# be sure we update with a copy instead of accidently editing the live object by reference
default = None
while not default:
try:
default = deepcopy(datastore.data['watching'][uuid])
except RuntimeError as e:
# Dictionary changed
continue
default = deepcopy(datastore.data['watching'][uuid])
# Defaults for proxy choice
if datastore.proxy_list is not None: # When enabled
@@ -244,13 +238,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
datastore.data['watching'][uuid] = watch_class(datastore_path=datastore.datastore_path, default=datastore.data['watching'][uuid])
flash(gettext("Updated watch - unpaused!") if request.args.get('unpause_on_save') else gettext("Updated watch."))
# Cleanup any browsersteps session for this watch
try:
from changedetectionio.blueprint.browser_steps import cleanup_session_for_watch
cleanup_session_for_watch(uuid)
except Exception as e:
logger.debug(f"Error cleaning up browsersteps session: {e}")
# Re #286 - We wait for syncing new data to disk in another thread every 60 seconds
# But in the case something is added we should save straight away
datastore.needs_write_urgent = True
@@ -338,6 +325,8 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
'url': url_for('rss.rss_single_watch', uuid=watch['uuid'], token=app_rss_token)
},
'settings_application': datastore.data['settings']['application'],
'system_has_playwright_configured': os.getenv('PLAYWRIGHT_DRIVER_URL'),
'system_has_webdriver_configured': os.getenv('WEBDRIVER_URL'),
'ui_edit_stats_extras': collect_ui_edit_stats_extras(watch),
'visual_selector_data_ready': datastore.visualselector_data_is_ready(watch_uuid=uuid),
'timezone_default_config': datastore.data['settings']['application'].get('scheduler_timezone_default'),

View File

@@ -206,7 +206,7 @@ Math: {{ 1 + 1 }}") }}
<div class="tab-pane-inner" id="browser-steps">
{% if capabilities.supports_browser_steps %}
{% if true %}
{% if visual_selector_data_ready %}
<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">

View File

@@ -2,6 +2,7 @@ import os
import time
from flask import Blueprint, request, make_response, render_template, redirect, url_for, flash, session
from flask_login import current_user
from flask_paginate import Pagination, get_page_parameter
from changedetectionio import forms
@@ -84,7 +85,6 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
app_rss_token=datastore.data['settings']['application'].get('rss_access_token'),
datastore=datastore,
errored_count=errored_count,
extra_classes='has-queue' if not update_q.empty() else '',
form=form,
generate_tag_colors=processors.generate_processor_badge_colors,
guid=datastore.data['app_guid'],
@@ -92,11 +92,10 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
hosted_sticky=os.getenv("SALTED_PASS", False) == False,
now_time_server=round(time.time()),
pagination=pagination,
processor_badge_css=processors.get_processor_badge_css(),
processor_badge_texts=processors.get_processor_badge_texts(),
processor_descriptions=processors.get_processor_descriptions(),
queue_size=update_q.qsize(),
queued_uuids=update_q.get_queued_uuids(),
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'),
sort_order=request.args.get('order') if request.args.get('order') else request.cookies.get('order'),

View File

@@ -99,14 +99,9 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
data-confirm-message="{{ _('<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>') }}"
data-confirm-button="{{ _('Delete') }}"><i data-feather="trash" style="width: 14px; height: 14px; stroke: white; margin-right: 4px;"></i>{{ _('Delete') }}</button>
</div>
<div id="stats_row">
<div class="left">{%- if watches|length >= pagination.per_page -%}{{ pagination.info }}{%- endif -%}</div>
<div class="right" >{{ _('Queued size') }}: <span id="queue-size-int">{{ queue_size }}</span></div>
</div>
{%- if watches|length >= pagination.per_page -%}
{{ pagination.info }}
{%- endif -%}
{%- if search_q -%}<div id="search-result-info">{{ _('Searching') }} "<strong><i>{{search_q}}</i></strong>"</div>{%- endif -%}
<div>
<a href="{{url_for('watchlist.index')}}" class="pure-button button-tag {{'active' if not active_tag_uuid }}">{{ _('All') }}</a>
@@ -159,7 +154,7 @@ html[data-darkmode="true"] .watch-tag-list.tag-{{ class_name }} {
<tbody>
{%- if not watches|length -%}
<tr>
<td colspan="{{ cols_required }}" style="text-wrap: wrap;">{{ _('No web page change detection watches configured, please add a URL in the box above, or') }} <a href="{{ url_for('imports.import_page')}}" >{{ _('import a list') }}</a>.</td>
<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 -%}

View File

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

View File

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

View File

@@ -9,7 +9,6 @@ import threading
import time
import timeago
from blinker import signal
from pathlib import Path
from changedetectionio.strtobool import strtobool
from threading import Event
@@ -27,7 +26,9 @@ from flask import (
session,
url_for,
)
from urllib.parse import urlparse
from flask_compress import Compress as FlaskCompress
from flask_login import current_user
from flask_restful import abort, Api
from flask_cors import CORS
@@ -44,7 +45,6 @@ from changedetectionio.api import Watch, WatchHistory, WatchSingleHistory, Watch
from changedetectionio.api.Search import Search
from .time_handler import is_within_schedule
from changedetectionio.languages import get_available_languages, get_language_codes, get_flag_for_locale, get_timeago_locale
IN_PYTEST = "pytest" in sys.modules or "PYTEST_CURRENT_TEST" in os.environ
datastore = None
@@ -55,7 +55,7 @@ extra_stylesheets = []
# Use bulletproof janus-based queues for sync/async reliability
update_q = RecheckPriorityQueue()
notification_q = NotificationQueue()
MAX_QUEUE_SIZE = 5000
MAX_QUEUE_SIZE = 2000
app = Flask(__name__,
static_url_path="",
@@ -84,10 +84,6 @@ app.config['NEW_VERSION_AVAILABLE'] = False
if os.getenv('FLASK_SERVER_NAME'):
app.config['SERVER_NAME'] = os.getenv('FLASK_SERVER_NAME')
# Babel/i18n configuration
app.config['BABEL_TRANSLATION_DIRECTORIES'] = str(Path(__file__).parent / 'translations')
app.config['BABEL_DEFAULT_LOCALE'] = 'en_GB'
#app.config["EXPLAIN_TEMPLATE_LOADING"] = True
@@ -374,9 +370,6 @@ def changedetection_app(config=None, datastore_o=None):
global datastore, socketio_server
datastore = datastore_o
# Set datastore reference in notification queue for all_muted checking
notification_q.set_datastore(datastore)
# Import and create a wrapper for is_safe_url that has access to app
from changedetectionio.is_safe_url import is_safe_url as _is_safe_url
@@ -402,9 +395,13 @@ def changedetection_app(config=None, datastore_o=None):
def get_locale():
# 1. Try to get locale from session (user explicitly selected)
if 'locale' in session:
return session['locale']
locale = session['locale']
logger.trace(f"DEBUG: get_locale() returning from session: {locale}")
return locale
# 2. Fall back to Accept-Language header
return request.accept_languages.best_match(language_codes)
locale = request.accept_languages.best_match(language_codes)
logger.trace(f"DEBUG: get_locale() returning from Accept-Language: {locale}")
return locale
# Initialize Babel with locale selector
babel = Babel(app, locale_selector=get_locale)
@@ -521,20 +518,9 @@ def changedetection_app(config=None, datastore_o=None):
@app.route('/set-language/<locale>')
def set_language(locale):
"""Set the user's preferred language in the session"""
if not request.cookies:
logger.error("Cannot set language without session cookie")
flash("Cannot set language without session cookie", 'error')
return redirect(url_for('watchlist.index'))
# Validate the locale against available languages
if locale in language_codes:
session['locale'] = locale
# CRITICAL: Flask-Babel caches the locale in the request context (ctx.babel_locale)
# We must refresh to clear this cache so the new locale takes effect immediately
# This is especially important for tests where multiple requests happen rapidly
from flask_babel import refresh
refresh()
else:
logger.error(f"Invalid locale {locale}, available: {language_codes}")
@@ -981,10 +967,6 @@ def ticker_thread_check_time_launch_checks():
logger.debug(f"System env MINIMUM_SECONDS_RECHECK_TIME {recheck_time_minimum_seconds}")
# Workers are now started during app initialization, not here
WAIT_TIME_BETWEEN_LOOP = 1.0 if not IN_PYTEST else 0.01
if IN_PYTEST:
# The time between loops should be less than the first .sleep/wait in def wait_for_all_checks() of tests/util.py
logger.warning(f"Looks like we're in PYTEST! Setting time between searching for items to add to the queue to {WAIT_TIME_BETWEEN_LOOP}s")
while not app.config.exit.is_set():
@@ -1002,20 +984,12 @@ def ticker_thread_check_time_launch_checks():
if health_result['status'] != 'healthy':
logger.warning(f"Worker health check: {health_result['message']}")
last_health_check = now
# Check if all checks are paused
if datastore.data['settings']['application'].get('all_paused', False):
app.config.exit.wait(1)
continue
# Get a list of watches by UUID that are currently fetching data
running_uuids = worker_handler.get_running_uuids()
# Build set of queued UUIDs once for O(1) lookup instead of O(n) per watch
queued_uuids = {q_item.item['uuid'] for q_item in update_q.queue}
# Re #232 - Deepcopy the data incase it changes while we're iterating through it all
watch_uuid_list = []
while True:
@@ -1032,17 +1006,16 @@ def ticker_thread_check_time_launch_checks():
else:
break
# Re #438 - Don't place more watches in the queue to be checked if the queue is already large
while update_q.qsize() >= 2000:
logger.warning(f"Recheck watches queue size limit reached ({MAX_QUEUE_SIZE}), skipping adding more items")
app.config.exit.wait(10.0)
recheck_time_system_seconds = int(datastore.threshold_seconds)
# Check for watches outside of the time threshold to put in the thread queue.
for watch_index, uuid in enumerate(watch_uuid_list):
# Re #438 - Check queue size every 100 watches for CPU efficiency (not every watch)
if watch_index % 100 == 0:
current_queue_size = update_q.qsize()
if current_queue_size >= MAX_QUEUE_SIZE:
logger.debug(f"Queue size limit reached ({current_queue_size}/{MAX_QUEUE_SIZE}), stopping scheduler this iteration.")
break
for uuid in watch_uuid_list:
now = time.time()
watch = datastore.data['watching'].get(uuid)
if not watch:
@@ -1092,7 +1065,7 @@ def ticker_thread_check_time_launch_checks():
seconds_since_last_recheck = now - watch['last_checked']
if seconds_since_last_recheck >= (threshold + watch.jitter_seconds) and seconds_since_last_recheck >= recheck_time_minimum_seconds:
if not uuid in running_uuids and uuid not in queued_uuids:
if not uuid in running_uuids and uuid not in [q_uuid.item['uuid'] for q_uuid in update_q.queue]:
# Proxies can be set to have a limit on seconds between which they can be called
watch_proxy = datastore.get_preferred_proxy_for_watch(uuid=uuid)
@@ -1135,4 +1108,4 @@ def ticker_thread_check_time_launch_checks():
watch.jitter_seconds = 0
# Should be low so we can break this out in testing
app.config.exit.wait(WAIT_TIME_BETWEEN_LOOP)
app.config.exit.wait(1)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -82,14 +82,20 @@ echo "RUNNING WITH BASE_URL SET"
# Re #65 - Ability to include a link back to the installation, in the notification.
export BASE_URL="https://really-unique-domain.io"
REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 tests/test_notification.py
# Re-run with HIDE_REFERER set - could affect login
export HIDE_REFERER=True
REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 tests/test_notification.py tests/test_access_control.py
pytest -vv -s --maxfail=1 tests/test_access_control.py
# Re-run a few tests that will trigger brotli based storage
# And again with brotli+screenshot attachment
SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD=5 REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest -vv -s --maxfail=1 --dist=load tests/test_backend.py tests/test_rss.py tests/test_unique_lines.py tests/test_notification.py tests/test_access_control.py
export SNAPSHOT_BROTLI_COMPRESSION_THRESHOLD=5
pytest -vv -s --maxfail=1 tests/test_access_control.py
REMOVE_REQUESTS_OLD_SCREENSHOTS=false pytest tests/test_notification.py
pytest -vv -s --maxfail=1 tests/test_backend.py
pytest -vv -s --maxfail=1 tests/test_rss.py
pytest -vv -s --maxfail=1 tests/test_unique_lines.py
# Try high concurrency
FETCH_WORKERS=50 pytest tests/test_history_consistency.py -vv -l -s

View File

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

View File

@@ -110,9 +110,6 @@
background: var(--color-background-menu-link-hover);
}
}
&#menu-pause, &#menu-mute {
display: none;
}
}
}
}

View File

@@ -2,13 +2,6 @@
padding: 0.5rem 1em;
line-height: 1.2rem;
}
#menu-mute, #menu-pause {
padding-left: 0.3rem;
padding-right: 0.3rem;
img {
height: 1.2rem;
}
}
.pure-menu-item {
svg {

View File

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

View File

@@ -184,24 +184,24 @@ html[data-darkmode=true] {
// Mobile adjustments
@media only screen and (max-width: 768px) {
.toast-container {
left: 50% !important;
right: auto !important;
top: 80px !important;
transform: translateX(-50%) !important;
align-items: center;
left: 10px !important;
right: 10px !important;
top: 10px !important;
transform: none !important;
align-items: stretch;
&.toast-bottom-right,
&.toast-bottom-center,
&.toast-bottom-left {
top: auto !important;
bottom: 80px !important;
bottom: 10px !important;
}
}
.toast {
min-width: auto;
max-width: none;
width: 80vw;
width: 100%;
transform: translateY(-100px);
&.toast-show {

View File

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

View File

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

View File

@@ -33,31 +33,6 @@
@use "parts/login_form";
@use "parts/tabs";
// Smooth transitions for theme switching
body,
.pure-table,
.pure-table thead,
.pure-table td,
.pure-table th,
.pure-form input,
.pure-form textarea,
.pure-form select,
.edit-form .inner,
.pure-menu-horizontal,
footer,
.sticky-tab,
#diff-jump,
.button-tag,
#new-watch-form,
#new-watch-form input:not(.pure-button),
code,
.messages li,
#checkbox-operations,
.inline-warning,
a,
.watch-controls img {
transition: color 0.4s ease, background-color 0.4s ease, background 0.4s ease, border-color 0.4s ease, box-shadow 0.4s ease;
}
body {
color: var(--color-text);

File diff suppressed because one or more lines are too long

View File

@@ -8,15 +8,16 @@
<span class="pure-form-message-inline">
Body for all notifications &dash; You can use <a target="newwindow" href="https://jinja.palletsprojects.com/en/3.0.x/templates/">Jinja2</a> templating in the notification title, body and URL, and tokens from below.
</span><br>
<div data-target="#notification-tokens-info{{ suffix }}" class="toggle-show pure-button button-tag button-xsmall">{{ _('Show token/placeholders') }}
<div data-target="#notification-tokens-info{{ suffix }}" class="toggle-show pure-button button-tag button-xsmall">Show
token/placeholders
</div>
</div>
<div class="pure-controls" style="display: none;" id="notification-tokens-info{{ suffix }}">
<table class="pure-table" id="token-table">
<thead>
<tr>
<th>{{ _('Token') }}</th>
<th>{{ _('Description') }}</th>
<th>Token</th>
<th>Description</th>
</tr>
</thead>
<tbody>
@@ -125,7 +126,7 @@
<p>
<strong>Tip:</strong> Use <a target="newwindow" href="https://github.com/caronc/apprise">AppRise Notification URLs</a> for notification to just about any service! <i><a target="newwindow" href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes">Please read the notification services wiki here for important configuration notes</a></i>.<br>
</p>
<div data-target="#advanced-help-notifications" class="toggle-show pure-button button-tag button-xsmall">{{ _('Show advanced help and tips') }}</div>
<div data-target="#advanced-help-notifications" class="toggle-show pure-button button-tag button-xsmall">Show advanced help and tips</div>
<ul style="display: none" id="advanced-help-notifications">
<li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_discord">discord://</a></code> (or <code>https://discord.com/api/webhooks...</code>)) only supports a maximum <strong>2,000 characters</strong> of notification text, including the title.</li>
<li><code><a target="newwindow" href="https://github.com/caronc/apprise/wiki/Notify_telegram">tgram://</a></code> bots can't send messages to other bots, so you should specify chat ID of non-bot user.</li>
@@ -135,20 +136,20 @@
</ul>
</div>
<div class="notifications-wrapper">
<a id="send-test-notification" class="pure-button button-secondary button-xsmall" >{{ _('Send test notification') }}</a> <div class="spinner" style="display: none;"></div>
<a id="send-test-notification" class="pure-button button-secondary button-xsmall" >Send test notification</a> <div class="spinner" style="display: none;"></div>
{% if emailprefix %}
<a id="add-email-helper" class="pure-button button-secondary button-xsmall" >{{ _('Add email') }} <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='email.svg')}}" alt="{{ _('Add an email address') }}"> </a>
<a id="add-email-helper" class="pure-button button-secondary button-xsmall" >Add email <img style="height: 1em; display: inline-block" src="{{url_for('static_content', group='images', filename='email.svg')}}" alt="Add an email address"> </a>
{% endif %}
<a href="{{url_for('settings.notification_logs')}}" class="pure-button button-secondary button-xsmall" >{{ _('Notification debug logs') }}</a>
<a href="{{url_for('settings.notification_logs')}}" class="pure-button button-secondary button-xsmall" >Notification debug logs</a>
<br>
<div id="notification-test-log" style="display: none;"><span class="pure-form-message-inline">{{ _('Processing..') }}</span></div>
<div id="notification-test-log" style="display: none;"><span class="pure-form-message-inline">Processing..</span></div>
</div>
</div>
<div class="pure-control-group grey-form-border">
<div class="pure-control-group">
{{ render_field(form.notification_title, class="m-d notification-title", placeholder=settings_application['notification_title']) }}
<span class="pure-form-message-inline">{{ _('Title for all notifications') }}</span>
<span class="pure-form-message-inline">Title for all notifications</span>
</div>
<div class="pure-control-group">
{{ render_field(form.notification_body , rows=5, class="notification-body", placeholder=settings_application['notification_body']) }}
@@ -173,7 +174,7 @@
</div>
<div class="">
{{ render_field(form.notification_format , class="notification-format") }}
<span class="pure-form-message-inline">{{ _('Format for all notifications') }}</span>
<span class="pure-form-message-inline">Format for all notifications</span>
</div>
</div>
{% endmacro %}

View File

@@ -267,7 +267,7 @@
</ul>
<br>
<span class="pure-form-message-inline">
<a href="https://changedetection.io/tutorial/checking-web-pages-changes-according-schedule">{{ _('More help and examples about using the scheduler') }}</a>
<a href="https://changedetection.io/tutorials">{{ _('More help and examples about using the scheduler') }}</a>
</span>
</div>
{% else %}

View File

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

View File

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

View File

@@ -13,11 +13,8 @@
<li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('imports.') %}active{% endif %}">
<a href="{{ url_for('imports.import_page') }}" class="pure-menu-link">{{ _('IMPORT') }}</a>
</li>
<li class="pure-menu-item" id="menu-pause">
<a href="{{ url_for('settings.toggle_all_paused') }}" ><img src="{{url_for('static_content', group='images', filename='pause.svg')}}" alt="{% if all_paused %}Resume automatic scheduling{% else %}Pause auto-queue scheduling of watches{% endif %}" title="{% if all_paused %}Scheduling is paused - click to resume{% else %}Pause auto-queue scheduling of watches{% endif %}" class="icon icon-pause"{% if not all_paused %} style="opacity: 0.3"{% endif %}></a>
</li>
<li class="pure-menu-item " id="menu-mute">
<a href="{{ url_for('settings.toggle_all_muted') }}" ><img src="{{url_for('static_content', group='images', filename='bell-off.svg')}}" alt="{% if all_muted %}Unmute notifications{% else %}Mute notifications{% endif %}" title="{% if all_muted %}Notifications are muted - click to unmute{% else %}Mute notifications{% endif %}" class="icon icon-mute"{% if not all_muted %} style="opacity: 0.3"{% endif %}></a>
<li class="pure-menu-item menu-collapsible {% if request.endpoint.startswith('backups.') %}active{% endif %}">
<a href="{{ url_for('backups.index') }}" class="pure-menu-link">{{ _('BACKUPS') }}</a>
</li>
{% else %}
<li class="pure-menu-item menu-collapsible">

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -25,13 +25,12 @@ def test_content_filter_live_preview(client, live_server, measure_memory_usage,
test_url = url_for('test_endpoint', _external=True)
uuid = client.application.config.get('DATASTORE').add_watch(url=test_url)
res = client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
assert b'Queued 1 watch for rechecking.' in res.data
wait_for_all_checks(client)
res = client.post(
url_for("ui.ui_views.form_quick_watch_add"),
data={"url": test_url, "tags": ''},
follow_redirects=True
)
uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
res = client.post(
url_for("ui.ui_edit.edit_page", uuid=uuid),
data={

View File

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

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: changedetection.io\n"
"Project-Id-Version: changedetection.io\n"
"Report-Msgid-Bugs-To: https://github.com/dgtlmoon/changedetection.io\n"
"POT-Creation-Date: 2026-01-02 16:07+0100\n"
"PO-Revision-Date: 2026-01-12 16:33+0100\n"
@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.17.0\n"
"Generated-By: Babel 2.10.3\n"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:241
#: changedetectionio/flask_app.py:213 changedetectionio/flask_app.py:225
@@ -38,11 +38,15 @@ msgid "Incorrect password"
msgstr ""
#: changedetectionio/forms.py:63 changedetectionio/forms.py:243
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified."
msgstr ""
#: changedetectionio/forms.py:64
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified when not using global settings."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified when not using global settings."
msgstr ""
#: changedetectionio/forms.py:164
@@ -585,7 +589,9 @@ msgid "A backup is running!"
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:13
msgid "Here you can download and request a new backup, when a backup is completed you will see it listed below."
msgid ""
"Here you can download and request a new backup, when a backup is "
"completed you will see it listed below."
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:19
@@ -605,7 +611,9 @@ msgid "Remove backups"
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:45
msgid "Importing 5,000 of the first URLs from your list, the rest can be imported again."
msgid ""
"Importing 5,000 of the first URLs from your list, the rest can be "
"imported again."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:78
@@ -640,7 +648,9 @@ msgstr ""
#: changedetectionio/blueprint/imports/importer.py:214
#: changedetectionio/blueprint/imports/importer.py:297
#, python-brace-format
msgid "Error processing row number {}, check all cell data types are correct, row was skipped."
msgid ""
"Error processing row number {}, check all cell data types are correct, "
"row was skipped."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:218
@@ -666,7 +676,9 @@ msgid ".XLSX & Wachete"
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:20
msgid "Enter one URL per line, and optionally add tags for each URL after a space, delineated by comma (,):"
msgid ""
"Enter one URL per line, and optionally add tags for each URL after a "
"space, delineated by comma (,):"
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:22
@@ -678,7 +690,9 @@ msgid "URLs which do not pass validation will stay in the textarea."
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:44
msgid "Copy and Paste your Distill.io watch 'export' file, this should be a JSON file."
msgid ""
"Copy and Paste your Distill.io watch 'export' file, this should be a JSON"
" file."
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:45
@@ -757,17 +771,12 @@ msgstr ""
msgid "Password protection removed."
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:92
#, python-brace-format
msgid "Warning: Worker count ({}) is close to or exceeds available CPU cores ({})"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:104
#: changedetectionio/blueprint/settings/__init__.py:98
#, python-brace-format
msgid "Worker count adjusted: {}"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:106
#: changedetectionio/blueprint/settings/__init__.py:100
msgid "Dynamic worker adjustment not supported for sync workers"
msgstr ""
@@ -976,7 +985,9 @@ msgid "Watch group / tag"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:21
msgid "Groups allows you to manage filters and notifications for multiple watches under a single organisational tag."
msgid ""
"Groups allows you to manage filters and notifications for multiple "
"watches under a single organisational tag."
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:31
@@ -1002,7 +1013,9 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:59
#, python-format
msgid "<p>Are you sure you want to delete group <strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete group "
"<strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:60
@@ -1022,7 +1035,10 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:67
#, python-format
msgid "<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>"
msgid ""
"<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>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:68
@@ -1128,7 +1144,7 @@ msgstr ""
msgid "Queued 1 watch for rechecking."
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:283
#: changedetectionio/blueprint/ui/__init__.py:257
#, python-brace-format
msgid "Queued {} watches for rechecking."
msgstr ""
@@ -1139,7 +1155,9 @@ msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:330
#, python-brace-format
msgid "Could not share, something went wrong while communicating with the share server - {}"
msgid ""
"Could not share, something went wrong while communicating with the share "
"server - {}"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:93
@@ -1152,7 +1170,9 @@ msgid "No history found for the specified link, bad link?"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:98
msgid "Not enough history (2 snapshots required) to show difference page for this watch."
msgid ""
"Not enough history (2 snapshots required) to show difference page for "
"this watch."
msgstr ""
#: changedetectionio/blueprint/ui/edit.py:35
@@ -1200,7 +1220,9 @@ msgid "Watch added."
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:12
msgid "This will remove version history (snapshots) for ALL watches, but keep your list of URLs!"
msgid ""
"This will remove version history (snapshots) for ALL watches, but keep "
"your list of URLs!"
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:13
@@ -1382,7 +1404,9 @@ msgstr ""
#: changedetectionio/blueprint/ui/templates/diff.html:144
#: changedetectionio/blueprint/ui/templates/preview.html:80
msgid "For now, Differences are performed on text, not graphically, only the latest screenshot is available."
msgid ""
"For now, Differences are performed on text, not graphically, only the "
"latest screenshot is available."
msgstr ""
#: changedetectionio/blueprint/ui/templates/diff.html:149
@@ -1444,7 +1468,9 @@ msgid "Organisational tag/group name used in the main listing page"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:85
msgid "Automatically uses the page title if found, you can also use your own title/description here"
msgid ""
"Automatically uses the page title if found, you can also use your own "
"title/description here"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:95
@@ -1452,7 +1478,10 @@ msgid "The interval/amount of time between each check."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:110
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:123
@@ -1464,7 +1493,9 @@ msgid "Basic"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:123
msgid "method (default) where your watched site doesn't need Javascript to render."
msgid ""
"method (default) where your watched site doesn't need Javascript to "
"render."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:124
@@ -1476,7 +1507,9 @@ msgid "Chrome/Javascript"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:124
msgid "method requires a network connection to a running WebDriver+Chrome server, set by the ENV var 'WEBDRIVER_URL'."
msgid ""
"method requires a network connection to a running WebDriver+Chrome "
"server, set by the ENV var 'WEBDRIVER_URL'."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:125
@@ -1492,7 +1525,9 @@ msgid "Choose a proxy for this watch"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:143
msgid "If you're having trouble waiting for the page to be fully rendered (text missing etc), try increasing the 'wait' time here."
msgid ""
"If you're having trouble waiting for the page to be fully rendered (text "
"missing etc), try increasing the 'wait' time here."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:145
@@ -1513,7 +1548,9 @@ msgid "Show advanced options"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:157
msgid "Run this code before performing change detection, handy for filling in fields and other actions"
msgid ""
"Run this code before performing change detection, handy for filling in "
"fields and other actions"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:158
@@ -1570,7 +1607,9 @@ msgid "Visual Selector data is not ready, watch needs to be checked atleast once
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:253
msgid "Sorry, this functionality only works with fetchers that support interactive Javascript (so far only Playwright based fetchers)"
msgid ""
"Sorry, this functionality only works with fetchers that support "
"interactive Javascript (so far only Playwright based fetchers)"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:254
@@ -1588,7 +1627,9 @@ msgid "to one that supports interactive Javascript."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:297
msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
msgid ""
"Use the verify (✓) button to test if a condition passes against the "
"current snapshot."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:298
@@ -1616,7 +1657,9 @@ msgid "Limit trigger/ignore/block/extract to;"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:326
msgid "Note: Depending on the length and similarity of the text on each line, the algorithm may consider an"
msgid ""
"Note: Depending on the length and similarity of the text on each line, "
"the algorithm may consider an"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:326
@@ -1657,11 +1700,16 @@ msgid "Only trigger when unique lines appear"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:332
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
msgid "Helps reduce changes detected caused by sites shuffling lines around, combine with"
msgid ""
"Helps reduce changes detected caused by sites shuffling lines around, "
"combine with"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
@@ -1691,7 +1739,9 @@ msgid "text"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:386
msgid "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"
msgid ""
"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"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:386
@@ -1731,7 +1781,9 @@ msgid "Currently:"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:423
msgid "Sorry, this functionality only works with fetchers that support Javascript and screenshots (such as playwright etc)."
msgid ""
"Sorry, this functionality only works with fetchers that support "
"Javascript and screenshots (such as playwright etc)."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:424
@@ -1787,7 +1839,9 @@ msgid "Are you sure you want to clear all history for:"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:496
msgid "This will remove all snapshots and previous versions. This action cannot be undone."
msgid ""
"This will remove all snapshots and previous versions. This action cannot "
"be undone."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:497
@@ -1811,7 +1865,9 @@ msgid "Current erroring screenshot from most recent request"
msgstr ""
#: changedetectionio/blueprint/ui/templates/preview.html:91
msgid "Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc ) that supports screenshots."
msgid ""
"Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc "
") that supports screenshots."
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:31
@@ -1880,7 +1936,9 @@ msgid "Clear Histories"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:66
msgid "<p>Are you sure you want to clear history for the selected items?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to clear history for the selected "
"items?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:67
@@ -1896,7 +1954,9 @@ msgid "Delete Watches?"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:72
msgid "<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete the selected "
"watches?</strong></p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:78
@@ -1929,7 +1989,7 @@ msgid "Changed"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
msgid "No web page change detection watches configured, please add a URL in the box above, or"
msgid "No website watches configured, please add a URL in the box above, or"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
@@ -2153,7 +2213,7 @@ msgid "IMPORT"
msgstr ""
#: changedetectionio/templates/base.html:86
msgid "Backups"
msgid "BACKUPS"
msgstr ""
#: changedetectionio/templates/base.html:90
@@ -2193,7 +2253,9 @@ msgid "Select Language"
msgstr ""
#: changedetectionio/templates/base.html:270
msgid "Language support is in beta, please help us improve by opening a PR on GitHub with any updates."
msgid ""
"Language support is in beta, please help us improve by opening a PR on "
"GitHub with any updates."
msgstr ""
#: changedetectionio/templates/login.html:10
@@ -2204,150 +2266,3 @@ msgstr ""
msgid "Login"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:18
#: changedetectionio/widgets/ternary_boolean.py:72
msgid "Yes"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:19
#: changedetectionio/widgets/ternary_boolean.py:73
msgid "No"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:20
#: changedetectionio/widgets/ternary_boolean.py:74
msgid "Main settings"
msgstr ""
#: changedetectionio/templates/_common_fields.html:11
msgid "Show token/placeholders"
msgstr ""
#: changedetectionio/templates/_common_fields.html:18
msgid "Token"
msgstr ""
#: changedetectionio/templates/_common_fields.html:19
msgid "Description"
msgstr ""
#: changedetectionio/templates/_common_fields.html:128
msgid "Show advanced help and tips"
msgstr ""
#: changedetectionio/templates/_common_fields.html:138
msgid "Send test notification"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add email"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add an email address"
msgstr ""
#: changedetectionio/templates/_common_fields.html:142
msgid "Notification debug logs"
msgstr ""
#: changedetectionio/templates/_common_fields.html:144
msgid "Processing.."
msgstr ""
#: changedetectionio/templates/_common_fields.html:151
msgid "Title for all notifications"
msgstr ""
#: changedetectionio/templates/_common_fields.html:176
msgid "Format for all notifications"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:9
msgid "Text to wait for before triggering a change/notification, all text and regex are tested case-insensitive."
msgstr ""
#: changedetectionio/templates/edit/text-options.html:10
msgid "Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:11
msgid "Each line is processed separately (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:12
msgid "Note: Wrap in forward slash / to use regex example:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:23
msgid "Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:24
msgid "Each line processed separately, any line matching will be ignored (removed before creating the checksum)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:25
msgid "Regular Expression support, wrap the entire line in forward slash"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:26
msgid "Changing this will affect the comparison checksum which may trigger an alert"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:43
msgid "Block change-detection while this text is on the page, all text and regex are tested case-insensitive, good for waiting for when a product is available again"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:44
msgid "Block text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:45
msgid "All lines here must not exist (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:58
msgid "Extracts text in the final output (line by line) after other filters using regular expressions or string match:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:60
msgid "Regular expression - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:61
msgid "Don't forget to consider the white-space at the start of a line"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "Use"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "type flags (more"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "information here"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:63
msgid "Keyword example - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "Use groups to extract just that text - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "returns a list of years only"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:65
msgid "Example - match lines containing a keyword"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:68
msgid "One line per regular-expression/string match"
msgstr ""

View File

@@ -16,7 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.17.0\n"
"Generated-By: Babel 2.10.3\n"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:241
#: changedetectionio/flask_app.py:213 changedetectionio/flask_app.py:225
@@ -38,11 +38,15 @@ msgid "Incorrect password"
msgstr ""
#: changedetectionio/forms.py:63 changedetectionio/forms.py:243
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified."
msgstr ""
#: changedetectionio/forms.py:64
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified when not using global settings."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified when not using global settings."
msgstr ""
#: changedetectionio/forms.py:164
@@ -585,7 +589,9 @@ msgid "A backup is running!"
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:13
msgid "Here you can download and request a new backup, when a backup is completed you will see it listed below."
msgid ""
"Here you can download and request a new backup, when a backup is "
"completed you will see it listed below."
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:19
@@ -605,7 +611,9 @@ msgid "Remove backups"
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:45
msgid "Importing 5,000 of the first URLs from your list, the rest can be imported again."
msgid ""
"Importing 5,000 of the first URLs from your list, the rest can be "
"imported again."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:78
@@ -640,7 +648,9 @@ msgstr ""
#: changedetectionio/blueprint/imports/importer.py:214
#: changedetectionio/blueprint/imports/importer.py:297
#, python-brace-format
msgid "Error processing row number {}, check all cell data types are correct, row was skipped."
msgid ""
"Error processing row number {}, check all cell data types are correct, "
"row was skipped."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:218
@@ -666,7 +676,9 @@ msgid ".XLSX & Wachete"
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:20
msgid "Enter one URL per line, and optionally add tags for each URL after a space, delineated by comma (,):"
msgid ""
"Enter one URL per line, and optionally add tags for each URL after a "
"space, delineated by comma (,):"
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:22
@@ -678,7 +690,9 @@ msgid "URLs which do not pass validation will stay in the textarea."
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:44
msgid "Copy and Paste your Distill.io watch 'export' file, this should be a JSON file."
msgid ""
"Copy and Paste your Distill.io watch 'export' file, this should be a JSON"
" file."
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:45
@@ -757,17 +771,12 @@ msgstr ""
msgid "Password protection removed."
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:92
#, python-brace-format
msgid "Warning: Worker count ({}) is close to or exceeds available CPU cores ({})"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:104
#: changedetectionio/blueprint/settings/__init__.py:98
#, python-brace-format
msgid "Worker count adjusted: {}"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:106
#: changedetectionio/blueprint/settings/__init__.py:100
msgid "Dynamic worker adjustment not supported for sync workers"
msgstr ""
@@ -976,7 +985,9 @@ msgid "Watch group / tag"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:21
msgid "Groups allows you to manage filters and notifications for multiple watches under a single organisational tag."
msgid ""
"Groups allows you to manage filters and notifications for multiple "
"watches under a single organisational tag."
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:31
@@ -1002,7 +1013,9 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:59
#, python-format
msgid "<p>Are you sure you want to delete group <strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete group "
"<strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:60
@@ -1022,7 +1035,10 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:67
#, python-format
msgid "<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>"
msgid ""
"<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>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:68
@@ -1128,7 +1144,7 @@ msgstr ""
msgid "Queued 1 watch for rechecking."
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:283
#: changedetectionio/blueprint/ui/__init__.py:257
#, python-brace-format
msgid "Queued {} watches for rechecking."
msgstr ""
@@ -1139,7 +1155,9 @@ msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:330
#, python-brace-format
msgid "Could not share, something went wrong while communicating with the share server - {}"
msgid ""
"Could not share, something went wrong while communicating with the share "
"server - {}"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:93
@@ -1152,7 +1170,9 @@ msgid "No history found for the specified link, bad link?"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:98
msgid "Not enough history (2 snapshots required) to show difference page for this watch."
msgid ""
"Not enough history (2 snapshots required) to show difference page for "
"this watch."
msgstr ""
#: changedetectionio/blueprint/ui/edit.py:35
@@ -1200,7 +1220,9 @@ msgid "Watch added."
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:12
msgid "This will remove version history (snapshots) for ALL watches, but keep your list of URLs!"
msgid ""
"This will remove version history (snapshots) for ALL watches, but keep "
"your list of URLs!"
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:13
@@ -1382,7 +1404,9 @@ msgstr ""
#: changedetectionio/blueprint/ui/templates/diff.html:144
#: changedetectionio/blueprint/ui/templates/preview.html:80
msgid "For now, Differences are performed on text, not graphically, only the latest screenshot is available."
msgid ""
"For now, Differences are performed on text, not graphically, only the "
"latest screenshot is available."
msgstr ""
#: changedetectionio/blueprint/ui/templates/diff.html:149
@@ -1444,7 +1468,9 @@ msgid "Organisational tag/group name used in the main listing page"
msgstr "organizational tag/group name used in the main listing page"
#: changedetectionio/blueprint/ui/templates/edit.html:85
msgid "Automatically uses the page title if found, you can also use your own title/description here"
msgid ""
"Automatically uses the page title if found, you can also use your own "
"title/description here"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:95
@@ -1452,7 +1478,10 @@ msgid "The interval/amount of time between each check."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:110
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:123
@@ -1464,7 +1493,9 @@ msgid "Basic"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:123
msgid "method (default) where your watched site doesn't need Javascript to render."
msgid ""
"method (default) where your watched site doesn't need Javascript to "
"render."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:124
@@ -1476,7 +1507,9 @@ msgid "Chrome/Javascript"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:124
msgid "method requires a network connection to a running WebDriver+Chrome server, set by the ENV var 'WEBDRIVER_URL'."
msgid ""
"method requires a network connection to a running WebDriver+Chrome "
"server, set by the ENV var 'WEBDRIVER_URL'."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:125
@@ -1492,7 +1525,9 @@ msgid "Choose a proxy for this watch"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:143
msgid "If you're having trouble waiting for the page to be fully rendered (text missing etc), try increasing the 'wait' time here."
msgid ""
"If you're having trouble waiting for the page to be fully rendered (text "
"missing etc), try increasing the 'wait' time here."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:145
@@ -1513,7 +1548,9 @@ msgid "Show advanced options"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:157
msgid "Run this code before performing change detection, handy for filling in fields and other actions"
msgid ""
"Run this code before performing change detection, handy for filling in "
"fields and other actions"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:158
@@ -1570,7 +1607,9 @@ msgid "Visual Selector data is not ready, watch needs to be checked atleast once
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:253
msgid "Sorry, this functionality only works with fetchers that support interactive Javascript (so far only Playwright based fetchers)"
msgid ""
"Sorry, this functionality only works with fetchers that support "
"interactive Javascript (so far only Playwright based fetchers)"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:254
@@ -1588,7 +1627,9 @@ msgid "to one that supports interactive Javascript."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:297
msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
msgid ""
"Use the verify (✓) button to test if a condition passes against the "
"current snapshot."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:298
@@ -1616,7 +1657,9 @@ msgid "Limit trigger/ignore/block/extract to;"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:326
msgid "Note: Depending on the length and similarity of the text on each line, the algorithm may consider an"
msgid ""
"Note: Depending on the length and similarity of the text on each line, "
"the algorithm may consider an"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:326
@@ -1657,11 +1700,16 @@ msgid "Only trigger when unique lines appear"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:332
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
msgid "Helps reduce changes detected caused by sites shuffling lines around, combine with"
msgid ""
"Helps reduce changes detected caused by sites shuffling lines around, "
"combine with"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
@@ -1691,7 +1739,9 @@ msgid "text"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:386
msgid "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"
msgid ""
"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"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:386
@@ -1731,7 +1781,9 @@ msgid "Currently:"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:423
msgid "Sorry, this functionality only works with fetchers that support Javascript and screenshots (such as playwright etc)."
msgid ""
"Sorry, this functionality only works with fetchers that support "
"Javascript and screenshots (such as playwright etc)."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:424
@@ -1787,7 +1839,9 @@ msgid "Are you sure you want to clear all history for:"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:496
msgid "This will remove all snapshots and previous versions. This action cannot be undone."
msgid ""
"This will remove all snapshots and previous versions. This action cannot "
"be undone."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:497
@@ -1811,7 +1865,9 @@ msgid "Current erroring screenshot from most recent request"
msgstr ""
#: changedetectionio/blueprint/ui/templates/preview.html:91
msgid "Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc ) that supports screenshots."
msgid ""
"Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc "
") that supports screenshots."
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:31
@@ -1880,7 +1936,9 @@ msgid "Clear Histories"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:66
msgid "<p>Are you sure you want to clear history for the selected items?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to clear history for the selected "
"items?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:67
@@ -1896,7 +1954,9 @@ msgid "Delete Watches?"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:72
msgid "<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete the selected "
"watches?</strong></p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:78
@@ -1929,7 +1989,7 @@ msgid "Changed"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
msgid "No web page change detection watches configured, please add a URL in the box above, or"
msgid "No website watches configured, please add a URL in the box above, or"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
@@ -2153,7 +2213,7 @@ msgid "IMPORT"
msgstr ""
#: changedetectionio/templates/base.html:86
msgid "Backups"
msgid "BACKUPS"
msgstr ""
#: changedetectionio/templates/base.html:90
@@ -2193,7 +2253,9 @@ msgid "Select Language"
msgstr ""
#: changedetectionio/templates/base.html:270
msgid "Language support is in beta, please help us improve by opening a PR on GitHub with any updates."
msgid ""
"Language support is in beta, please help us improve by opening a PR on "
"GitHub with any updates."
msgstr ""
#: changedetectionio/templates/login.html:10
@@ -2204,150 +2266,3 @@ msgstr ""
msgid "Login"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:18
#: changedetectionio/widgets/ternary_boolean.py:72
msgid "Yes"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:19
#: changedetectionio/widgets/ternary_boolean.py:73
msgid "No"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:20
#: changedetectionio/widgets/ternary_boolean.py:74
msgid "Main settings"
msgstr ""
#: changedetectionio/templates/_common_fields.html:11
msgid "Show token/placeholders"
msgstr ""
#: changedetectionio/templates/_common_fields.html:18
msgid "Token"
msgstr ""
#: changedetectionio/templates/_common_fields.html:19
msgid "Description"
msgstr ""
#: changedetectionio/templates/_common_fields.html:128
msgid "Show advanced help and tips"
msgstr ""
#: changedetectionio/templates/_common_fields.html:138
msgid "Send test notification"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add email"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add an email address"
msgstr ""
#: changedetectionio/templates/_common_fields.html:142
msgid "Notification debug logs"
msgstr ""
#: changedetectionio/templates/_common_fields.html:144
msgid "Processing.."
msgstr ""
#: changedetectionio/templates/_common_fields.html:151
msgid "Title for all notifications"
msgstr ""
#: changedetectionio/templates/_common_fields.html:176
msgid "Format for all notifications"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:9
msgid "Text to wait for before triggering a change/notification, all text and regex are tested case-insensitive."
msgstr ""
#: changedetectionio/templates/edit/text-options.html:10
msgid "Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:11
msgid "Each line is processed separately (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:12
msgid "Note: Wrap in forward slash / to use regex example:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:23
msgid "Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:24
msgid "Each line processed separately, any line matching will be ignored (removed before creating the checksum)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:25
msgid "Regular Expression support, wrap the entire line in forward slash"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:26
msgid "Changing this will affect the comparison checksum which may trigger an alert"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:43
msgid "Block change-detection while this text is on the page, all text and regex are tested case-insensitive, good for waiting for when a product is available again"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:44
msgid "Block text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:45
msgid "All lines here must not exist (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:58
msgid "Extracts text in the final output (line by line) after other filters using regular expressions or string match:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:60
msgid "Regular expression - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:61
msgid "Don't forget to consider the white-space at the start of a line"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "Use"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "type flags (more"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "information here"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:63
msgid "Keyword example - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "Use groups to extract just that text - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "returns a list of years only"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:65
msgid "Example - match lines containing a keyword"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:68
msgid "One line per regular-expression/string match"
msgstr ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2026-01-02 16:07+0100\n"
"POT-Creation-Date: 2026-01-03 14:31+0100\n"
"PO-Revision-Date: 2026-01-02 11:40+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: ko\n"
@@ -19,31 +19,35 @@ msgstr ""
"Generated-By: Babel 2.17.0\n"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:241
#: changedetectionio/flask_app.py:213 changedetectionio/flask_app.py:225
#: changedetectionio/flask_app.py:246
#: changedetectionio/flask_app.py:214 changedetectionio/flask_app.py:226
#: changedetectionio/flask_app.py:247
#: changedetectionio/realtime/socket_server.py:171
msgid "Not yet"
msgstr "아직 아님"
#: changedetectionio/flask_app.py:468
msgid "You must be logged in, please log in."
msgstr ""
#: changedetectionio/flask_app.py:495
#: changedetectionio/flask_app.py:534
msgid "Already logged in"
msgstr ""
#: changedetectionio/flask_app.py:522
#: changedetectionio/flask_app.py:536
msgid "You must be logged in, please log in."
msgstr ""
#: changedetectionio/flask_app.py:551
#, fuzzy
msgid "Incorrect password"
msgstr "비밀번호"
#: changedetectionio/forms.py:63 changedetectionio/forms.py:243
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified."
msgstr ""
#: changedetectionio/forms.py:64
msgid "At least one time interval (weeks, days, hours, minutes, or seconds) must be specified when not using global settings."
msgid ""
"At least one time interval (weeks, days, hours, minutes, or seconds) must"
" be specified when not using global settings."
msgstr ""
#: changedetectionio/forms.py:164
@@ -376,8 +380,9 @@ msgid "Muted"
msgstr "무음"
#: changedetectionio/forms.py:832
#, fuzzy
msgid "On"
msgstr "켜짐"
msgstr "없음"
#: changedetectionio/forms.py:833
msgid "Attach screenshot to notification (where possible)"
@@ -612,6 +617,8 @@ msgid "Backups were deleted."
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:6
#: changedetectionio/templates/base.html:282
#: changedetectionio/templates/base.html:290
msgid "Backups"
msgstr "백업"
@@ -620,7 +627,9 @@ msgid "A backup is running!"
msgstr "백업이 실행 중입니다!"
#: changedetectionio/blueprint/backups/templates/overview.html:13
msgid "Here you can download and request a new backup, when a backup is completed you will see it listed below."
msgid ""
"Here you can download and request a new backup, when a backup is "
"completed you will see it listed below."
msgstr ""
#: changedetectionio/blueprint/backups/templates/overview.html:19
@@ -640,7 +649,9 @@ msgid "Remove backups"
msgstr "백업 삭제"
#: changedetectionio/blueprint/imports/importer.py:45
msgid "Importing 5,000 of the first URLs from your list, the rest can be imported again."
msgid ""
"Importing 5,000 of the first URLs from your list, the rest can be "
"imported again."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:78
@@ -675,7 +686,9 @@ msgstr ""
#: changedetectionio/blueprint/imports/importer.py:214
#: changedetectionio/blueprint/imports/importer.py:297
#, python-brace-format
msgid "Error processing row number {}, check all cell data types are correct, row was skipped."
msgid ""
"Error processing row number {}, check all cell data types are correct, "
"row was skipped."
msgstr ""
#: changedetectionio/blueprint/imports/importer.py:218
@@ -701,7 +714,9 @@ msgid ".XLSX & Wachete"
msgstr ".XLSX 및 와체테"
#: changedetectionio/blueprint/imports/templates/import.html:20
msgid "Enter one URL per line, and optionally add tags for each URL after a space, delineated by comma (,):"
msgid ""
"Enter one URL per line, and optionally add tags for each URL after a "
"space, delineated by comma (,):"
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:22
@@ -713,7 +728,9 @@ msgid "URLs which do not pass validation will stay in the textarea."
msgstr "유효성 검사를 통과하지 못한 URL은 텍스트 영역에 유지됩니다."
#: changedetectionio/blueprint/imports/templates/import.html:44
msgid "Copy and Paste your Distill.io watch 'export' file, this should be a JSON file."
msgid ""
"Copy and Paste your Distill.io watch 'export' file, this should be a JSON"
" file."
msgstr ""
#: changedetectionio/blueprint/imports/templates/import.html:45
@@ -792,17 +809,12 @@ msgstr "수입"
msgid "Password protection removed."
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:92
#, python-brace-format
msgid "Warning: Worker count ({}) is close to or exceeds available CPU cores ({})"
msgstr "경고: 워커 수({})가 사용 가능한 CPU 코어 수({})에 근접하거나 초과합니다"
#: changedetectionio/blueprint/settings/__init__.py:104
#: changedetectionio/blueprint/settings/__init__.py:98
#, python-brace-format
msgid "Worker count adjusted: {}"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:106
#: changedetectionio/blueprint/settings/__init__.py:100
msgid "Dynamic worker adjustment not supported for sync workers"
msgstr ""
@@ -1014,7 +1026,9 @@ msgid "Watch group / tag"
msgstr "감시 그룹/태그"
#: changedetectionio/blueprint/tags/templates/groups-overview.html:21
msgid "Groups allows you to manage filters and notifications for multiple watches under a single organisational tag."
msgid ""
"Groups allows you to manage filters and notifications for multiple "
"watches under a single organisational tag."
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:31
@@ -1040,7 +1054,9 @@ msgstr "그룹을 삭제하시겠습니까?"
#: changedetectionio/blueprint/tags/templates/groups-overview.html:59
#, python-format
msgid "<p>Are you sure you want to delete group <strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete group "
"<strong>%(title)s</strong>?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:60
@@ -1060,7 +1076,10 @@ msgstr "그룹을 연결 해제하시겠습니까?"
#: changedetectionio/blueprint/tags/templates/groups-overview.html:67
#, python-format
msgid "<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>"
msgid ""
"<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>"
msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html:68
@@ -1170,10 +1189,10 @@ msgstr ""
msgid "Queued 1 watch for rechecking."
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:283
#: changedetectionio/blueprint/ui/__init__.py:257
#, python-brace-format
msgid "Queued {} watches for rechecking."
msgstr "{}개의 감시 항목을 재확인 대기열에 추가했습니다."
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:259
msgid "No watches available to recheck."
@@ -1181,7 +1200,9 @@ msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:330
#, python-brace-format
msgid "Could not share, something went wrong while communicating with the share server - {}"
msgid ""
"Could not share, something went wrong while communicating with the share "
"server - {}"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:93
@@ -1194,7 +1215,9 @@ msgid "No history found for the specified link, bad link?"
msgstr ""
#: changedetectionio/blueprint/ui/diff.py:98
msgid "Not enough history (2 snapshots required) to show difference page for this watch."
msgid ""
"Not enough history (2 snapshots required) to show difference page for "
"this watch."
msgstr ""
#: changedetectionio/blueprint/ui/edit.py:35
@@ -1243,7 +1266,9 @@ msgid "Watch added."
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:12
msgid "This will remove version history (snapshots) for ALL watches, but keep your list of URLs!"
msgid ""
"This will remove version history (snapshots) for ALL watches, but keep "
"your list of URLs!"
msgstr ""
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:13
@@ -1279,7 +1304,8 @@ msgid "Clear History!"
msgstr "기록 지우기"
#: changedetectionio/blueprint/ui/templates/clear_all_history.html:39
#: changedetectionio/templates/base.html:274
#: changedetectionio/templates/base.html:379
#: changedetectionio/templates/base.html:399
msgid "Cancel"
msgstr "취소"
@@ -1425,7 +1451,9 @@ msgstr "공유하거나 무시 목록에 추가할 텍스트를 강조 표시합
#: changedetectionio/blueprint/ui/templates/diff.html:144
#: changedetectionio/blueprint/ui/templates/preview.html:80
msgid "For now, Differences are performed on text, not graphically, only the latest screenshot is available."
msgid ""
"For now, Differences are performed on text, not graphically, only the "
"latest screenshot is available."
msgstr ""
#: changedetectionio/blueprint/ui/templates/diff.html:149
@@ -1487,7 +1515,9 @@ msgid "Organisational tag/group name used in the main listing page"
msgstr "기본 목록 페이지에 사용되는 조직 태그/그룹 이름"
#: changedetectionio/blueprint/ui/templates/edit.html:85
msgid "Automatically uses the page title if found, you can also use your own title/description here"
msgid ""
"Automatically uses the page title if found, you can also use your own "
"title/description here"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:95
@@ -1495,7 +1525,10 @@ msgid "The interval/amount of time between each check."
msgstr "각 확인 사이의 간격/시간입니다."
#: changedetectionio/blueprint/ui/templates/edit.html:110
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:123
@@ -1507,7 +1540,9 @@ msgid "Basic"
msgstr "기초적인"
#: changedetectionio/blueprint/ui/templates/edit.html:123
msgid "method (default) where your watched site doesn't need Javascript to render."
msgid ""
"method (default) where your watched site doesn't need Javascript to "
"render."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:124
@@ -1519,7 +1554,9 @@ msgid "Chrome/Javascript"
msgstr "크롬/자바스크립트"
#: changedetectionio/blueprint/ui/templates/edit.html:124
msgid "method requires a network connection to a running WebDriver+Chrome server, set by the ENV var 'WEBDRIVER_URL'."
msgid ""
"method requires a network connection to a running WebDriver+Chrome "
"server, set by the ENV var 'WEBDRIVER_URL'."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:125
@@ -1535,7 +1572,9 @@ msgid "Choose a proxy for this watch"
msgstr "이 시계에 대한 RSS 피드"
#: changedetectionio/blueprint/ui/templates/edit.html:143
msgid "If you're having trouble waiting for the page to be fully rendered (text missing etc), try increasing the 'wait' time here."
msgid ""
"If you're having trouble waiting for the page to be fully rendered (text "
"missing etc), try increasing the 'wait' time here."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:145
@@ -1556,7 +1595,9 @@ msgid "Show advanced options"
msgstr "고급 옵션 표시"
#: changedetectionio/blueprint/ui/templates/edit.html:157
msgid "Run this code before performing change detection, handy for filling in fields and other actions"
msgid ""
"Run this code before performing change detection, handy for filling in "
"fields and other actions"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:158
@@ -1613,7 +1654,9 @@ msgid "Visual Selector data is not ready, watch needs to be checked atleast once
msgstr "시각적 선택기 데이터가 준비되지 않았습니다. 시계를 한 번 이상 확인해야 합니다."
#: changedetectionio/blueprint/ui/templates/edit.html:253
msgid "Sorry, this functionality only works with fetchers that support interactive Javascript (so far only Playwright based fetchers)"
msgid ""
"Sorry, this functionality only works with fetchers that support "
"interactive Javascript (so far only Playwright based fetchers)"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:254
@@ -1631,7 +1674,9 @@ msgid "to one that supports interactive Javascript."
msgstr "대화형 Javascript를 지원하는 것입니다."
#: changedetectionio/blueprint/ui/templates/edit.html:297
msgid "Use the verify (✓) button to test if a condition passes against the current snapshot."
msgid ""
"Use the verify (✓) button to test if a condition passes against the "
"current snapshot."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:298
@@ -1659,7 +1704,9 @@ msgid "Limit trigger/ignore/block/extract to;"
msgstr "트리거/무시/차단/추출을 다음으로 제한합니다."
#: changedetectionio/blueprint/ui/templates/edit.html:326
msgid "Note: Depending on the length and similarity of the text on each line, the algorithm may consider an"
msgid ""
"Note: Depending on the length and similarity of the text on each line, "
"the algorithm may consider an"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:326
@@ -1700,11 +1747,16 @@ msgid "Only trigger when unique lines appear"
msgstr "고유한 줄이 나타날 때만 트리거됩니다."
#: changedetectionio/blueprint/ui/templates/edit.html:332
msgid "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."
msgid ""
"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."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
msgid "Helps reduce changes detected caused by sites shuffling lines around, combine with"
msgid ""
"Helps reduce changes detected caused by sites shuffling lines around, "
"combine with"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:340
@@ -1734,7 +1786,9 @@ msgid "text"
msgstr "텍스트"
#: changedetectionio/blueprint/ui/templates/edit.html:386
msgid "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"
msgid ""
"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"
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:386
@@ -1774,7 +1828,9 @@ msgid "Currently:"
msgstr "현재:"
#: changedetectionio/blueprint/ui/templates/edit.html:423
msgid "Sorry, this functionality only works with fetchers that support Javascript and screenshots (such as playwright etc)."
msgid ""
"Sorry, this functionality only works with fetchers that support "
"Javascript and screenshots (such as playwright etc)."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:424
@@ -1830,7 +1886,9 @@ msgid "Are you sure you want to clear all history for:"
msgstr "정말로 다음의 기록을 모두 지우시겠습니까?"
#: changedetectionio/blueprint/ui/templates/edit.html:496
msgid "This will remove all snapshots and previous versions. This action cannot be undone."
msgid ""
"This will remove all snapshots and previous versions. This action cannot "
"be undone."
msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html:497
@@ -1854,7 +1912,9 @@ msgid "Current erroring screenshot from most recent request"
msgstr "가장 최근 요청의 현재 오류 스크린샷"
#: changedetectionio/blueprint/ui/templates/preview.html:91
msgid "Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc ) that supports screenshots."
msgid ""
"Screenshot requires a Content Fetcher ( Sockpuppetbrowser, selenium, etc "
") that supports screenshots."
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:31
@@ -1923,7 +1983,9 @@ msgid "Clear Histories"
msgstr "기록 지우기"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:66
msgid "<p>Are you sure you want to clear history for the selected items?</p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to clear history for the selected "
"items?</p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:67
@@ -1939,7 +2001,9 @@ msgid "Delete Watches?"
msgstr "시계를 삭제하시겠습니까?"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:72
msgid "<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
msgid ""
"<p>Are you sure you want to delete the selected "
"watches?</strong></p><p>This action cannot be undone.</p>"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:78
@@ -1972,7 +2036,7 @@ msgid "Changed"
msgstr "변경됨"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
msgid "No web page change detection watches configured, please add a URL in the box above, or"
msgid "No website watches configured, please add a URL in the box above, or"
msgstr "구성된 웹사이트 시계가 없습니다. 위 상자에 URL을 추가하세요. 또는"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
@@ -2000,7 +2064,7 @@ msgid "No information"
msgstr "정보 없음"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:234
#: changedetectionio/templates/base.html:248
#: changedetectionio/templates/base.html:353
msgid "Checking now"
msgstr "지금 확인 중"
@@ -2186,226 +2250,267 @@ msgstr "웹페이지 텍스트/HTML, JSON 및 PDF 변경"
msgid "Detects all text changes where possible"
msgstr "가능한 경우 모든 텍스트 변경 사항을 감지합니다."
#: changedetectionio/templates/base.html:77
#: changedetectionio/templates/_helpers.html:25
msgid "Entry"
msgstr ""
#: changedetectionio/templates/_helpers.html:153
#, fuzzy
msgid "Actions"
msgstr "정황"
#: changedetectionio/templates/_helpers.html:172
msgid "Add a row/rule after"
msgstr ""
#: changedetectionio/templates/_helpers.html:173
msgid "Remove this row/rule"
msgstr ""
#: changedetectionio/templates/_helpers.html:174
msgid "Verify this rule against current snapshot"
msgstr ""
#: changedetectionio/templates/_helpers.html:184
msgid ""
"Error - This watch needs Chrome (with playwright/sockpuppetbrowser), but "
"Chrome based fetching is not enabled."
msgstr ""
#: changedetectionio/templates/_helpers.html:184
msgid "Alternatively try our"
msgstr ""
#: changedetectionio/templates/_helpers.html:184
msgid ""
"very affordable subscription based service which has all this setup for "
"you"
msgstr ""
#: changedetectionio/templates/_helpers.html:185
#, fuzzy
msgid "You may need to"
msgstr "당신은"
#: changedetectionio/templates/_helpers.html:185
msgid "Enable playwright environment variable"
msgstr ""
#: changedetectionio/templates/_helpers.html:185
msgid "and uncomment the"
msgstr ""
#: changedetectionio/templates/_helpers.html:185
#, fuzzy
msgid "in the"
msgstr "그만큼"
#: changedetectionio/templates/_helpers.html:185
#, fuzzy
msgid "file"
msgstr "제목"
#: changedetectionio/templates/_helpers.html:240
msgid "Set a hourly/week day schedule"
msgstr ""
#: changedetectionio/templates/_helpers.html:247
#, fuzzy
msgid "Schedule time limits"
msgstr "재확인 시간(분)"
#: changedetectionio/templates/_helpers.html:248
msgid "Business hours"
msgstr ""
#: changedetectionio/templates/_helpers.html:249
#, fuzzy
msgid "Weekends"
msgstr "주"
#: changedetectionio/templates/_helpers.html:250
#, fuzzy
msgid "Reset"
msgstr "요구"
#: changedetectionio/templates/_helpers.html:259
msgid ""
"Warning, one or more of your 'days' has a duration that would extend into"
" the next day."
msgstr ""
#: changedetectionio/templates/_helpers.html:260
msgid "This could have unintended consequences."
msgstr ""
#: changedetectionio/templates/_helpers.html:270
#, fuzzy
msgid "More help and examples about using the scheduler"
msgstr "여기에 더 많은 도움말과 예시가 있습니다."
#: changedetectionio/templates/_helpers.html:275
#, fuzzy
msgid "Want to use a time schedule?"
msgstr "시간 스케줄러 사용"
#: changedetectionio/templates/_helpers.html:275
msgid "First confirm/save your Time Zone Settings"
msgstr ""
#: changedetectionio/templates/_helpers.html:284
msgid ""
"Triggers a change if this text appears, AND something changed in the "
"document."
msgstr ""
#: changedetectionio/templates/_helpers.html:284
#, fuzzy
msgid "Triggered text"
msgstr "오류 텍스트"
#: changedetectionio/templates/_helpers.html:285
msgid "Ignored for calculating changes, but still shown."
msgstr ""
#: changedetectionio/templates/_helpers.html:285
#, fuzzy
msgid "Ignored text"
msgstr "오류 텍스트"
#: changedetectionio/templates/_helpers.html:286
#, fuzzy
msgid "No change-detection will occur because this text exists."
msgstr "텍스트가 일치하는 동안 변경 감지 차단"
#: changedetectionio/templates/_helpers.html:286
#, fuzzy
msgid "Blocked text"
msgstr "오류 텍스트"
#: changedetectionio/templates/base.html:78
#: changedetectionio/templates/base.html:168
msgid "GROUPS"
msgstr "여러 떼"
#: changedetectionio/templates/base.html:80
#: changedetectionio/templates/base.html:81
#: changedetectionio/templates/base.html:169
msgid "SETTINGS"
msgstr "설정"
#: changedetectionio/templates/base.html:83
#: changedetectionio/templates/base.html:84
#: changedetectionio/templates/base.html:170
msgid "IMPORT"
msgstr "가져오기"
#: changedetectionio/templates/base.html:86
msgid "Backups"
#: changedetectionio/templates/base.html:87
#: changedetectionio/templates/base.html:171
msgid "BACKUPS"
msgstr "백업"
#: changedetectionio/templates/base.html:90
#: changedetectionio/templates/base.html:91
#: changedetectionio/templates/base.html:173
msgid "EDIT"
msgstr "편집하다"
#: changedetectionio/templates/base.html:100
#: changedetectionio/templates/base.html:101
#: changedetectionio/templates/base.html:177
msgid "LOG OUT"
msgstr "로그아웃"
#: changedetectionio/templates/base.html:109
#: changedetectionio/templates/base.html:108
msgid "Search, or Use Alt+S Key"
msgstr "검색 또는 Alt+S 키 사용"
#: changedetectionio/templates/base.html:116
#: changedetectionio/templates/base.html:114
msgid "Toggle Light/Dark Mode"
msgstr "밝은/어두운 모드 전환"
#: changedetectionio/templates/base.html:117
#: changedetectionio/templates/base.html:115
msgid "Toggle light/dark mode"
msgstr "밝은/어두운 모드 전환"
#: changedetectionio/templates/base.html:127
#: changedetectionio/templates/base.html:125
msgid "Change Language"
msgstr "언어 변경"
#: changedetectionio/templates/base.html:128
#: changedetectionio/templates/base.html:126
msgid "Change language"
msgstr "언어 변경"
#: changedetectionio/templates/base.html:249
#: changedetectionio/templates/base.html:253
#, fuzzy
msgid "Watch List"
msgstr "모니터 목록"
#: changedetectionio/templates/base.html:258
#, fuzzy
msgid "Watches"
msgstr "모니터"
#: changedetectionio/templates/base.html:261
msgid "Queue Status"
msgstr ""
#: changedetectionio/templates/base.html:270
#, fuzzy
msgid "Queue"
msgstr "대기 중"
#: changedetectionio/templates/base.html:274
#: changedetectionio/templates/base.html:279
#, fuzzy
msgid "Settings"
msgstr "설정"
#: changedetectionio/templates/base.html:293
msgid "Sitemap Crawler"
msgstr ""
#: changedetectionio/templates/base.html:318
msgid "Sitemap"
msgstr ""
#: changedetectionio/templates/base.html:354
msgid "Real-time updates offline"
msgstr "실시간 업데이트 오프라인"
#: changedetectionio/templates/base.html:259
#: changedetectionio/templates/base.html:364
msgid "Select Language"
msgstr "언어 선택"
#: changedetectionio/templates/base.html:270
msgid "Language support is in beta, please help us improve by opening a PR on GitHub with any updates."
#: changedetectionio/templates/base.html:375
msgid ""
"Language support is in beta, please help us improve by opening a PR on "
"GitHub with any updates."
msgstr ""
#: changedetectionio/templates/login.html:10
#: changedetectionio/templates/base.html:387
#: changedetectionio/templates/base.html:400
#, fuzzy
msgid "Search"
msgstr "수색"
#: changedetectionio/templates/base.html:392
msgid "URL or Title"
msgstr ""
#: changedetectionio/templates/base.html:392
#, fuzzy
msgid "in"
msgstr "추가 정보"
#: changedetectionio/templates/base.html:393
msgid "Enter search term..."
msgstr ""
#: changedetectionio/templates/login.html:11
msgid "Password"
msgstr "비밀번호"
#: changedetectionio/templates/login.html:16
#: changedetectionio/templates/login.html:17
msgid "Login"
msgstr "로그인"
#: changedetectionio/widgets/ternary_boolean.py:18
#: changedetectionio/widgets/ternary_boolean.py:72
msgid "Yes"
msgstr "예"
#: changedetectionio/widgets/ternary_boolean.py:19
#: changedetectionio/widgets/ternary_boolean.py:73
msgid "No"
msgstr "아니오"
#: changedetectionio/widgets/ternary_boolean.py:20
#: changedetectionio/widgets/ternary_boolean.py:74
msgid "Main settings"
msgstr "기본 설정"
#: changedetectionio/templates/_common_fields.html:11
msgid "Show token/placeholders"
msgstr ""
#: changedetectionio/templates/_common_fields.html:18
msgid "Token"
msgstr ""
#: changedetectionio/templates/_common_fields.html:19
#, fuzzy
msgid "Description"
msgstr "덧셈"
#: changedetectionio/templates/_common_fields.html:128
#, fuzzy
msgid "Show advanced help and tips"
msgstr "고급 옵션 표시"
#: changedetectionio/templates/_common_fields.html:138
#, fuzzy
msgid "Send test notification"
msgstr "기본 알림 사용"
#: changedetectionio/templates/_common_fields.html:140
msgid "Add email"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add an email address"
msgstr ""
#: changedetectionio/templates/_common_fields.html:142
#, fuzzy
msgid "Notification debug logs"
msgstr "알림 디버그 로그"
#: changedetectionio/templates/_common_fields.html:144
#, fuzzy
msgid "Processing.."
msgstr "프로세서"
#: changedetectionio/templates/_common_fields.html:151
#, fuzzy
msgid "Title for all notifications"
msgstr "기본 알림 사용"
#: changedetectionio/templates/_common_fields.html:176
#, fuzzy
msgid "Format for all notifications"
msgstr "기본 알림 사용"
#: changedetectionio/templates/edit/text-options.html:9
msgid "Text to wait for before triggering a change/notification, all text and regex are tested case-insensitive."
msgstr ""
#: changedetectionio/templates/edit/text-options.html:10
msgid "Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:11
msgid "Each line is processed separately (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:12
msgid "Note: Wrap in forward slash / to use regex example:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:23
msgid "Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:24
msgid "Each line processed separately, any line matching will be ignored (removed before creating the checksum)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:25
msgid "Regular Expression support, wrap the entire line in forward slash"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:26
msgid "Changing this will affect the comparison checksum which may trigger an alert"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:43
msgid "Block change-detection while this text is on the page, all text and regex are tested case-insensitive, good for waiting for when a product is available again"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:44
msgid "Block text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:45
msgid "All lines here must not exist (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:58
msgid "Extracts text in the final output (line by line) after other filters using regular expressions or string match:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:60
msgid "Regular expression - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:61
msgid "Don't forget to consider the white-space at the start of a line"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
#, fuzzy
msgid "Use"
msgstr "정지시키다"
#: changedetectionio/templates/edit/text-options.html:62
msgid "type flags (more"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
#, fuzzy
msgid "information here"
msgstr "정보 없음"
#: changedetectionio/templates/edit/text-options.html:63
msgid "Keyword example - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "Use groups to extract just that text - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "returns a list of years only"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:65
msgid "Example - match lines containing a keyword"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:68
msgid "One line per regular-expression/string match"
msgstr ""
#~ msgid "Invalid time format. Use HH:MM."
#~ msgstr "시간 형식이 잘못되었습니다. HH:MM을 사용하세요."
@@ -2787,7 +2892,9 @@ msgstr ""
#~ msgid "Visual / Image screenshot change detection"
#~ msgstr "시각적/이미지 스크린샷 변경 감지"
#~ msgid "Compares screenshots using fast OpenCV algorithm, 10-100x faster than SSIM"
#~ msgid ""
#~ "Compares screenshots using fast OpenCV "
#~ "algorithm, 10-100x faster than SSIM"
#~ msgstr "SSIM보다 10~100배 빠른 빠른 OpenCV 알고리즘을 사용하여 스크린샷을 비교합니다."
#~ msgid "Visual"
@@ -2808,120 +2915,3 @@ msgstr ""
#~ msgid "Detects all text changes where possible"
#~ msgstr "가능한 경우 모든 텍스트 변경 사항을 감지합니다."
#~ msgid "Entry"
#~ msgstr ""
#~ msgid "Actions"
#~ msgstr "정황"
#~ msgid "Add a row/rule after"
#~ msgstr ""
#~ msgid "Remove this row/rule"
#~ msgstr ""
#~ msgid "Verify this rule against current snapshot"
#~ msgstr ""
#~ msgid "Error - This watch needs Chrome (with playwright/sockpuppetbrowser), but Chrome based fetching is not enabled."
#~ msgstr ""
#~ msgid "Alternatively try our"
#~ msgstr ""
#~ msgid "very affordable subscription based service which has all this setup for you"
#~ msgstr ""
#~ msgid "You may need to"
#~ msgstr "당신은"
#~ msgid "Enable playwright environment variable"
#~ msgstr ""
#~ msgid "and uncomment the"
#~ msgstr ""
#~ msgid "in the"
#~ msgstr "그만큼"
#~ msgid "file"
#~ msgstr "제목"
#~ msgid "Set a hourly/week day schedule"
#~ msgstr ""
#~ msgid "Schedule time limits"
#~ msgstr "재확인 시간(분)"
#~ msgid "Business hours"
#~ msgstr ""
#~ msgid "Weekends"
#~ msgstr "주"
#~ msgid "Reset"
#~ msgstr "요구"
#~ msgid "Warning, one or more of your 'days' has a duration that would extend into the next day."
#~ msgstr ""
#~ msgid "This could have unintended consequences."
#~ msgstr ""
#~ msgid "More help and examples about using the scheduler"
#~ msgstr "여기에 더 많은 도움말과 예시가 있습니다."
#~ msgid "Want to use a time schedule?"
#~ msgstr "시간 스케줄러 사용"
#~ msgid "First confirm/save your Time Zone Settings"
#~ msgstr ""
#~ msgid "Triggers a change if this text appears, AND something changed in the document."
#~ msgstr ""
#~ msgid "Triggered text"
#~ msgstr "오류 텍스트"
#~ msgid "Ignored for calculating changes, but still shown."
#~ msgstr ""
#~ msgid "Ignored text"
#~ msgstr "오류 텍스트"
#~ msgid "No change-detection will occur because this text exists."
#~ msgstr "텍스트가 일치하는 동안 변경 감지 차단"
#~ msgid "Blocked text"
#~ msgstr "오류 텍스트"
#~ msgid "Watch List"
#~ msgstr "모니터 목록"
#~ msgid "Watches"
#~ msgstr "모니터"
#~ msgid "Queue Status"
#~ msgstr ""
#~ msgid "Queue"
#~ msgstr "대기 중"
#~ msgid "Sitemap Crawler"
#~ msgstr ""
#~ msgid "Sitemap"
#~ msgstr ""
#~ msgid "Search"
#~ msgstr "수색"
#~ msgid "URL or Title"
#~ msgstr ""
#~ msgid "in"
#~ msgstr "추가 정보"
#~ msgid "Enter search term..."
#~ msgstr ""

View File

@@ -770,17 +770,12 @@ msgstr ""
msgid "Password protection removed."
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:92
#, python-brace-format
msgid "Warning: Worker count ({}) is close to or exceeds available CPU cores ({})"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:104
#: changedetectionio/blueprint/settings/__init__.py:98
#, python-brace-format
msgid "Worker count adjusted: {}"
msgstr ""
#: changedetectionio/blueprint/settings/__init__.py:106
#: changedetectionio/blueprint/settings/__init__.py:100
msgid "Dynamic worker adjustment not supported for sync workers"
msgstr ""
@@ -1148,7 +1143,7 @@ msgstr ""
msgid "Queued 1 watch for rechecking."
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py:283
#: changedetectionio/blueprint/ui/__init__.py:257
#, python-brace-format
msgid "Queued {} watches for rechecking."
msgstr ""
@@ -1993,7 +1988,7 @@ msgid "Changed"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
msgid "No web page change detection watches configured, please add a URL in the box above, or"
msgid "No website watches configured, please add a URL in the box above, or"
msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html:130
@@ -2216,6 +2211,10 @@ msgstr ""
msgid "IMPORT"
msgstr ""
#: changedetectionio/templates/base.html:86
msgid "BACKUPS"
msgstr ""
#: changedetectionio/templates/base.html:90
msgid "EDIT"
msgstr ""
@@ -2266,150 +2265,3 @@ msgstr ""
msgid "Login"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:18
#: changedetectionio/widgets/ternary_boolean.py:72
msgid "Yes"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:19
#: changedetectionio/widgets/ternary_boolean.py:73
msgid "No"
msgstr ""
#: changedetectionio/widgets/ternary_boolean.py:20
#: changedetectionio/widgets/ternary_boolean.py:74
msgid "Main settings"
msgstr ""
#: changedetectionio/templates/_common_fields.html:11
msgid "Show token/placeholders"
msgstr ""
#: changedetectionio/templates/_common_fields.html:18
msgid "Token"
msgstr ""
#: changedetectionio/templates/_common_fields.html:19
msgid "Description"
msgstr ""
#: changedetectionio/templates/_common_fields.html:128
msgid "Show advanced help and tips"
msgstr ""
#: changedetectionio/templates/_common_fields.html:138
msgid "Send test notification"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add email"
msgstr ""
#: changedetectionio/templates/_common_fields.html:140
msgid "Add an email address"
msgstr ""
#: changedetectionio/templates/_common_fields.html:142
msgid "Notification debug logs"
msgstr ""
#: changedetectionio/templates/_common_fields.html:144
msgid "Processing.."
msgstr ""
#: changedetectionio/templates/_common_fields.html:151
msgid "Title for all notifications"
msgstr ""
#: changedetectionio/templates/_common_fields.html:176
msgid "Format for all notifications"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:9
msgid "Text to wait for before triggering a change/notification, all text and regex are tested case-insensitive."
msgstr ""
#: changedetectionio/templates/edit/text-options.html:10
msgid "Trigger text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:11
msgid "Each line is processed separately (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:12
msgid "Note: Wrap in forward slash / to use regex example:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:23
msgid "Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:24
msgid "Each line processed separately, any line matching will be ignored (removed before creating the checksum)"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:25
msgid "Regular Expression support, wrap the entire line in forward slash"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:26
msgid "Changing this will affect the comparison checksum which may trigger an alert"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:43
msgid "Block change-detection while this text is on the page, all text and regex are tested case-insensitive, good for waiting for when a product is available again"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:44
msgid "Block text is processed from the result-text that comes out of any CSS/JSON Filters for this monitor"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:45
msgid "All lines here must not exist (think of each line as \"OR\")"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:58
msgid "Extracts text in the final output (line by line) after other filters using regular expressions or string match:"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:60
msgid "Regular expression - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:61
msgid "Don't forget to consider the white-space at the start of a line"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "Use"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "type flags (more"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:62
msgid "information here"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:63
msgid "Keyword example - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "Use groups to extract just that text - example"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:64
msgid "returns a list of years only"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:65
msgid "Example - match lines containing a keyword"
msgstr ""
#: changedetectionio/templates/edit/text-options.html:68
msgid "One line per regular-expression/string match"
msgstr ""

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
from wtforms import Field
from wtforms import widgets
from markupsafe import Markup
from flask_babel import lazy_gettext as _l
class TernaryNoneBooleanWidget:
"""
@@ -14,9 +14,9 @@ class TernaryNoneBooleanWidget:
boolean_mode = getattr(field, 'boolean_mode', False)
# Get custom text or use defaults
yes_text = getattr(field, 'yes_text', _l('Yes'))
no_text = getattr(field, 'no_text', _l('No'))
none_text = getattr(field, 'none_text', _l('Main settings'))
yes_text = getattr(field, 'yes_text', 'Yes')
no_text = getattr(field, 'no_text', 'No')
none_text = getattr(field, 'none_text', 'Main settings')
# True option
checked_true = ' checked' if field.data is True else ''
@@ -63,14 +63,14 @@ class TernaryNoneBooleanField(Field):
"""
widget = TernaryNoneBooleanWidget()
def __init__(self, label=None, validators=None, false_values=None, boolean_mode=False,
yes_text=None, no_text=None, none_text=None, **kwargs):
def __init__(self, label=None, validators=None, false_values=None, boolean_mode=False,
yes_text="Yes", no_text="No", none_text="Main settings", **kwargs):
super(TernaryNoneBooleanField, self).__init__(label, validators, **kwargs)
self.boolean_mode = boolean_mode
self.yes_text = yes_text if yes_text is not None else _l('Yes')
self.no_text = no_text if no_text is not None else _l('No')
self.none_text = none_text if none_text is not None else _l('Main settings')
self.yes_text = yes_text
self.no_text = no_text
self.none_text = none_text
if false_values is None:
self.false_values = {'false', ''}

View File

@@ -42,7 +42,7 @@ orjson~=3.11
# jq not available on Windows so must be installed manually
# Notification library
apprise==1.9.6
apprise==1.9.5
diff_match_patch
@@ -70,7 +70,7 @@ lxml >=4.8.0,!=5.2.0,!=5.2.1,<7
# XPath 2.0-3.1 support - 4.2.0 had issues, 4.1.5 stable
# Consider updating to latest stable version periodically
elementpath==5.1.0
elementpath==5.0.4
# For fast image comparison in screenshot change detection
# opencv-python-headless is OPTIONAL (excluded from requirements.txt)
@@ -91,7 +91,7 @@ jq~=1.3; python_version >= "3.8" and sys_platform == "linux"
# playwright is installed at Dockerfile build time because it's not available on all platforms
pyppeteer-ng==2.0.0rc11
pyppeteer-ng==2.0.0rc10
pyppeteerstealth>=0.0.4
# Include pytest, so if theres a support issue we can ask them to run these tests on their setup
@@ -100,7 +100,7 @@ pytest-flask ~=1.3
pytest-mock ~=3.15
# Anything 4.0 and up but not 5.0
jsonschema ~= 4.26
jsonschema ~= 4.25
# OpenAPI validation support
openapi-core[flask] >= 0.19.0