Skip to content

Commit f830068

Browse files
committed
Merge branch 'master' into python313
2 parents a08b47f + 179ca17 commit f830068

32 files changed

+1266
-107
lines changed

.dockerignore

+30-17
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
1-
.git
2-
.github
3-
changedetectionio/processors/__pycache__
4-
changedetectionio/api/__pycache__
5-
changedetectionio/model/__pycache__
6-
changedetectionio/blueprint/price_data_follower/__pycache__
7-
changedetectionio/blueprint/tags/__pycache__
8-
changedetectionio/blueprint/__pycache__
9-
changedetectionio/blueprint/browser_steps/__pycache__
10-
changedetectionio/fetchers/__pycache__
11-
changedetectionio/tests/visualselector/__pycache__
12-
changedetectionio/tests/restock/__pycache__
13-
changedetectionio/tests/__pycache__
14-
changedetectionio/tests/fetchers/__pycache__
15-
changedetectionio/tests/unit/__pycache__
16-
changedetectionio/tests/proxy_list/__pycache__
17-
changedetectionio/__pycache__
1+
# Git
2+
.git/
3+
.gitignore
184

5+
# GitHub
6+
.github/
7+
8+
# Byte-compiled / optimized / DLL files
9+
**/__pycache__
10+
**/*.py[cod]
11+
12+
# Caches
13+
.mypy_cache/
14+
.pytest_cache/
15+
.ruff_cache/
16+
17+
# Distribution / packaging
18+
build/
19+
dist/
20+
*.egg-info*
21+
22+
# Virtual environment
23+
.env
24+
.venv/
25+
venv/
26+
27+
# IntelliJ IDEA
28+
.idea/
29+
30+
# Visual Studio
31+
.vscode/

.github/ISSUE_TEMPLATE/bug_report.md

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ A clear and concise description of what the bug is.
2727
**Version**
2828
*Exact version* in the top right area: 0....
2929

30+
**How did you install?**
31+
32+
Docker, Pip, from source directly etc
33+
3034
**To Reproduce**
3135

3236
Steps to reproduce the behavior:

.gitignore

+27-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
1-
__pycache__
2-
.idea
3-
*.pyc
4-
datastore/url-watches.json
5-
datastore/*
6-
__pycache__
7-
.pytest_cache
8-
build
9-
dist
10-
venv
11-
test-datastore/*
12-
test-datastore
13-
test-memory.log
1+
# Byte-compiled / optimized / DLL files
2+
**/__pycache__
3+
**/*.py[cod]
4+
5+
# Caches
6+
.mypy_cache/
7+
.pytest_cache/
8+
.ruff_cache/
9+
10+
# Distribution / packaging
11+
build/
12+
dist/
1413
*.egg-info*
14+
15+
# Virtual environment
16+
.env
17+
.venv/
18+
venv/
19+
20+
# IDEs
21+
.idea
1522
.vscode/settings.json
23+
24+
# Datastore files
25+
datastore/
26+
test-datastore/
27+
28+
# Memory consumption log
29+
test-memory.log

COMMERCIAL_LICENCE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ In any commercial activity involving 'Hosting' (as defined herein), whether in p
44

55
# Commercial License Agreement
66

7-
This Commercial License Agreement ("Agreement") is entered into by and between Mr Morresi (the original creator of this software) here-in ("Licensor") and (your company or personal name) _____________ ("Licensee"). This Agreement sets forth the terms and conditions under which Licensor provides its software ("Software") and services to Licensee for the purpose of reselling the software either in part or full, as part of any commercial activity where the activity involves a third party.
7+
This Commercial License Agreement ("Agreement") is entered into by and between Web Technologies s.r.o. here-in ("Licensor") and (your company or personal name) _____________ ("Licensee"). This Agreement sets forth the terms and conditions under which Licensor provides its software ("Software") and services to Licensee for the purpose of reselling the software either in part or full, as part of any commercial activity where the activity involves a third party.
88

99
### Definition of Hosting
1010

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN pip install --extra-index-url https://www.piwheels.org/simple --target=/dep
3232
# Playwright is an alternative to Selenium
3333
# Excluded this package from requirements.txt to prevent arm/v6 and arm/v7 builds from failing
3434
# https://github.com/dgtlmoon/changedetection.io/pull/1067 also musl/alpine (not supported)
35-
RUN pip install --target=/dependencies playwright~=1.41.2 \
35+
RUN pip install --target=/dependencies playwright~=1.48.0 \
3636
|| echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled."
3737

3838
# Final image stage

changedetectionio/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Read more https://github.com/dgtlmoon/changedetection.io/wiki
44

5-
__version__ = '0.47.05'
5+
__version__ = '0.48.00'
66

77
from changedetectionio.strtobool import strtobool
88
from json.decoder import JSONDecodeError
@@ -160,11 +160,10 @@ def inject_version():
160160
)
161161

162162
# Monitored websites will not receive a Referer header when a user clicks on an outgoing link.
163-
# @Note: Incompatible with password login (and maybe other features) for now, submit a PR!
164163
@app.after_request
165164
def hide_referrer(response):
166165
if strtobool(os.getenv("HIDE_REFERER", 'false')):
167-
response.headers["Referrer-Policy"] = "no-referrer"
166+
response.headers["Referrer-Policy"] = "same-origin"
168167

169168
return response
170169

changedetectionio/blueprint/tags/__init__.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def construct_blueprint(datastore: ChangeDetectionStore):
1313
def tags_overview_page():
1414
from .form import SingleTag
1515
add_form = SingleTag(request.form)
16+
1617
sorted_tags = sorted(datastore.data['settings']['application'].get('tags').items(), key=lambda x: x[1]['title'])
1718

1819
from collections import Counter
@@ -104,9 +105,11 @@ def form_tag_edit(uuid):
104105

105106
default = datastore.data['settings']['application']['tags'].get(uuid)
106107

107-
form = group_restock_settings_form(formdata=request.form if request.method == 'POST' else None,
108+
form = group_restock_settings_form(
109+
formdata=request.form if request.method == 'POST' else None,
108110
data=default,
109-
extra_notification_tokens=datastore.get_unique_notification_tokens_available()
111+
extra_notification_tokens=datastore.get_unique_notification_tokens_available(),
112+
default_system_settings = datastore.data['settings'],
110113
)
111114

112115
template_args = {

changedetectionio/content_fetchers/res/stock-not-in-stock.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ function isItemInStock() {
3939
'let me know when it\'s available',
4040
'mail me when available',
4141
'message if back in stock',
42+
'mevcut değil',
4243
'nachricht bei',
4344
'nicht auf lager',
4445
'nicht lagernd',
@@ -50,7 +51,7 @@ function isItemInStock() {
5051
'niet beschikbaar',
5152
'niet leverbaar',
5253
'niet op voorraad',
53-
'no disponible temporalmente',
54+
'no disponible',
5455
'no longer in stock',
5556
'no tickets available',
5657
'not available',
@@ -67,12 +68,14 @@ function isItemInStock() {
6768
'produkt niedostępny',
6869
'sold out',
6970
'sold-out',
71+
'stokta yok',
7072
'temporarily out of stock',
7173
'temporarily unavailable',
7274
'there were no search results for',
7375
'this item is currently unavailable',
7476
'tickets unavailable',
7577
'tijdelijk uitverkocht',
78+
'tükendi',
7679
'unavailable nearby',
7780
'unavailable tickets',
7881
'vergriffen',

0 commit comments

Comments
 (0)