Ignore text should override trigger text (It should ignore the trigger text if it appears)

.github/workflows/test-container-build.yml

@@ -74,5 +74,5 @@ jobs:
             file: ${{ matrix.dockerfile }}
             platforms: ${{ matrix.platform }}
             cache-from: type=gha
-            cache-to: type=gha,mode=min
+            cache-to: type=gha,mode=max
 

changedetectionio/blueprint/settings/templates/settings.html

@@ -191,12 +191,6 @@ nav
                         </ul>
                      </span>
                     </fieldset>
-                    <fieldset class="pure-group">
-                        {{ render_checkbox_field(form.application.form.strip_ignored_lines) }}
-                        <span class="pure-form-message-inline">Remove any text that appears in the "Ignore text" from the output (otherwise its just ignored for change-detection)<br>
-                        <i>Note:</i> Changing this will change the status of your existing watches, possibly trigger alerts etc.
-                        </span>
-                    </fieldset>
            </div>
 
             <div class="tab-pane-inner" id="api">

changedetectionio/forms.py

@@ -759,7 +759,6 @@ class processor_text_json_diff_form(commonSettingsForm):
     check_unique_lines = BooleanField('Only trigger when unique lines appear in all history', default=False)
     remove_duplicate_lines = BooleanField('Remove duplicate lines of text', default=False)
     sort_text_alphabetically =  BooleanField('Sort text alphabetically', default=False)
-    strip_ignored_lines = TernaryNoneBooleanField('Strip ignored lines', default=None)
     trim_text_whitespace = BooleanField('Trim whitespace before and after text', default=False)
 
     filter_text_added = BooleanField('Added lines', default=True)
@@ -937,7 +936,6 @@ class globalSettingsApplicationForm(commonSettingsForm):
     removepassword_button = SubmitField('Remove password', render_kw={"class": "pure-button pure-button-primary"})
     render_anchor_tag_content = BooleanField('Render anchor tag content', default=False)
     shared_diff_access = BooleanField('Allow anonymous access to watch history page when password is enabled', default=False, validators=[validators.Optional()])
