BUmp docs

Dockerfile

@@ -5,6 +5,7 @@ ARG PYTHON_VERSION=3.11
 FROM python:${PYTHON_VERSION}-slim-bookworm AS builder
 
 # See `cryptography` pin comment in requirements.txt
+ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     g++ \
@@ -16,7 +17,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxslt-dev \
     make \
     patch \
-    pkg-config \
     zlib1g-dev
 
 RUN mkdir /install
@@ -26,14 +26,6 @@ COPY requirements.txt /requirements.txt
 
 # Use cache mounts and multiple wheel sources for faster ARM builds
 ENV PIP_CACHE_DIR=/tmp/pip-cache
-# Help Rust find OpenSSL for cryptography package compilation on ARM
-ENV PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig"
-ENV PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-ENV OPENSSL_DIR="/usr"
-ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabihf"
-ENV OPENSSL_INCLUDE_DIR="/usr/include/openssl"
-# Additional environment variables for cryptography Rust build
-ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
 RUN --mount=type=cache,target=/tmp/pip-cache \
     pip install \
     --extra-index-url https://www.piwheels.org/simple \

changedetectionio/__init__.py

@@ -2,7 +2,7 @@
 
 # Read more https://github.com/dgtlmoon/changedetection.io/wiki
 
-__version__ = '0.50.12'
+__version__ = '0.50.10'
 
 from changedetectionio.strtobool import strtobool
 from json.decoder import JSONDecodeError

changedetectionio/api/__init__.py

@@ -13,7 +13,6 @@ schema = api_schema.build_watch_json_schema(watch_base_config)
 
 schema_create_watch = copy.deepcopy(schema)
 schema_create_watch['required'] = ['url']
-del schema_create_watch['properties']['last_viewed']
 
 schema_update_watch = copy.deepcopy(schema)
 schema_update_watch['additionalProperties'] = False
@@ -52,7 +51,7 @@ def validate_openapi_request(operation_id):
             try:
                 spec = get_openapi_spec()
                 openapi_request = FlaskOpenAPIRequest(request)
-                result = spec.unmarshal_request(openapi_request)
+                result = spec.unmarshal_request(openapi_request, operation_id)
                 if result.errors:
                     abort(400, message=f"OpenAPI validation failed: {result.errors}")
                 return f(*args, **kwargs)

changedetectionio/api/api_schema.py

@@ -78,13 +78,6 @@ def build_watch_json_schema(d):
               ]:
         schema['properties'][v]['anyOf'].append({'type': 'string', "maxLength": 5000})
 
-    for v in ['last_viewed']:
-        schema['properties'][v] = {
-            "type": "integer",
-            "description": "Unix timestamp in seconds of the last time the watch was viewed.",
-            "minimum": 0
-        }
-
     # None or Boolean
     schema['properties']['track_ldjson_price_data']['anyOf'].append({'type': 'boolean'})
 

changedetectionio/blueprint/watchlist/__init__.py

@@ -44,16 +44,12 @@ def construct_blueprint(datastore: ChangeDetectionStore, update_q, queuedWatchMe
         # Sort by last_changed and add the uuid which is usually the key..
         sorted_watches = []
         with_errors = request.args.get('with_errors') == "1"
-        unread_only = request.args.get('unread') == "1"
         errored_count = 0
         search_q = request.args.get('q').strip().lower() if request.args.get('q') else False
         for uuid, watch in datastore.data['watching'].items():
             if with_errors and not watch.get('last_error'):
                 continue
 
-            if unread_only and (watch.viewed or watch.last_changed == 0) :
-                continue
-
             if active_tag_uuid and not active_tag_uuid in watch['tags']:
                     continue
             if watch.get('last_error'):

changedetectionio/blueprint/watchlist/templates/watch-overview.html

@@ -245,9 +245,6 @@ document.addEventListener('DOMContentLoaded', function() {
                 <a href="{{url_for('ui.mark_all_viewed', tag=active_tag_uuid) }}" class="pure-button button-tag " id="mark-all-viewed">Mark all viewed in '{{active_tag.title}}'</a>
             </li>
         {%-  endif -%}
-            <li id="post-list-unread" class="{%- if has_unviewed -%}has-unviewed{%- endif -%}" style="display: none;" >
-                <a href="{{url_for('watchlist.index', unread=1, tag=request.args.get('tag')) }}" class="pure-button button-tag">Unread</a>
-            </li>
             <li>
                <a href="{{ url_for('ui.form_watch_checknow', tag=active_tag_uuid, with_errors=request.args.get('with_errors',0)) }}" class="pure-button button-tag" id="recheck-all">Recheck
                 all {% if active_tag_uuid %}  in '{{active_tag.title}}'{%endif%}</a>

changedetectionio/processors/text_json_diff/processor.py

@@ -251,7 +251,8 @@ class perform_site_check(difference_detection_processor):
         update_obj["last_check_status"] = self.fetcher.get_last_status_code()
 
         # 615 Extract text by regex
-        extract_text = list(dict.fromkeys(watch.get('extract_text', []) + self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='extract_text')))
+        extract_text = watch.get('extract_text', [])
+        extract_text += self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='extract_text')
         if len(extract_text) > 0:
             regex_matched_output = []
             for s_re in extract_text:
@@ -310,7 +311,8 @@ class perform_site_check(difference_detection_processor):
 
         ############ Blocking rules, after checksum #################
         blocked = False
-        trigger_text = list(dict.fromkeys(watch.get('trigger_text', []) + self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='trigger_text')))
+        trigger_text = watch.get('trigger_text', [])
+        trigger_text += self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='trigger_text')
         if len(trigger_text):
             # Assume blocked
             blocked = True
