Compare commits

..

2 Commits

Author SHA1 Message Date
dgtlmoon
cd83704a5e oops 2026-03-15 16:56:05 +01:00
dgtlmoon
6333f72578 Content Fetchers / Browsers - Improvements for pluggable extra fetchers/browsers. 2026-03-15 16:33:06 +01:00
18 changed files with 895 additions and 641 deletions

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.54.7'
__version__ = '0.54.5'
from changedetectionio.strtobool import strtobool
from json.decoder import JSONDecodeError

View File

@@ -40,13 +40,12 @@ def construct_blueprint(datastore: ChangeDetectionStore):
contents = ''
now = time.time()
try:
import asyncio
processor_module = importlib.import_module("changedetectionio.processors.text_json_diff.processor")
update_handler = processor_module.perform_site_check(datastore=datastore,
watch_uuid=uuid
)
asyncio.run(update_handler.call_browser(preferred_proxy_id=preferred_proxy))
update_handler.call_browser(preferred_proxy_id=preferred_proxy)
# title, size is len contents not len xfer
except content_fetcher_exceptions.Non200ErrorCodeReceived as e:
if e.status_code == 404:

View File

@@ -154,8 +154,9 @@
</span>
</div>
<div class="pure-control-group">
<br>
{{ _('Tip:') }} <a href="{{ url_for('settings.settings_page')}}#proxies">{{ _('Connect using Bright Data proxies, find out more here.') }}</a>
<br>
{{ _('Tip:') }} <a href="https://github.com/dgtlmoon/changedetection.io/wiki/Proxy-configuration#brightdata-proxy-support">{{ _('Connect using Bright Data and Oxylabs Proxies, find out more here.') }}</a>
</div>
</div>
@@ -351,7 +352,7 @@ nav
</div>
</div>
<p><strong>{{ _('Tip') }}</strong>: {{ _('"Residential" and "Mobile" proxy type can be more successful than "Data Center" for blocked websites.') }}</p>
<p><strong>{{ _('Tip') }}</strong>: {{ _('"Residential" and "Mobile" proxy type can be more successfull than "Data Center" for blocked websites.') }}</p>
<div class="pure-control-group" id="extra-proxies-setting">
{{ render_fieldlist_with_inline_errors(form.requests.form.extra_proxies) }}

View File

