lee/changedetection.io
1
0
Fork 0
mirror of https://github.com/dgtlmoon/changedetection.io.git synced 2025-12-15 04:26:14 +00:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Cleaner history suffix handling

Browse Source
This commit is contained in:
dgtlmoon
2022-08-31 19:22:26 +02:00
parent 687cf9beb4
commit f35d91e4fb
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changedetectionio/fetch_processor/__init__.py
View File

@@ -1,6 +1,7 @@
class fetch_processor():
contents = b''
screenshot = None
history_artifact_suffix = 'txt'
"""
base class for all fetch processors
@@ -37,4 +38,4 @@ class fetch_processor():
if proxy_args is None:
proxy_args = self.datastore.proxy_list[0][0]
return proxy_args
return proxy_args

8
changedetectionio/model/Watch.py
View File

@@ -148,9 +148,7 @@ class model(dict):
bump = self.history
return self.__newest_history_key
# Save some text file to the appropriate path and bump the history
# result_obj from fetch_site_status.run()
def save_history_text(self, contents, timestamp):
def save_history_artifact(self, contents: bytes, timestamp, suffix='txt'):
import uuid
import logging
@@ -158,8 +156,8 @@ class model(dict):
self.ensure_data_dir_exists()
snapshot_fname = "{}/{}.stripped.txt".format(output_path, uuid.uuid4())
logging.debug("Saving history text {}".format(snapshot_fname))
snapshot_fname = "{}/{}.{}".format(output_path, uuid.uuid4(), suffix)
logging.debug("Saving history artifact {}".format(snapshot_fname))
with open(snapshot_fname, 'wb') as f:
f.write(contents)

3
changedetectionio/update_worker.py
View File

@@ -250,12 +250,11 @@ class update_worker(threading.Thread):
if process_changedetection_results:
try:
watch = self.datastore.data['watching'][uuid]
fname = "" # Saved history text filename
# For the FIRST time we check a site, or a change detected, save the snapshot.
if changed_detected or not watch['last_checked']:
# A change was detected
watch.save_history_text(contents=update_handler.contents, timestamp=str(round(time.time())))
watch.save_history_artifact(contents=update_handler.contents, timestamp=str(round(time.time())), suffix=update_handler.history_artifact_suffix)
self.datastore.update_watch(uuid=uuid, update_obj=update_obj)