diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py index 771abfa4..44489d0c 100644 --- a/changedetectionio/__init__.py +++ b/changedetectionio/__init__.py @@ -417,6 +417,7 @@ def changedetection_app(config=None, datastore_o=None): has_unviewed=datastore.has_unviewed, hosted_sticky=os.getenv("SALTED_PASS", False) == False, queued_uuids=[q_uuid.item['uuid'] for q_uuid in update_q.queue], + system_default_fetcher=datastore.data['settings']['application'].get('fetch_backend'), tags=existing_tags, watches=sorted_watches ) diff --git a/changedetectionio/model/Watch.py b/changedetectionio/model/Watch.py index 64b32864..a8ec6fb4 100644 --- a/changedetectionio/model/Watch.py +++ b/changedetectionio/model/Watch.py @@ -18,7 +18,7 @@ base_config = { 'consecutive_filter_failures': 0, # Every time the CSS/xPath filter cannot be located, reset when all is fine. 'extract_text': [], # Extract text by regex after filters 'extract_title_as_title': False, - 'fetch_backend': None, + 'fetch_backend': 'system', 'filter_failure_notification_send': strtobool(os.getenv('FILTER_FAILURE_NOTIFICATION_SEND_DEFAULT', 'True')), 'has_ldjson_price_data': None, 'track_ldjson_price_data': None, diff --git a/changedetectionio/store.py b/changedetectionio/store.py index 2d190402..820b5422 100644 --- a/changedetectionio/store.py +++ b/changedetectionio/store.py @@ -673,3 +673,13 @@ class ChangeDetectionStore: self.data['settings']['application']['notification_urls'][i] = re.sub(r, r'{{\1}}', url) return + + # Some setups may have missed the correct default, so it shows the wrong config in the UI, although it will default to system-wide + def update_10(self): + for uuid, watch in self.data['watching'].items(): + try: + if not watch.get('fetch_backend', ''): + watch['fetch_backend'] = 'system' + except: + continue + return diff --git a/changedetectionio/templates/watch-overview.html b/changedetectionio/templates/watch-overview.html index d5f987d4..60a75b77 100644 --- a/changedetectionio/templates/watch-overview.html +++ b/changedetectionio/templates/watch-overview.html @@ -91,7 +91,12 @@ - {%if watch.get_fetch_backend == "html_webdriver" %}{% endif %} + {% if watch.get_fetch_backend == "html_webdriver" + or ( watch.get_fetch_backend == "system" and system_default_fetcher == 'html_webdriver' ) + %} + + {% endif %} + {%if watch.is_pdf %}{% endif %} {% if watch.last_error is defined and watch.last_error != False %}
{{ watch.last_error }}