mirror of
https://github.com/dgtlmoon/changedetection.io.git
synced 2025-11-27 11:53:21 +00:00
Compare commits
11 Commits
remove-unu
...
share-diff
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
23c73cafa0 | ||
|
|
b957dc9153 | ||
|
|
7b54a5e533 | ||
|
|
ebd9c1cbc3 | ||
|
|
8e9fe9c288 | ||
|
|
9f1577331c | ||
|
|
952ba38b46 | ||
|
|
8f5cb68319 | ||
|
|
02682b288f | ||
|
|
782ed32b05 | ||
|
|
cb0d124a46 |
@@ -36,7 +36,7 @@ from flask import (
|
|||||||
from changedetectionio import html_tools
|
from changedetectionio import html_tools
|
||||||
from changedetectionio.api import api_v1
|
from changedetectionio.api import api_v1
|
||||||
|
|
||||||
__version__ = '0.40.2'
|
__version__ = '0.40.1.1'
|
||||||
|
|
||||||
datastore = None
|
datastore = None
|
||||||
|
|
||||||
@@ -53,6 +53,7 @@ app = Flask(__name__,
|
|||||||
static_url_path="",
|
static_url_path="",
|
||||||
static_folder="static",
|
static_folder="static",
|
||||||
template_folder="templates")
|
template_folder="templates")
|
||||||
|
from flask_compress import Compress
|
||||||
|
|
||||||
# Super handy for compressing large BrowserSteps responses and others
|
# Super handy for compressing large BrowserSteps responses and others
|
||||||
FlaskCompress(app)
|
FlaskCompress(app)
|
||||||
@@ -505,6 +506,41 @@ def changedetection_app(config=None, datastore_o=None):
|
|||||||
output = render_template("clear_all_history.html")
|
output = render_template("clear_all_history.html")
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
|
||||||
|
# If they edited an existing watch, we need to know to reset the current/previous md5 to include
|
||||||
|
# the excluded text.
|
||||||
|
def get_current_checksum_include_ignore_text(uuid):
|
||||||
|
|
||||||
|
import hashlib
|
||||||
|
|
||||||
|
from changedetectionio import fetch_site_status
|
||||||
|
|
||||||
|
# Get the most recent one
|
||||||
|
newest_history_key = datastore.data['watching'][uuid].get('newest_history_key')
|
||||||
|
|
||||||
|
# 0 means that theres only one, so that there should be no 'unviewed' history available
|
||||||
|
if newest_history_key == 0:
|
||||||
|
newest_history_key = list(datastore.data['watching'][uuid].history.keys())[0]
|
||||||
|
|
||||||
|
if newest_history_key:
|
||||||
|
with open(datastore.data['watching'][uuid].history[newest_history_key],
|
||||||
|
encoding='utf-8') as file:
|
||||||
|
raw_content = file.read()
|
||||||
|
|
||||||
|
handler = fetch_site_status.perform_site_check(datastore=datastore)
|
||||||
|
stripped_content = html_tools.strip_ignore_text(raw_content,
|
||||||
|
datastore.data['watching'][uuid]['ignore_text'])
|
||||||
|
|
||||||
|
if datastore.data['settings']['application'].get('ignore_whitespace', False):
|
||||||
|
checksum = hashlib.md5(stripped_content.translate(None, b'\r\n\t ')).hexdigest()
|
||||||
|
else:
|
||||||
|
checksum = hashlib.md5(stripped_content).hexdigest()
|
||||||
|
|
||||||
|
return checksum
|
||||||
|
|
||||||
|
return datastore.data['watching'][uuid]['previous_md5']
|
||||||
|
|
||||||
|
|
||||||
@app.route("/edit/<string:uuid>", methods=['GET', 'POST'])
|
@app.route("/edit/<string:uuid>", methods=['GET', 'POST'])
|
||||||
@login_optionally_required
|
@login_optionally_required
|
||||||
# https://stackoverflow.com/questions/42984453/wtforms-populate-form-with-data-if-data-exists
|
# https://stackoverflow.com/questions/42984453/wtforms-populate-form-with-data-if-data-exists
|
||||||
@@ -856,9 +892,8 @@ def changedetection_app(config=None, datastore_o=None):
|
|||||||
|
|
||||||
system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
|
system_uses_webdriver = datastore.data['settings']['application']['fetch_backend'] == 'html_webdriver'
|
||||||
|
|
||||||
is_html_webdriver = False
|
is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
|
||||||
if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver':
|
watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
|
||||||
is_html_webdriver = True
|
|
||||||
|
|
||||||
password_enabled_and_share_is_off = False
|
password_enabled_and_share_is_off = False
|
||||||
if datastore.data['settings']['application'].get('password') or os.getenv("SALTED_PASS", False):
|
if datastore.data['settings']['application'].get('password') or os.getenv("SALTED_PASS", False):
|
||||||
@@ -908,9 +943,8 @@ def changedetection_app(config=None, datastore_o=None):
|
|||||||
extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
|
extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]
|
||||||
|
|
||||||
|
|
||||||
is_html_webdriver = False
|
is_html_webdriver = True if watch.get('fetch_backend') == 'html_webdriver' or (
|
||||||
if (watch.get('fetch_backend') == 'system' and system_uses_webdriver) or watch.get('fetch_backend') == 'html_webdriver':
|
watch.get('fetch_backend', None) is None and system_uses_webdriver) else False
|
||||||
is_html_webdriver = True
|
|
||||||
|
|
||||||
# Never requested successfully, but we detected a fetch error
|
# Never requested successfully, but we detected a fetch error
|
||||||
if datastore.data['watching'][uuid].history_n == 0 and (watch.get_error_text() or watch.get_error_snapshot()):
|
if datastore.data['watching'][uuid].history_n == 0 and (watch.get_error_text() or watch.get_error_snapshot()):
|
||||||
|
|||||||
@@ -297,8 +297,8 @@ class base_html_playwright(Fetcher):
|
|||||||
proxy=self.proxy,
|
proxy=self.proxy,
|
||||||
# This is needed to enable JavaScript execution on GitHub and others
|
# This is needed to enable JavaScript execution on GitHub and others
|
||||||
bypass_csp=True,
|
bypass_csp=True,
|
||||||
# Should be `allow` or `block` - sites like YouTube can transmit large amounts of data via Service Workers
|
# Can't think why we need the service workers for our use case?
|
||||||
service_workers=os.getenv('PLAYWRIGHT_SERVICE_WORKERS', 'allow'),
|
service_workers='block',
|
||||||
# Should never be needed
|
# Should never be needed
|
||||||
accept_downloads=False
|
accept_downloads=False
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ services:
|
|||||||
#
|
#
|
||||||
# Base URL of your changedetection.io install (Added to the notification alert)
|
# Base URL of your changedetection.io install (Added to the notification alert)
|
||||||
# - BASE_URL=https://mysite.com
|
# - BASE_URL=https://mysite.com
|
||||||
|
|
||||||
# Respect proxy_pass type settings, `proxy_set_header Host "localhost";` and `proxy_set_header X-Forwarded-Prefix /app;`
|
# Respect proxy_pass type settings, `proxy_set_header Host "localhost";` and `proxy_set_header X-Forwarded-Prefix /app;`
|
||||||
# More here https://github.com/dgtlmoon/changedetection.io/wiki/Running-changedetection.io-behind-a-reverse-proxy-sub-directory
|
# More here https://github.com/dgtlmoon/changedetection.io/wiki/Running-changedetection.io-behind-a-reverse-proxy-sub-directory
|
||||||
# - USE_X_SETTINGS=1
|
# - USE_X_SETTINGS=1
|
||||||
@@ -94,10 +95,7 @@ services:
|
|||||||
# - CHROME_REFRESH_TIME=600000
|
# - CHROME_REFRESH_TIME=600000
|
||||||
# - DEFAULT_BLOCK_ADS=true
|
# - DEFAULT_BLOCK_ADS=true
|
||||||
# - DEFAULT_STEALTH=true
|
# - DEFAULT_STEALTH=true
|
||||||
#
|
|
||||||
# Ignore HTTPS errors, like for self-signed certs
|
|
||||||
# - DEFAULT_IGNORE_HTTPS_ERRORS=true
|
|
||||||
#
|
|
||||||
volumes:
|
volumes:
|
||||||
changedetection-data:
|
changedetection-data:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user