@@ -324,7 +326,8 @@ class perform_site_check(difference_detection_processor):
             if result:
                 blocked = False
 
-        text_should_not_be_present = list(dict.fromkeys(watch.get('text_should_not_be_present', []) + self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='text_should_not_be_present')))
+        text_should_not_be_present = watch.get('text_should_not_be_present', [])
+        text_should_not_be_present += self.datastore.get_tag_overrides_for_watch(uuid=watch.get('uuid'), attr='text_should_not_be_present')
         if len(text_should_not_be_present):
             # If anything matched, then we should block a change from happening
             result = html_tools.strip_ignore_text(content=str(stripped_text_from_html),

changedetectionio/static/js/realtime.js

@@ -153,7 +153,6 @@ $(document).ready(function () {
 
                 // Tabs at bottom of list
                 $('#post-list-mark-views').toggleClass("has-unviewed", general_stats.has_unviewed);
-                $('#post-list-unread').toggleClass("has-unviewed", general_stats.has_unviewed);
                 $('#post-list-with-errors').toggleClass("has-error", general_stats.count_errors !== 0)
                 $('#post-list-with-errors a').text(`With errors (${ general_stats.count_errors })`);
 

changedetectionio/static/styles/scss/parts/_socket.scss

@@ -24,9 +24,6 @@ body.checking-now {
   #post-list-mark-views.has-unviewed {
     display: inline-block !important;
   }
-  #post-list-unread.has-unviewed {
-    display: inline-block !important;
-  }
 }
 
 

changedetectionio/static/styles/scss/styles.scss

@@ -1130,12 +1130,11 @@ ul {
 }
 
 #realtime-conn-error {
-  position: fixed;
+  position: absolute;
   bottom: 0;
-  left: 0;
+  left: 30px;
   background: var(--color-warning);
   padding: 10px;
   font-size: 0.8rem;
   color: #fff;
-  opacity: 0.8;
 }

changedetectionio/templates/base.html

@@ -236,7 +236,7 @@
     <script src="{{url_for('static_content', group='js', filename='toggle-theme.js')}}" defer></script>
 
     <div id="checking-now-fixed-tab" style="display: none;"><span class="spinner"></span><span>&nbsp;Checking now</span></div>
-    <div id="realtime-conn-error" style="display:none">Real-time updates offline</div>
+    <div id="realtime-conn-error" style="display:none">Offline</div>
   </body>
 
 </html>

changedetectionio/tests/test_api.py

@@ -311,7 +311,7 @@ def test_api_watch_PUT_update(client, live_server, measure_memory_usage):
                                  "value": "."  # contains anything
                              }
                          ],
-                         "conditions_match_logic": "ALL",
+                         "conditions_match_logic": "ALL"
                          }
                         ),
         headers={'content-type': 'application/json', 'x-api-key': api_key},
@@ -328,7 +328,6 @@ def test_api_watch_PUT_update(client, live_server, measure_memory_usage):
     )
 
     watch_uuid = list(res.json.keys())[0]
-    assert not res.json[watch_uuid].get('viewed'), 'A newly created watch can only be unviewed'
 
     # Check in the edit page just to be sure
     res = client.get(
@@ -342,12 +341,7 @@ def test_api_watch_PUT_update(client, live_server, measure_memory_usage):
     res = client.put(
         url_for("watch", uuid=watch_uuid),
         headers={'x-api-key': api_key, 'content-type': 'application/json'},
-        data=json.dumps({
-            "title": "new title",
-            'time_between_check': {'minutes': 552},
-            'headers': {'cookie': 'all eaten'},
-            'last_viewed': int(time.time())
-        }),
+        data=json.dumps({"title": "new title", 'time_between_check': {'minutes': 552}, 'headers': {'cookie': 'all eaten'}}),
     )
     assert res.status_code == 200, "HTTP PUT update was sent OK"
 
@@ -357,7 +351,6 @@ def test_api_watch_PUT_update(client, live_server, measure_memory_usage):
         headers={'x-api-key': api_key}
     )
     assert res.json.get('title') == 'new title'