@@ -667,11 +667,9 @@ class ValidateCSSJSONXPATHInput(object):
# `jq` requires full compilation in windows and so isn't generally available
raise ValidationError("jq not support not found")
from changedetectionio.html_tools import validate_jq_expression
input = line.replace('jq:', '')
try:
validate_jq_expression(input)
jq.compile(input)
except (ValueError) as e:
message = field.gettext('\'%s\' is not a valid jq expression. (%s)')
@@ -1007,7 +1005,7 @@ class globalSettingsApplicationForm(commonSettingsForm):
render_kw={"placeholder": "0.1", "style": "width: 8em;"}
)
password = SaltyPasswordField(_l('Password'), render_kw={"autocomplete": "new-password"})
password = SaltyPasswordField(_l('Password'))
pager_size = IntegerField(_l('Pager size'),
render_kw={"style": "width: 5em;"},
validators=[validators.NumberRange(min=0,

View File

@@ -4,7 +4,6 @@ from loguru import logger
from typing import List
import html
import json
import os
import re
# HTML added to be sure each result matching a filter (.example) gets converted to a new line by Inscriptis
@@ -14,45 +13,6 @@ PERL_STYLE_REGEX = r'^/(.*?)/([a-z]*)?$'
TITLE_RE = re.compile(r"<title[^>]*>(.*?)</title>", re.I | re.S)
META_CS = re.compile(r'<meta[^>]+charset=["\']?\s*([a-z0-9_\-:+.]+)', re.I)
# jq builtins that can leak sensitive data or cause harm when user-supplied expressions are executed.
# env/$ENV reads all process environment variables (passwords, API keys, etc.)
# include/import can read arbitrary files from disk
# input/inputs reads beyond the supplied JSON data
# debug/stderr leaks data to stderr
# halt/halt_error terminates the process (DoS)
_JQ_BLOCKED_PATTERNS = [
(re.compile(r'\benv\b'), 'env (reads environment variables)'),
(re.compile(r'\$ENV\b'), '$ENV (reads environment variables)'),
(re.compile(r'\binclude\b'), 'include (reads files from disk)'),
(re.compile(r'\bimport\b'), 'import (reads files from disk)'),
(re.compile(r'\binputs?\b'), 'input/inputs (reads beyond provided data)'),
(re.compile(r'\bdebug\b'), 'debug (leaks data to stderr)'),
(re.compile(r'\bstderr\b'), 'stderr (leaks data to stderr)'),
(re.compile(r'\bhalt(?:_error)?\b'), 'halt/halt_error (terminates the process)'),
(re.compile(r'\$__loc__\b'), '$__loc__ (leaks file path information)'),
(re.compile(r'\bbuiltins\b'), 'builtins (enumerates available functions)'),
(re.compile(r'\bmodulemeta\b'), 'modulemeta (leaks module information)'),
(re.compile(r'\$JQ_BUILD_CONFIGURATION\b'), '$JQ_BUILD_CONFIGURATION (leaks build information)'),
]
def validate_jq_expression(expression: str) -> None:
"""Raise ValueError if the jq expression uses any dangerous builtin.
User-supplied jq expressions are executed server-side. Without this check,
builtins like `env` expose every process environment variable (SALTED_PASS,
proxy credentials, API keys, etc.) as watch output.
"""
from changedetectionio.strtobool import strtobool
if strtobool(os.getenv('JQ_ALLOW_RISKY_EXPRESSIONS', 'false')):
return
for pattern, description in _JQ_BLOCKED_PATTERNS:
if pattern.search(expression):
msg = f"jq expression uses disallowed builtin: {description}"
logger.critical(f"Security: blocked jq expression containing '{description}' - expression: {expression!r}")
raise ValueError(msg)
META_CT = re.compile(r'<meta[^>]+http-equiv=["\']?content-type["\']?[^>]*content=["\'][^>]*charset=([a-z0-9_\-:+.]+)', re.I)
# 'price' , 'lowPrice', 'highPrice' are usually under here
@@ -70,12 +30,6 @@ _DEFAULT_UNSAFE_XPATH3_FUNCTIONS = [
'unparsed-text-available',
'doc',
'doc-available',
'json-doc',
'json-doc-available',
'collection', # XPath 2.0+: loads XML node collections from arbitrary URIs
'uri-collection', # XPath 3.0+: enumerates URIs from resource collections
'transform', # XPath 3.1: XSLT transformation (currently raises, block proactively)
'load-xquery-module', # XPath 3.1: loads XQuery modules (currently raises, block proactively)
'environment-variable',
'available-environment-variables',
]
@@ -424,16 +378,12 @@ def _parse_json(json_data, json_filter):
raise Exception("jq not support not found")
if json_filter.startswith("jq:"):
expr = json_filter.removeprefix("jq:")
validate_jq_expression(expr)
jq_expression = jq.compile(expr)
jq_expression = jq.compile(json_filter.removeprefix("jq:"))
match = jq_expression.input(json_data).all()
return _get_stripped_text_from_json_match(match)
if json_filter.startswith("jqraw:"):
expr = json_filter.removeprefix("jqraw:")
validate_jq_expression(expr)
jq_expression = jq.compile(expr)
jq_expression = jq.compile(json_filter.removeprefix("jqraw:"))
match = jq_expression.input(json_data).all()
return '\n'.join(str(item) for item in match)
@@ -537,25 +487,13 @@ def extract_json_as_string(content, json_filter, ensure_is_ldjson_info_type=None
except json.JSONDecodeError as e:
logger.warning(f"Error processing JSON {content[:20]}...{str(e)})")
else:
# Check for JSONP wrapper: someCallback({...}) or some.namespace({...})
# Server may claim application/json but actually return JSONP
jsonp_match = re.match(r'^\w[\w.]*\s*\((.+)\)\s*;?\s*$', content.lstrip("\ufeff").strip(), re.DOTALL)
if jsonp_match:
try:
inner = jsonp_match.group(1).strip()
logger.warning(f"Content looks like JSONP, attempting to extract inner JSON for filter '{json_filter}'")
stripped_text_from_html = _parse_json(json.loads(inner), json_filter)
except json.JSONDecodeError as e:
logger.warning(f"Error processing JSONP inner content {content[:20]}...{str(e)})")
if not stripped_text_from_html:
# Probably something else, go fish inside for it
try:
stripped_text_from_html = extract_json_blob_from_html(content=content,
ensure_is_ldjson_info_type=ensure_is_ldjson_info_type,
json_filter=json_filter)
except json.JSONDecodeError as e:
logger.warning(f"Error processing JSON while extracting JSON from HTML blob {content[:20]}...{str(e)})")
# Probably something else, go fish inside for it
try:
stripped_text_from_html = extract_json_blob_from_html(content=content,
ensure_is_ldjson_info_type=ensure_is_ldjson_info_type,
json_filter=json_filter )
except json.JSONDecodeError as e:
logger.warning(f"Error processing JSON while extracting JSON from HTML blob {content[:20]}...{str(e)})")
if not stripped_text_from_html:
# Re 265 - Just return an empty string when filter not found

View File

@@ -100,13 +100,7 @@ class guess_stream_type():
if any(s in http_content_header for s in RSS_XML_CONTENT_TYPES):
self.is_rss = True
elif any(s in http_content_header for s in JSON_CONTENT_TYPES):
# JSONP detection: server claims application/json but content is actually JSONP (e.g. cb({...}))
# A JSONP response starts with an identifier followed by '(' - not valid JSON
if re.match(r'^\w[\w.]*\s*\(', test_content):
logger.warning(f"Content-Type header claims JSON but content looks like JSONP (starts with identifier+parenthesis) - treating as plaintext")
self.is_plaintext = True
else:
self.is_json = True
self.is_json = True
elif 'pdf' in magic_content_header:
self.is_pdf = True
# magic will call a rss document 'xml'

View File

@@ -1,7 +1,6 @@
from babel.numbers import parse_decimal
from changedetectionio.model.Watch import model as BaseWatch
from decimal import Decimal, InvalidOperation
from typing import Union
import re
@@ -11,8 +10,6 @@ supports_browser_steps = True
supports_text_filters_and_triggers = True
supports_text_filters_and_triggers_elements = True
supports_request_type = True
_price_re = re.compile(r"Price:\s*(\d+(?:\.\d+)?)", re.IGNORECASE)
class Restock(dict):
@@ -66,17 +63,6 @@ class Restock(dict):
super().__setitem__(key, value)
def get_price_from_history_str(history_str):
m = _price_re.search(history_str)
if not m:
return None
try:
return str(Decimal(m.group(1)))
except InvalidOperation:
return None
class Watch(BaseWatch):
def __init__(self, *arg, **kw):
super().__init__(*arg, **kw)
@@ -90,27 +76,13 @@ class Watch(BaseWatch):
def extra_notification_token_values(self):
values = super().extra_notification_token_values()
values['restock'] = self.get('restock', {})
values['restock']['previous_price'] = None
if self.history_n >= 2:
history = self.history
if history and len(history) >=2:
"""Unfortunately for now timestamp is stored as string key"""
sorted_keys = sorted(list(history), key=lambda x: int(x))
sorted_keys.reverse()
price_str = self.get_history_snapshot(timestamp=sorted_keys[-1])
if price_str:
values['restock']['previous_price'] = get_price_from_history_str(price_str)
return values
def extra_notification_token_placeholder_info(self):
values = super().extra_notification_token_placeholder_info()
values.append(('restock.price', "Price detected"))
values.append(('restock.in_stock', "In stock status"))
values.append(('restock.original_price', "Original price at first check"))
values.append(('restock.previous_price', "Previous price in history"))
return values

View File

@@ -199,31 +199,8 @@ def handle_watch_update(socketio, **kwargs):
logger.error(f"Socket.IO error in handle_watch_update: {str(e)}")
def _suppress_werkzeug_ws_abrupt_disconnect_noise():
"""Patch BaseWSGIServer.log to suppress the AssertionError traceback that fires when
a browser closes a WebSocket connection mid-handshake (e.g. closing a tab).
The exception is caught inside run_wsgi and routed to self.server.log() — it never
propagates out, so wrapping run_wsgi doesn't help. Patching the log method is the
only reliable intercept point. The error is cosmetic: Socket.IO already handles the
disconnect correctly via its own disconnect handler and timeout logic."""
try:
from werkzeug.serving import BaseWSGIServer
_original_log = BaseWSGIServer.log
def _filtered_log(self, type, message, *args):
if type == 'error' and 'write() before start_response' in message:
return
_original_log(self, type, message, *args)
BaseWSGIServer.log = _filtered_log
except Exception:
pass
def init_socketio(app, datastore):
"""Initialize SocketIO with the main Flask app"""
_suppress_werkzeug_ws_abrupt_disconnect_noise()
import platform
import sys

View File

@@ -116,14 +116,6 @@ $(document).ready(function () {
$('#realtime-conn-error').show();
});
// Tell the server we're leaving cleanly so it can release the connection
// immediately rather than waiting for a timeout.
// Note: this only fires for voluntary closes (tab/window close, navigation away).
// Hard kills, crashes and network drops will still timeout normally on the server.
window.addEventListener('beforeunload', function () {
socket.disconnect();
});
socket.on('queue_size', function (data) {
console.log(`${data.event_timestamp} - Queue size update: ${data.q_length}`);
if(queueSizePagerInfoText) {

View File

@@ -422,28 +422,3 @@ def test_plaintext_even_if_xml_content_and_can_apply_filters(client, live_server
assert b'&lt;foobar' not in res.data
res = delete_all_watches(client)
def test_last_error_cleared_on_same_checksum(client, live_server, datastore_path):
"""last_error should be cleared even when content is unchanged (checksumFromPreviousCheckWasTheSame path)"""
set_original_response(datastore_path=datastore_path)
uuid = client.application.config.get('DATASTORE').add_watch(url=url_for('test_endpoint', _external=True))
# First check - establishes baseline checksum
client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
wait_for_all_checks(client)
# Inject a stale last_error directly (simulates a prior failed check)
datastore = client.application.config.get('DATASTORE')
datastore.update_watch(uuid=uuid, update_obj={'last_error': 'Some previous error'})
assert datastore.data['watching'][uuid].get('last_error') == 'Some previous error'
# Second check - same content, so checksumFromPreviousCheckWasTheSame will fire
client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
wait_for_all_checks(client)
# last_error must be cleared even though no change was detected
assert datastore.data['watching'][uuid].get('last_error') == False
delete_all_watches(client)

View File

@@ -16,51 +16,6 @@ except ModuleNotFoundError:
def test_jsonp_treated_as_plaintext():
from ..processors.magic import guess_stream_type
# JSONP content (server wrongly claims application/json) should be detected as plaintext
# Callback names are arbitrary identifiers, not always 'cb'
jsonp_content = 'jQuery123456({ "version": "8.0.41", "url": "https://example.com/app.apk" })'
result = guess_stream_type(http_content_header="application/json", content=jsonp_content)
assert result.is_json is False
assert result.is_plaintext is True
# Variation with dotted callback name e.g. jQuery.cb(...)
jsonp_dotted = 'some.callback({ "version": "1.0" })'
result = guess_stream_type(http_content_header="application/json", content=jsonp_dotted)
assert result.is_json is False
assert result.is_plaintext is True
# Real JSON should still be detected as JSON
json_content = '{ "version": "8.0.41", "url": "https://example.com/app.apk" }'
result = guess_stream_type(http_content_header="application/json", content=json_content)
assert result.is_json is True
assert result.is_plaintext is False
def test_jsonp_json_filter_extraction():
from .. import html_tools
# Tough case: dotted namespace callback, trailing semicolon, deeply nested content with arrays
jsonp_content = 'weixin.update.callback({"platforms": {"android": {"variants": [{"arch": "arm64", "versionName": "8.0.68", "url": "https://example.com/app-arm64.apk"}, {"arch": "arm32", "versionName": "8.0.41", "url": "https://example.com/app-arm32.apk"}]}}});'
# Deep nested jsonpath filter into array element
text = html_tools.extract_json_as_string(jsonp_content, "json:$.platforms.android.variants[0].versionName")
assert text == '"8.0.68"'
# Filter that selects the second array element
text = html_tools.extract_json_as_string(jsonp_content, "json:$.platforms.android.variants[1].arch")
assert text == '"arm32"'
if jq_support:
text = html_tools.extract_json_as_string(jsonp_content, "jq:.platforms.android.variants[0].versionName")
assert text == '"8.0.68"'
text = html_tools.extract_json_as_string(jsonp_content, "jqraw:.platforms.android.variants[1].url")
assert text == "https://example.com/app-arm32.apk"
def test_unittest_inline_html_extract():
# So lets pretend that the JSON we want is inside some HTML
content="""

View File

@@ -350,7 +350,6 @@ def test_change_with_notification_values(client, live_server, measure_memory_usa
res = client.get(url_for("settings.settings_page"))
assert b'{{restock.original_price}}' in res.data
assert b'{{restock.previous_price}}' in res.data
assert b'Original price at first check' in res.data
#####################
@@ -359,7 +358,7 @@ def test_change_with_notification_values(client, live_server, measure_memory_usa
url_for("settings.settings_page"),
data={"application-notification_urls": notification_url,
"application-notification_title": "title new price {{restock.price}}",
"application-notification_body": "new price {{restock.price}} previous price {{restock.previous_price}} instock {{restock.in_stock}}",
"application-notification_body": "new price {{restock.price}}",
"application-notification_format": default_notification_format,
"requests-time_between_check-minutes": 180,
'application-fetch_backend': "html_requests"},
@@ -373,6 +372,8 @@ def test_change_with_notification_values(client, live_server, measure_memory_usa
assert b"Settings updated." in res.data
set_original_response(props_markup=instock_props[0], price='960.45', datastore_path=datastore_path)
# A change in price, should trigger a change by default
set_original_response(props_markup=instock_props[0], price='1950.45', datastore_path=datastore_path)
client.get(url_for("ui.form_watch_checknow"))
@@ -383,7 +384,6 @@ def test_change_with_notification_values(client, live_server, measure_memory_usa
notification = f.read()
assert "new price 1950.45" in notification
assert "title new price 1950.45" in notification
assert "previous price 960.45" in notification
## Now test the "SEND TEST NOTIFICATION" is working
os.unlink(os.path.join(datastore_path, "notification.txt"))

View File

@@ -610,11 +610,6 @@ def test_xpath_blocked_functions_unit():
"unparsed-text-available('file:///etc/passwd')",
"doc('file:///etc/passwd')",
"doc-available('file:///etc/passwd')",
"json-doc('file:///datastore/changedetection.json')",
"collection('file:///datastore/')",
"uri-collection('file:///datastore/')",
"transform(map{})",
"load-xquery-module('foo')",
"environment-variable('PATH')",
"available-environment-variables()",
]

View File

@@ -369,7 +369,7 @@ msgstr "Protokol ladění oznámení"
#: changedetectionio/blueprint/settings/templates/settings.html changedetectionio/blueprint/tags/templates/edit-tag.html
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "General"
msgstr "Obecné"
msgstr "Generál"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Fetching"
@@ -393,7 +393,7 @@ msgstr "RSS"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Backups"
msgstr "Zálohy"
msgstr "Backups"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Time & Date"
@@ -409,7 +409,7 @@ msgstr "Info"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Default recheck time for all watches, current system minimum is"
msgstr "Výchozí čas opětovné kontroly pro všechna sledování, aktuální systémové minimum je"
msgstr "Výchozí čas opětovné kontroly pro všechny monitory, aktuální systémové minimum je"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "more info"
@@ -445,7 +445,9 @@ msgstr ""
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Allow access to the watch change history page when password is enabled (Good for sharing the diff page)"
msgstr "Povolit přístup na stránku historie změn monitoru, když je povoleno heslo (Vhodné pro sdílení stránky rozdílů)"
msgstr ""
"Povolit přístup na stránku historie změn monitoru, když je povoleno heslo (Vhodné pro sdílení stránky rozdílů)Povolit"
" anonymní přístup na stránku historie sledování, když je povoleno heslo"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "When a request returns no content, or the HTML does not contain any text, is this considered a change?"
@@ -453,7 +455,7 @@ msgstr ""
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Choose a default proxy for all watches"
msgstr "Vyberte výchozí proxy pro všechna sledování"
msgstr "Vyberte výchozí proxy pro všechny monitory"
#: changedetectionio/blueprint/settings/templates/settings.html
msgid "Base URL used for the"
@@ -477,7 +479,7 @@ msgstr ""
#: changedetectionio/blueprint/settings/templates/settings.html changedetectionio/blueprint/ui/templates/edit.html
msgid "Use the"
msgstr "Použít"
msgstr "Použijte"
#: changedetectionio/blueprint/settings/templates/settings.html changedetectionio/blueprint/ui/templates/edit.html
msgid "Basic"
@@ -503,7 +505,7 @@ msgstr ""
#: changedetectionio/blueprint/settings/templates/settings.html changedetectionio/blueprint/ui/templates/edit.html
msgid "This will wait"
msgstr "Toto počká"
msgstr "Tohle počká"
#: changedetectionio/blueprint/settings/templates/settings.html changedetectionio/blueprint/ui/templates/edit.html
msgid "seconds before extracting the text."
@@ -863,7 +865,7 @@ msgstr "povoleny adresy URL pro upozornění v celém systému"
#: changedetectionio/blueprint/tags/templates/edit-tag.html changedetectionio/blueprint/ui/templates/edit.html
msgid "this form will override notification settings for this watch only"
msgstr "tento formulář přepíše nastavení oznámení pouze pro tato sledování"
msgstr "tento formulář přepíše nastavení oznámení pouze pro tyto monitory"
#: changedetectionio/blueprint/tags/templates/edit-tag.html changedetectionio/blueprint/ui/templates/edit.html
msgid "an empty Notification URL list here will still send notifications."
@@ -880,7 +882,7 @@ msgstr "Přidejte novou značku organizace"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Watch group / tag"
msgstr "Sledovat skupinu / Značka"
msgstr "Skupina / Značka"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "Groups allows you to manage filters and notifications for multiple watches under a single organisational tag."
@@ -888,15 +890,15 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "# Watches"
msgstr "# Sledování"
msgstr "# monitorů"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "Tag / Label name"
msgstr "Tag / Název štítku"
msgstr "Název štítku / štítku"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "No website organisational tags/groups configured"
msgstr "Žádné skupiny/značky zatím nebyly nastaveny"
msgstr "Žádné skupiny/značky"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
@@ -906,7 +908,7 @@ msgstr "Upravit"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Recheck"
msgstr "Znovu zkontrolovat"
msgstr "Znovu zkontrolujte"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "Delete Group?"
@@ -920,7 +922,7 @@ msgstr ""
#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/templates/edit.html
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Delete"
msgstr "Smazat"
msgstr "Vymazat"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "Deletes and removes tag"
@@ -943,36 +945,36 @@ msgstr "Odpojit"
#: changedetectionio/blueprint/tags/templates/groups-overview.html
msgid "Keep the tag but unlink any watches"
msgstr "Ponechte štítek, ale odpojte všechna sledování"
msgstr "Ponechte štítek, ale odpojte všechny monitory"
#: changedetectionio/blueprint/tags/templates/groups-overview.html changedetectionio/blueprint/ui/templates/edit.html
msgid "RSS Feed for this watch"
msgstr "RSS kanál pro toto sledování"
msgstr "RSS kanál pro tyto monitory"
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "{} watches deleted"
msgstr "{} sledování smazáno"
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "{} watches paused"
msgstr "{} sledování pozastaveno"
msgstr "{} monitorů pozastaveno"
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "{} watches unpaused"
msgstr "{} sledování opět spuštěno"
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "{} watches updated"
msgstr "{} sledování aktualizováno"
msgstr ""
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "{} watches muted"
msgstr "{} sledování ztlumeno"
msgstr "{} monitorů ztlumeno"
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
@@ -1011,7 +1013,7 @@ msgstr "Sledujte tuto adresu URL!"
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "Cleared snapshot history for watch {}"
msgstr "Historie snímků vymazána pro sledování {}"
msgstr "Historie snímků vymazána pro monitor {}"
#: changedetectionio/blueprint/ui/__init__.py
msgid "History clearing started in background"
@@ -1028,7 +1030,7 @@ msgstr ""
#: changedetectionio/blueprint/ui/__init__.py
msgid "Deleted."
msgstr "Smazáno"
msgstr "Vymazat"
#: changedetectionio/blueprint/ui/__init__.py
msgid "Cloned, you are editing the new watch."
@@ -1045,7 +1047,7 @@ msgstr ""
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
msgid "Queued {} watches for rechecking ({} already queued or running)."
msgstr "Do fronty přidáno {} sledování k opětovné kontrole ({} již ve frontě nebo běží)."
msgstr "Do fronty přidáno {} monitorů k opětovné kontrole ({} již ve frontě nebo běží)."
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
@@ -1054,7 +1056,7 @@ msgstr "Do fronty přidáno {} sledování k opětovné kontrole."
#: changedetectionio/blueprint/ui/__init__.py
msgid "Queueing watches for rechecking in background..."
msgstr "Přidává se sledování do fronty pro opětovnou kontrolu na pozadí..."
msgstr "Přidávání monitorů do fronty pro opětovnou kontrolu na pozadí..."
#: changedetectionio/blueprint/ui/__init__.py
#, python-brace-format
@@ -1103,7 +1105,7 @@ msgstr ""
#: changedetectionio/blueprint/ui/edit.py
msgid "Updated watch."
msgstr "Sledování aktualizováno."
msgstr "Smazat monitory?"
#: changedetectionio/blueprint/ui/preview.py
msgid "Preview unavailable - No fetch/check completed or triggers not reached"
@@ -1119,7 +1121,7 @@ msgstr "Možná budete chtít použít"
#: changedetectionio/blueprint/ui/templates/clear_all_history.html
msgid "BACKUP"
msgstr "ZÁLOHA"
msgstr "BACKUP"
#: changedetectionio/blueprint/ui/templates/clear_all_history.html
msgid "link first."
@@ -1159,11 +1161,11 @@ msgstr "Sdílet jako obrázek"
#: changedetectionio/blueprint/ui/templates/diff-offscreen-options.html
msgid "Ignore any lines matching"
msgstr "Ignorovat všechny odpovídající řádky"
msgstr "Ignorujte všechny odpovídající řádky"
#: changedetectionio/blueprint/ui/templates/diff-offscreen-options.html
msgid "Ignore any lines matching excluding digits"
msgstr "Ignorovat všechny odpovídající řádky kromě číslic"
msgstr "Ignorujte všechny odpovídající řádky kromě číslic"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "From"
@@ -1183,7 +1185,7 @@ msgstr "Řádky"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "Ignore Whitespace"
msgstr "Ignorovat mezery"
msgstr "Ignorujte mezery"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "Same/non-changed"
@@ -1207,7 +1209,7 @@ msgstr "Klávesnice:"
#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
msgid "Previous"
msgstr "Předchozí"
msgstr "Náhled"
#: changedetectionio/blueprint/ui/templates/diff.html changedetectionio/blueprint/ui/templates/preview.html
msgid "Next"
@@ -1239,7 +1241,7 @@ msgstr "Aktuální snímek obrazovky"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "Extract Data"
msgstr "Extrahovat data"
msgstr "Extrahujte data"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "seconds ago."
@@ -1267,7 +1269,7 @@ msgstr "NASTAVENÍ"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "Goto single snapshot"
msgstr "Přejít na samotný snímek"
msgstr "Přejít na jeden snímek"
#: changedetectionio/blueprint/ui/templates/diff.html
msgid "Highlight text to share or add to ignore lists."
@@ -1357,15 +1359,15 @@ msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Check/Scan all"
msgstr "Vše znovu zkontrolovat"
msgstr "Znovu zkontrolujte vše"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Choose a proxy for this watch"
msgstr "Vybrat proxy pro toto sledování"
msgstr "RSS kanál pro tyto monitory"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Using the current global default settings"
msgstr "Aktuálně je použito globální výchozí nastavení"
msgstr "Použití aktuálního globálního výchozího nastavení"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Show advanced options"
@@ -1389,7 +1391,7 @@ msgstr "Proměnné jsou podporovány v hodnotách hlavičky požadavku"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Alert! Extra headers file found and will be added to this watch!"
msgstr "Upozornění! Byl nalezen další soubor záhlaví a bude přidán do těchto sledování!"
msgstr "Upozornění! Byl nalezen další soubor záhlaví a bude přidán do těchto monitorů!"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Headers can be also read from a file in your data-directory"
@@ -1425,7 +1427,7 @@ msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Visual Selector data is not ready, watch needs to be checked atleast once."
msgstr "Data Visual Selector nejsou připravena, sledování je třeba alespoň jednou zkontrolovat."
msgstr "Data Visual Selector nejsou připravena, monitory je třeba alespoň jednou zkontrolovat."
#: changedetectionio/blueprint/ui/templates/edit.html
msgid ""
@@ -1631,11 +1633,11 @@ msgstr ""
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Delete Watch?"
msgstr "Smazat sledování?"
msgstr "Smazat monitory?"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Are you sure you want to delete the watch for:"
msgstr "Opravdu chcete smazat sledování pro:"
msgstr "Opravdu chcete smazat monitory pro:"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "This action cannot be undone."
@@ -1659,15 +1661,15 @@ msgstr "Vymazat historii"
#: changedetectionio/blueprint/ui/templates/edit.html
msgid "Clone & Edit"
msgstr "Duplikovat a upravit"
msgstr "Klonovat a upravovat"
#: changedetectionio/blueprint/ui/templates/preview.html
msgid "Select timestamp"
msgstr "Vybrat časové razítko"
msgstr "Vyberte časové razítko"
#: changedetectionio/blueprint/ui/templates/preview.html
msgid "Go"
msgstr "Přejít"
msgstr "Jít"
#: changedetectionio/blueprint/ui/templates/preview.html
msgid "Current erroring screenshot from most recent request"
@@ -1713,7 +1715,7 @@ msgstr ""
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Add a new web page change detection watch"
msgstr "Přidejte nové sledování zjišťování změn webové stránky"
msgstr "Přidejte nové monitory zjišťování změn webové stránky"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Watch this URL!"
@@ -1721,7 +1723,7 @@ msgstr "Monitorovat tuto URL!"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Edit first then Watch"
msgstr "Nejdříve upravit, poté sledovat"
msgstr "Upravit a monitorovat"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Pause"
@@ -1745,7 +1747,7 @@ msgstr "Štítek"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Mark viewed"
msgstr "Označit jako shlédnuté"
msgstr "Mark zobrazil"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Use default notification"
@@ -1773,7 +1775,7 @@ msgstr "Vymazat/resetovat historii"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Delete Watches?"
msgstr "Smazat sledování?"
msgstr "Smazat monitory?"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "<p>Are you sure you want to delete the selected watches?</strong></p><p>This action cannot be undone.</p>"
@@ -1821,7 +1823,7 @@ msgstr "importovat seznam"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Detecting restock and price"
msgstr "Kontrola zásob a ceny"
msgstr "Detekce zásob a ceny"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "In stock"
@@ -1874,7 +1876,7 @@ msgstr "Nepřečtený"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
msgid "Recheck all"
msgstr "Znovu zkontrolovat vše"
msgstr "Znovu zkontrolujte vše"
#: changedetectionio/blueprint/watchlist/templates/watch-overview.html
#, python-format
@@ -2024,7 +2026,7 @@ msgstr "neděle"
#: changedetectionio/forms.py
msgid "Weeks"
msgstr "Týdny"
msgstr "týdny"
#: changedetectionio/forms.py
msgid "Should contain zero or more seconds"
@@ -2044,7 +2046,7 @@ msgstr "Minuty"
#: changedetectionio/forms.py
msgid "Seconds"
msgstr "Sekundy"
msgstr "sekundy"
#: changedetectionio/forms.py
msgid "Notification Body and Title is required when a Notification URL is used"
@@ -2149,7 +2151,7 @@ msgstr "Nahrajte soubor .xlsx"
#: changedetectionio/forms.py
msgid "Must be .xlsx file!"
msgstr "Musí být soubor .xlsx!"
msgstr "Musí to být soubor .xlsx!"
#: changedetectionio/forms.py
msgid "File mapping"
@@ -2173,7 +2175,7 @@ msgstr "Interval mezi kontrolami"
#: changedetectionio/forms.py
msgid "Use global settings for time between check and scheduler."
msgstr "Použít globální nastavení pro čas mezi kontrolou a plánovačem."
msgstr "Použijte globální nastavení pro čas mezi kontrolou a plánovačem."
#: changedetectionio/forms.py
msgid "CSS/JSONPath/JQ/XPath Filters"
@@ -2282,7 +2284,7 @@ msgstr "Připojte snímek obrazovky k oznámení (pokud je to možné)"
#: changedetectionio/forms.py
msgid "Match"
msgstr "Shoda"
msgstr "# monitory"
#: changedetectionio/forms.py
msgid "Match all of the following"
@@ -2353,11 +2355,11 @@ msgstr "Výchozí proxy"
#: changedetectionio/forms.py
msgid "Random jitter seconds ± check"
msgstr "Náhodný rozptyl kontrol ± sekund"
msgstr "Náhodné jitter sekundy ± kontrola"
#: changedetectionio/forms.py
msgid "Number of fetch workers"
msgstr "Počet procesů kontrol"
msgstr "Počet pracovníků aportů"
#: changedetectionio/forms.py
msgid "Should be between 1 and 50"
@@ -2365,15 +2367,15 @@ msgstr "Mělo by být mezi 1 a 50"
#: changedetectionio/forms.py
msgid "Requests timeout in seconds"
msgstr "Časový limit vypršení kontrol v sekundách"
msgstr "Požaduje časový limit v sekundách"
#: changedetectionio/forms.py
msgid "Should be between 1 and 999"
msgstr "Nastavit mezi 1 a 999"
msgstr "Mělo by být mezi 1 a 999"
#: changedetectionio/forms.py
msgid "Default User-Agent overrides"
msgstr "Změna výchozího nastavení hodnoty User-Agent"
msgstr "Výchozí přepisy User-Agent"
#: changedetectionio/forms.py
msgid "Both a name, and a Proxy URL is required."
@@ -2385,11 +2387,11 @@ msgstr "Otevřete stránku „Historie“ na nové kartě"
#: changedetectionio/forms.py
msgid "Realtime UI Updates Enabled"
msgstr "Aktualizace UI v reálném čase"
msgstr "Aktualizace v reálném čase offline"
#: changedetectionio/forms.py
msgid "Favicons Enabled"
msgstr "Povolit favikony"
msgstr "zvážit povolení"
#: changedetectionio/forms.py
msgid "Use page <title> in watch overview list"
@@ -2425,7 +2427,7 @@ msgstr "Heslo"
#: changedetectionio/forms.py
msgid "Pager size"
msgstr "Počet položek na stránku"
msgstr "Velikost pageru"
#: changedetectionio/forms.py
msgid "Should be atleast zero (disabled)"
@@ -2457,7 +2459,7 @@ msgstr "Povolit anonymní přístup na stránku historie sledování, když je p
#: changedetectionio/forms.py
msgid "Hide muted watches from RSS feed"
msgstr "Skrýt ztlumená sledování pro RSS zdroje"
msgstr "Skrýt ztlumené monitory ze zdroje RSS"
#: changedetectionio/forms.py
msgid "Enable RSS reader mode "

File diff suppressed because it is too large Load Diff

View File

@@ -284,9 +284,6 @@ async def async_update_worker(worker_id, q, notification_q, app, datastore, exec
logger.debug(f'[{uuid}] - checksumFromPreviousCheckWasTheSame - Checksum from previous check was the same, nothing todo here.')
# Reset the edited flag since we successfully completed the check
watch.reset_watch_edited_flag()
# Page was fetched successfully - clear any previous error state
datastore.update_watch(uuid=uuid, update_obj={'last_error': False})
cleanup_error_artifacts(uuid, datastore)
except content_fetchers_exceptions.BrowserConnectError as e:
datastore.update_watch(uuid=uuid,