cphipps/changedetection.io
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ability for watch to use a more obvious system default fetcher (#1320)

Browse Source
This commit is contained in:
dgtlmoon
2023-01-19 21:20:58 +01:00
parent 7c5e2d00af
commit fba719ab8d
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
changedetectionio/__init__.py
View File

@@ -571,6 +571,8 @@ def changedetection_app(config=None, datastore_o=None):
data=default,
)
form.fetch_backend.choices.append(("system", 'System settings default'))
# form.browser_steps[0] can be assumed that we 'goto url' first
if datastore.proxy_list is None:
@@ -599,10 +601,6 @@ def changedetection_app(config=None, datastore_o=None):
using_default_check_time = False
break
# Use the default if it's the same as system-wide.
if form.fetch_backend.data == datastore.data['settings']['application']['fetch_backend']:
extra_update_obj['fetch_backend'] = None
# Ignore text
@@ -652,8 +650,10 @@ def changedetection_app(config=None, datastore_o=None):
watch = datastore.data['watching'].get(uuid)
system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
is_html_webdriver = False
if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_requests':
is_html_webdriver = True
output = render_template("edit.html",
browser_steps_config=browser_step_ui_config,