-    assert res.json.get('viewed'), 'With the timestamp greater than "changed" a watch can be updated to viewed'
 
     # Check in the edit page just to be sure
     res = client.get(
@@ -390,7 +383,7 @@ def test_api_watch_PUT_update(client, live_server, measure_memory_usage):
 
 
 def test_api_import(client, live_server, measure_memory_usage):
-
+    
     api_key = live_server.app.config['DATASTORE'].data['settings']['application'].get('api_access_token')
 
     res = client.post(

docker-compose.yml

@@ -84,7 +84,6 @@ services:
 
   
       # Comment out ports: when using behind a reverse proxy , enable networks: etc.
-      # Mac users! Use "127.0.0.1:5050:5000" (port 5050) so theres no conflict with Airplay etc. (https://github.com/dgtlmoon/changedetection.io/issues/3401)
       ports:
         - 127.0.0.1:5000:5000
       restart: unless-stopped

docs/api-spec.yaml

@@ -6,7 +6,7 @@ info:
     
     REST API for managing Page watches, Group tags, and Notifications.
     
-    changedetection.io can be driven by its built in simple API, in the examples below you will also find `curl` command line and `python` examples to help you get started faster.
+    changedetection.io can be driven by its built in simple API, in the examples below you will also find `curl` command line examples to help you.
     
     ## Where to find my API key?
     
@@ -119,9 +119,14 @@ components:
         Enter your API key in the "Authorize" button above to automatically populate all code examples.
 
   schemas:
-    WatchBase:
+    Watch:
       type: object
       properties:
+        uuid:
+          type: string
+          format: uuid
+          description: Unique identifier for the web page change monitor (watch)
+          readOnly: true
         url:
           type: string
           format: uri
@@ -224,40 +229,25 @@ components:
                 maxLength: 5000
             required: [operation, selector, optional_value]
           description: Browser automation steps
+        last_checked:
+          type: integer
+          description: Unix timestamp of last check
+          readOnly: true
+        last_changed:
+          type: integer
+          description: Unix timestamp of last change
+          readOnly: true
+        last_error:
+          type: string
+          description: Last error message
+          readOnly: true
       required:
         - url
 
-    Watch:
-      allOf:
-        - $ref: '#/components/schemas/WatchBase'
-        - type: object
-          properties:
-            uuid:
-              type: string
-              format: uuid
-              description: Unique identifier for the web page change monitor (watch)
-              readOnly: true
-            last_checked:
-              type: integer
-              description: Unix timestamp of last check
-              readOnly: true
-            last_changed:
-              type: integer
-              description: Unix timestamp of last change
-              readOnly: true
-            last_error:
-              type: string
-              description: Last error message
-              readOnly: true
-            last_viewed:
-              type: integer
-              description: Unix timestamp in seconds of the last time the watch was viewed. Setting it to a value higher than `last_changed` in the "Update watch" endpoint marks the watch as viewed.
-              minimum: 0
-
     CreateWatch:
       allOf:
-        - $ref: '#/components/schemas/WatchBase'
-        - type: 'object'
+        - $ref: '#/components/schemas/Watch'
+        - type: object
           required:
             - url
 
@@ -586,7 +576,7 @@ paths:
 
     delete:
       operationId: deleteWatch
-      tags: [Watch Management]
+      tags: [Watch Management]  
       summary: Delete watch
       description: Delete a web page change monitor (watch) and all related history
       x-code-samples:
@@ -1303,4 +1293,4 @@ paths:
                 watch_count: 42
                 tag_count: 5
                 uptime: "2 days, 3:45:12"
-                version: "0.50.10"
+                version: "0.50.10"

requirements.txt

@@ -41,16 +41,13 @@ jsonpath-ng~=1.5.3
 # Notification library
 apprise==1.9.3
 
-# - 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
-# Pinned to 43.0.1 for ARM compatibility (45.x may not have pre-built ARM wheels)
-# Also pinned because dependabot wants specific versions
-cryptography==44.0.1
-
 # apprise mqtt https://github.com/dgtlmoon/changedetection.io/issues/315
 # use any version other than 2.0.x due to https://github.com/eclipse/paho.mqtt.python/issues/814
 paho-mqtt!=2.0.*
 
+# Requires extra wheel for rPi
+#cryptography~=42.0.8
+
 # Used for CSS filtering
 beautifulsoup4>=4.0.0