-    strip_ignored_lines = BooleanField('Strip ignored lines')
     rss_hide_muted_watches = BooleanField('Hide muted watches from RSS feed', default=True,
                                       validators=[validators.Optional()])
     filter_failure_notification_threshold_attempts = IntegerField('Number of times the filter can be missing before sending a notification',

changedetectionio/model/App.py

@@ -57,7 +57,6 @@ class model(dict):
                     'rss_hide_muted_watches': True,
                     'schema_version' : 0,
                     'shared_diff_access': False,
-                    'strip_ignored_lines': False,
                     'tags': {}, #@todo use Tag.model initialisers
                     'timezone': None, # Default IANA timezone name
                     'webdriver_delay': None , # Extra delay in seconds before extracting text

changedetectionio/model/__init__.py

@@ -58,7 +58,6 @@ class watch_base(dict):
             'proxy': None,  # Preferred proxy connection
             'remote_server_reply': None,  # From 'server' reply header
             'sort_text_alphabetically': False,
-            'strip_ignored_lines': None,
             'subtractive_selectors': [],
             'tag': '',  # Old system of text name for a tag, to be removed
             'tags': [],  # list of UUIDs to App.Tags

changedetectionio/processors/text_json_diff/processor.py

@@ -315,11 +315,6 @@ class perform_site_check(difference_detection_processor):
         text_for_checksuming = stripped_text_from_html
         if text_to_ignore:
             text_for_checksuming = html_tools.strip_ignore_text(stripped_text_from_html, text_to_ignore)
-            # Some people prefer to also completely remove it
-            strip_ignored_lines = watch.get('strip_ignored_lines') if watch.get('strip_ignored_lines') is not None else self.datastore.data['settings']['application'].get('strip_ignored_lines')
-            if strip_ignored_lines:
-                # @todo add test in the 'preview' mode, check the widget works? compare to datastruct
-                stripped_text_from_html = text_for_checksuming
 
         # Re #133 - if we should strip whitespaces from triggering the change detected comparison
         if text_for_checksuming and self.datastore.data['settings']['application'].get('ignore_whitespace', False):
@@ -336,7 +331,7 @@ class perform_site_check(difference_detection_processor):
             # Filter and trigger works the same, so reuse it
             # It should return the line numbers that match
             # Unblock flow if the trigger was found (some text remained after stripped what didnt match)
-            result = html_tools.strip_ignore_text(content=str(stripped_text_from_html),
+            result = html_tools.strip_ignore_text(content=str(text_for_checksuming),
                                                   wordlist=trigger_text,
                                                   mode="line numbers")
             # Unblock if the trigger was found

changedetectionio/static/styles/scss/parts/_widgets.scss

@@ -34,6 +34,7 @@
       transition: all 0.2s ease;
       cursor: pointer;
       display: block;
+      min-width: 60px;
       text-align: center;
     }
 

changedetectionio/templates/edit/text-options.html

@@ -26,10 +26,7 @@
                             <li>Changing this will affect the comparison checksum which may trigger an alert</li>
                         </ul>
                 </span>
-                <br><br>
-                    <div class="pure-control-group">
-                      {{ render_ternary_field(form.strip_ignored_lines) }}
-                    </div>
+
                 </fieldset>
 
                 <fieldset>

changedetectionio/tests/test_ignore.py

@@ -58,39 +58,3 @@ def test_ignore(client, live_server, measure_memory_usage):
     # Should be in base.html
     assert b'csrftoken' in res.data
 
-
-def test_strip_ignore_lines(client, live_server, measure_memory_usage):
-   #  live_server_setup(live_server) # Setup on conftest per function
-    set_original_ignore_response()
-
-
-    # Goto the settings page, add our ignore text
-    res = client.post(
-        url_for("settings.settings_page"),
-        data={
-            "requests-time_between_check-minutes": 180,
-            "application-ignore_whitespace": "y",
-            "application-strip_ignored_lines": "y",
-            "application-global_ignore_text": "Which is across multiple",
-            'application-fetch_backend': "html_requests"
-        },
-        follow_redirects=True
-    )
-    assert b"Settings updated." in res.data
-
-    test_url = url_for('test_endpoint', _external=True)
-    res = client.post(
-        url_for("imports.import_page"),
-        data={"urls": test_url},
-        follow_redirects=True
-    )
-    assert b"1 Imported" in res.data
-
-    # Give the thread time to pick it up
-    wait_for_all_checks(client)
-    uuid = next(iter(live_server.app.config['DATASTORE'].data['watching']))
-
-    # It should not be in the preview anymore
-    res = client.get(url_for("ui.ui_views.preview_page", uuid=uuid))
-    assert b'<div class="ignored">' not in res.data
-    assert b'Which is across multiple' not in res.data

changedetectionio/tests/test_trigger.py

@@ -72,7 +72,13 @@ def test_trigger_functionality(client, live_server, measure_memory_usage):
     )
     assert b"1 Imported" in res.data
 
-    # Trigger a check
+
+    # And set the trigger text as 'ignore text', it should then not trigger
+    live_server.app.config['DATASTORE'].data['settings']['application']['global_ignore_text'] = [trigger_text]
+
+
+
+# Trigger a check
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
 
     # Goto the edit page, add our ignore text
@@ -123,12 +129,23 @@ def test_trigger_functionality(client, live_server, measure_memory_usage):
     # Now set the content which contains the trigger text
     set_modified_with_trigger_text_response()
 
+    # There is a "ignore text" set of the change that should be also the trigger, it should not trigger
+    # because the ignore text should be stripped from the response, therefor, the trigger should not fire
+    client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
+    wait_for_all_checks(client)
+    res = client.get(url_for("watchlist.index"))
+    assert b'has-unread-changes' not in res.data
+
+
+    live_server.app.config['DATASTORE'].data['settings']['application']['global_ignore_text'] = []
+    # check that the trigger fired once we stopped ignore it
     client.get(url_for("ui.form_watch_checknow"), follow_redirects=True)
     wait_for_all_checks(client)
     res = client.get(url_for("watchlist.index"))
     assert b'has-unread-changes' in res.data
 
-    # https://github.com/dgtlmoon/changedetection.io/issues/616
+
+# https://github.com/dgtlmoon/changedetection.io/issues/616
     # Apparently the actual snapshot that contains the trigger never shows
     res = client.get(url_for("ui.ui_views.diff_history_page", uuid="first"))
     assert b'Add to cart' in res.data

requirements.txt

@@ -39,7 +39,7 @@ jsonpath-ng~=1.5.3
 # jq not available on Windows so must be installed manually
 
 # Notification library
-apprise==1.9.5
+apprise==1.9.4
 
 # - Needed for apprise/spush, and maybe others? hopefully doesnt trigger a rust compile.
 # - Requires extra wheel for rPi, adds build time for arm/v8 which is not in piwheels