lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-11-02 23:57:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
dgtlmoon
2023-06-27 18:08:48 +02:00
parent 82786225b2
commit b8a7f66655
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
changedetectionio/update_worker.py
View File

@@ -66,7 +66,7 @@ class update_worker(threading.Thread):
self.notification_q.put(n_object)
# Prefer - Individual watch settings > Tag settings > Global settings (in that order)
def _check_vars(self, var_name, watch):
def _check_cascading_vars(self, var_name, watch):
from changedetectionio.notification import (
default_notification_format_for_watch,
@@ -103,7 +103,7 @@ class update_worker(threading.Thread):
def send_content_changed_notification(self, watch_uuid):
n_object = {}
watch = self.datastore.data['watching'].get(watch_uuid, False)
watch = self.datastore.data['watching'].get(watch_uuid)
if not watch:
return
@@ -119,18 +119,18 @@ class update_worker(threading.Thread):
# Should be a better parent getter in the model object
# Prefer - Individual watch settings > Tag settings > Global settings (in that order)
n_object['notification_urls'] = self._check_vars('notification_urls', watch)
n_object['notification_title'] = self._check_vars('notification_title', watch)
n_object['notification_body'] = self._check_vars('notification_body', watch)
n_object['notification_format'] = self._check_vars('notification_format', watch)
n_object['notification_urls'] = self._check_cascading_vars('notification_urls', watch)
n_object['notification_title'] = self._check_cascading_vars('notification_title', watch)
n_object['notification_body'] = self._check_cascading_vars('notification_body', watch)
n_object['notification_format'] = self._check_cascading_vars('notification_format', watch)
# (Individual watch) Only prepare to notify if the rules above matched
sent = False
if 'notification_urls' in n_object and n_object.get('notification_urls'):
sent = True
queued = False
if n_object and n_object.get('notification_urls'):
queued = True
self.queue_notification_for_watch(n_object, watch)
return sent
return queued
def send_filter_failure_notification(self, watch_uuid):