{{ render_field(form.extract_text, rows=5, placeholder="\d+ online") }}
diff --git a/changedetectionio/tests/conftest.py b/changedetectionio/tests/conftest.py
index 258ce6a1..2d0b1349 100644
--- a/changedetectionio/tests/conftest.py
+++ b/changedetectionio/tests/conftest.py
@@ -32,6 +32,8 @@ def app(request):
"""Create application for the tests."""
datastore_path = "./test-datastore"
+ # So they don't delay in fetching
+ os.environ["MINIMUM_SECONDS_RECHECK_TIME"] = "0"
try:
os.mkdir(datastore_path)
except FileExistsError:
diff --git a/changedetectionio/tests/test_block_while_text_present.py b/changedetectionio/tests/test_block_while_text_present.py
new file mode 100644
index 00000000..e2236e62
--- /dev/null
+++ b/changedetectionio/tests/test_block_while_text_present.py
@@ -0,0 +1,137 @@
+#!/usr/bin/python3
+
+import time
+from flask import url_for
+from . util import live_server_setup
+from changedetectionio import html_tools
+
+def set_original_ignore_response():
+ test_return_data = """
+
+ Some initial text
+
Which is across multiple lines
+
+ So let's see what happens.
+
+
+
+ """
+
+ with open("test-datastore/endpoint-content.txt", "w") as f:
+ f.write(test_return_data)
+
+
+def set_modified_original_ignore_response():
+ test_return_data = """
+
+ Some NEW nice initial text
+
Which is across multiple lines
+
+ So let's see what happens.
+
new ignore stuff
+
out of stock
+
blah
+
+
+
+ """
+
+ with open("test-datastore/endpoint-content.txt", "w") as f:
+ f.write(test_return_data)
+
+
+# Is the same but includes ZZZZZ, 'ZZZZZ' is the last line in ignore_text
+def set_modified_response_minus_block_text():
+ test_return_data = """
+
+ Some NEW nice initial text
+
Which is across multiple lines
+
now on sale $2/p>
+
+ So let's see what happens.
+
new ignore stuff
+
blah
+
+
+
+ """
+
+ with open("test-datastore/endpoint-content.txt", "w") as f:
+ f.write(test_return_data)
+
+
+def test_check_block_changedetection_text_NOT_present(client, live_server):
+ sleep_time_for_fetch_thread = 3
+ live_server_setup(live_server)
+ # Use a mix of case in ZzZ to prove it works case-insensitive.
+ ignore_text = "out of stoCk\r\nfoobar"
+
+ set_original_ignore_response()
+
+ # Give the endpoint time to spin up
+ time.sleep(1)
+
+ # Add our URL to the import page
+ test_url = url_for('test_endpoint', _external=True)
+ res = client.post(
+ url_for("import_page"),
+ data={"urls": test_url},
+ follow_redirects=True
+ )
+ assert b"1 Imported" in res.data
+
+ # Give the thread time to pick it up
+ time.sleep(sleep_time_for_fetch_thread)
+
+ # Goto the edit page, add our ignore text
+ # Add our URL to the import page
+ res = client.post(
+ url_for("edit_page", uuid="first"),
+ data={"text_should_not_be_present": ignore_text, "url": test_url, 'fetch_backend': "html_requests"},
+ follow_redirects=True
+ )
+ assert b"Updated watch." in res.data
+
+ # Give the thread time to pick it up
+ time.sleep(sleep_time_for_fetch_thread)
+ # Check it saved
+ res = client.get(
+ url_for("edit_page", uuid="first"),
+ )
+ assert bytes(ignore_text.encode('utf-8')) in res.data
+
+ # Trigger a check
+ client.get(url_for("form_watch_checknow"), follow_redirects=True)
+
+ # Give the thread time to pick it up
+ time.sleep(sleep_time_for_fetch_thread)
+
+ # It should report nothing found (no new 'unviewed' class)
+ res = client.get(url_for("index"))
+ assert b'unviewed' not in res.data
+ assert b'/test-endpoint' in res.data
+
+ # The page changed, BUT the text is still there, just the rest of it changes, we should not see a change
+ set_modified_original_ignore_response()
+
+ # Trigger a check
+ client.get(url_for("form_watch_checknow"), follow_redirects=True)
+ # Give the thread time to pick it up
+ time.sleep(sleep_time_for_fetch_thread)
+
+ # It should report nothing found (no new 'unviewed' class)
+ res = client.get(url_for("index"))
+ assert b'unviewed' not in res.data
+ assert b'/test-endpoint' in res.data
+
+
+ # Now we set a change where the text is gone, it should now trigger
+ set_modified_response_minus_block_text()
+ client.get(url_for("form_watch_checknow"), follow_redirects=True)
+ time.sleep(sleep_time_for_fetch_thread)
+
+ res = client.get(url_for("index"))
+ assert b'unviewed' in res.data
+
+ res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
+ assert b'Deleted' in res.data
diff --git a/changedetectionio/update_worker.py b/changedetectionio/update_worker.py
index b72b21ca..bda34fef 100644
--- a/changedetectionio/update_worker.py
+++ b/changedetectionio/update_worker.py
@@ -98,9 +98,16 @@ class update_worker(threading.Thread):
# Notifications should only trigger on the second time (first time, we gather the initial snapshot)
if watch.history_n >= 2:
-
- dates = list(watch.history.keys())
- prev_fname = watch.history[dates[-2]]
+ print(">> Change detected in UUID {} - {}".format(uuid, watch['url']))
+ watch_history = watch.history
+ dates = list(watch_history.keys())
+ # Theoretically it's possible that this could be just 1 long,
+ # - In the case that the timestamp key was not unique
+ if len(dates) == 1:
+ raise ValueError(
+ "History index had 2 or more, but only 1 date loaded, timestamps were not unique? maybe two of the same timestamps got written, needs more delay?"
+ )
+ prev_fname = watch_history[dates[-2]]
# Did it have any notification alerts to hit?