From 7ee249e2ffddadf31354614b9243fedd23791ca0 Mon Sep 17 00:00:00 2001 From: dgtlmoon Date: Thu, 10 Oct 2024 12:53:56 +0200 Subject: [PATCH] Fix labels --- changedetectionio/forms.py | 2 +- changedetectionio/processors/text_json_diff/processor.py | 1 - changedetectionio/templates/edit.html | 8 ++++---- changedetectionio/templates/settings.html | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py index 28fdfeb9..19056b5d 100644 --- a/changedetectionio/forms.py +++ b/changedetectionio/forms.py @@ -476,7 +476,7 @@ class processor_text_json_diff_form(commonSettingsForm): title = StringField('Title', default='') - ignore_text = StringListField('Remove lines containing', [ValidateListRegex()]) + ignore_text = StringListField('Ignore lines containing', [ValidateListRegex()]) headers = StringDictKeyValue('Request headers') body = TextAreaField('Request body', [validators.Optional()]) method = SelectField('Request method', choices=valid_method, default=default_method) diff --git a/changedetectionio/processors/text_json_diff/processor.py b/changedetectionio/processors/text_json_diff/processor.py index d6501390..63bfd759 100644 --- a/changedetectionio/processors/text_json_diff/processor.py +++ b/changedetectionio/processors/text_json_diff/processor.py @@ -299,7 +299,6 @@ class perform_site_check(difference_detection_processor): text_to_ignore = watch.get('ignore_text', []) + self.datastore.data['settings']['application'].get('global_ignore_text', []) text_for_checksuming = stripped_text_from_html if text_to_ignore: - # MOVE THIS TO THE MD5 PART SIDE, TEXT MUST BE KEPT BUT IT IS IGNORED_EXCEPTIONS text_for_checksuming = html_tools.strip_ignore_text(stripped_text_from_html, text_to_ignore) # Re #133 - if we should strip whitespaces from triggering the change detected comparison diff --git a/changedetectionio/templates/edit.html b/changedetectionio/templates/edit.html index 1f7d363f..5847962f 100644 --- a/changedetectionio/templates/edit.html +++ b/changedetectionio/templates/edit.html @@ -329,9 +329,9 @@ nav {{ render_checkbox_field(form.filter_text_added) }} {{ render_checkbox_field(form.filter_text_replaced) }} {{ render_checkbox_field(form.filter_text_removed) }} - Note: Depending on the length and similarity of the text on each line, the algorithm may consider an addition instead of replacement for example. - So it's always better to select Added+Replaced when you're interested in new content.
- When content is merely moved in a list, it will also trigger an addition, consider enabling Only trigger when unique lines appear + Note: Depending on the length and similarity of the text on each line, the algorithm may consider an addition instead of replacement for example.
+  So it's always better to select Added+Replaced when you're interested in new content.
+  When content is merely moved in a list, it will also trigger an addition, consider enabling Only trigger when unique lines appear
{{ render_checkbox_field(form.check_unique_lines) }} @@ -370,7 +370,7 @@ nav ") }}
    -
  • Matching text will be removed from the text snapshot
  • +
  • Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)
  • Each line processed separately, any line matching will be ignored (removed before creating the checksum)
  • Regular Expression support, wrap the entire line in forward slash /regex/
  • Changing this will affect the comparison checksum which may trigger an alert
  • diff --git a/changedetectionio/templates/settings.html b/changedetectionio/templates/settings.html index ad41e7b6..e39c4081 100644 --- a/changedetectionio/templates/settings.html +++ b/changedetectionio/templates/settings.html @@ -172,7 +172,7 @@ nav Note: This is applied globally in addition to the per-watch rules.
      -
    • Matching text will be removed from the text snapshot
    • +
    • Matching text will be ignored in the text snapshot (you can still see it but it wont trigger a change)
    • Note: This is applied globally in addition to the per-watch rules.
    • Each line processed separately, any line matching will be ignored (removed before creating the checksum)
    • Regular Expression support, wrap the entire line in forward slash /regex/