Previous error that is no longer valid was not being cleared

.github/workflows/test-container-build.yml

@@ -62,7 +62,7 @@ jobs:
           with:
             context: ./
             file: ./Dockerfile
-            platforms: linux/arm/v6,linux/arm/v7,linux/amd64,linux/arm64,
+            platforms: linux/arm/v7,linux/arm/v6,linux/amd64,linux/arm64,
             cache-from: type=local,src=/tmp/.buildx-cache
             cache-to: type=local,dest=/tmp/.buildx-cache
 

.github/workflows/test-only.yml

@@ -36,8 +36,6 @@ jobs:
         run: |         
           # Build a changedetection.io container and start testing inside
           docker build . -t test-changedetectionio
-          # Debug info
-          docker run test-changedetectionio  bash -c 'pip list'
 
       - name: Spin up ancillary SMTP+Echo message test server
         run: |
@@ -46,6 +44,7 @@ jobs:
 
       - name: Test built container with pytest
         run: |
+          
           # Unit tests
           docker run test-changedetectionio  bash -c 'python3 -m unittest changedetectionio.tests.unit.test_notification_diff'
           

changedetectionio/__init__.py

@@ -38,7 +38,7 @@ from flask_paginate import Pagination, get_page_parameter
 from changedetectionio import html_tools
 from changedetectionio.api import api_v1
 
-__version__ = '0.44.1'
+__version__ = '0.43.2'
 
 datastore = None
 

changedetectionio/api/api_v1.py

@@ -1,6 +1,3 @@
-import os
-from distutils.util import strtobool
-
 from flask_expects_json import expects_json
 from changedetectionio import queuedWatchMetaData
 from flask_restful import abort, Resource
@@ -36,7 +33,7 @@ class Watch(Resource):
     @auth.check_token
     def get(self, uuid):
         """
-        @api {get} /api/v1/watch/:uuid Single watch - get data, recheck, pause, mute.
+        @api {get} /api/v1/watch/:uuid Get a single watch data
         @apiDescription Retrieve watch information and set muted/paused status
         @apiExample {curl} Example usage:
             curl http://localhost:4000/api/v1/watch/cc0cfffa-f449-477b-83ea-0caafd1dc091  -H"x-api-key:813031b16330fe25e3780cf0325daa45"
@@ -212,9 +209,7 @@ class CreateWatch(Resource):
         json_data = request.get_json()
         url = json_data['url'].strip()
 
-        # If hosts that only contain alphanumerics are allowed ("localhost" for example)
-        allow_simplehost = not strtobool(os.getenv('BLOCK_SIMPLEHOSTS', 'False'))
-        if not validators.url(url, simple_host=allow_simplehost):
+        if not validators.url(json_data['url'].strip()):
             return "Invalid or unsupported URL", 400
 
         if json_data.get('proxy'):

changedetectionio/blueprint/check_proxies/__init__.py

@@ -46,18 +46,12 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         except content_fetcher.Non200ErrorCodeReceived as e:
             if e.status_code == 404:
                 status.update({'status': 'OK', 'length': len(contents), 'text': f"OK but 404 (page not found)"})
-            elif e.status_code == 403 or e.status_code == 401:
-                status.update({'status': 'ERROR', 'length': len(contents), 'text': f"{e.status_code} - Access denied"})
+            elif e.status_code == 403:
+                status.update({'status': 'ERROR', 'length': len(contents), 'text': f"403 - Access denied"})
             else:
                 status.update({'status': 'ERROR', 'length': len(contents), 'text': f"Status code: {e.status_code}"})
-        except text_json_diff.FilterNotFoundInResponse:
-            status.update({'status': 'OK', 'length': len(contents), 'text': f"OK but CSS/xPath filter not found (page changed layout?)"})
         except content_fetcher.EmptyReply as e:
-            if e.status_code == 403 or e.status_code == 401:
-                status.update({'status': 'ERROR OTHER', 'length': len(contents), 'text': f"Got empty reply with code {e.status_code} - Access denied"})
-            else:
-                status.update({'status': 'ERROR OTHER', 'length': len(contents) if contents else 0, 'text': f"Empty reply with code {e.status_code}, needs chrome?"})
-
+            status.update({'status': 'ERROR OTHER', 'length': len(contents) if contents else 0, 'text': "Empty reply, needs chrome?"})
         except Exception as e:
             status.update({'status': 'ERROR OTHER', 'length': len(contents) if contents else 0, 'text': 'Error: '+str(e)})
         else:
@@ -98,13 +92,8 @@ def construct_blueprint(datastore: ChangeDetectionStore):
         if not datastore.proxy_list:
             return
 
-        if checks_in_progress.get(uuid):
-            state = _recalc_check_status(uuid=uuid)
-            for proxy_key, v in state.items():
-                if v.get('status') == 'RUNNING':
-                    return state
-        else:
-            checks_in_progress[uuid] = {}
+        # @todo - Cancel any existing runs
+        checks_in_progress[uuid] = {}
 
         for k, v in datastore.proxy_list.items():
             if not checks_in_progress[uuid].get(k):

changedetectionio/content_fetcher.py

@@ -201,8 +201,7 @@ class Fetcher():
             dest = os.path.join(self.browser_steps_screenshot_path, 'step_*.jpeg')
             files = glob.glob(dest)
             for f in files:
-                if os.path.isfile(f):
-                    os.unlink(f)
+                os.unlink(f)
 
 
 #   Maybe for the future, each fetcher provides its own diff output, could be used for text, image

changedetectionio/forms.py

@@ -1,6 +1,5 @@
 import os
 import re
-from distutils.util import strtobool
 
 from wtforms import (
     BooleanField,
@@ -258,10 +257,9 @@ class validateURL(object):
 
     def __call__(self, form, field):
         import validators
-        # If hosts that only contain alphanumerics are allowed ("localhost" for example)
-        allow_simplehost = not strtobool(os.getenv('BLOCK_SIMPLEHOSTS', 'False'))
+
         try:
-            validators.url(field.data.strip(), simple_host=allow_simplehost)
+            validators.url(field.data.strip())
         except validators.ValidationFailure:
             message = field.gettext('\'%s\' is not a valid URL.' % (field.data.strip()))
             raise ValidationError(message)

changedetectionio/static/js/recheck-proxy.js

@@ -12,7 +12,7 @@ $(function () {
 
     function set_proxy_check_status(proxy_key, state) {
         // select input by value name
-        const proxy_li = $('input[value="' + proxy_key + '" ]').parent();
+        const proxy_li = $("input[value=" + proxy_key + "]").parent();
         if (state['status'] === 'RUNNING') {
             $('.proxy-status', proxy_li).html('<span class="spinner"></span>');
         }

changedetectionio/static/styles/scss/parts/_darkmode.scss

@@ -1,25 +0,0 @@
-
-#toggle-light-mode {
-  width: 3rem;
-  /* default */
-  .icon-dark {
-    display: none;
-  }
-
-}
-
-html[data-darkmode="true"] {
-  #toggle-light-mode {
-    .icon-light {
-      display: none;
-    }
-
-    .icon-dark {
-      display: block;
-    }
-  }
-}
-
-
-
-

changedetectionio/static/styles/scss/styles.scss

@@ -8,7 +8,6 @@
 @import "parts/_pagination";
 @import "parts/_spinners";
 @import "parts/_variables";
-@import "parts/_darkmode";
 
 body {
   color: var(--color-text);
@@ -55,6 +54,22 @@ a.github-link {
   }
 }
 
+#toggle-light-mode {
+  width: 3rem;
+  .icon-dark {
+    display: none;
+  }
+
+  &.dark {
+    .icon-light {
+      display: none;
+    }
+
+    .icon-dark {
+      display: block;
+    }
+  }
+}
 
 #toggle-search {
   width: 2rem;

changedetectionio/static/styles/styles.css

@@ -316,18 +316,6 @@ html[data-darkmode="true"] {
     html[data-darkmode="true"] .watch-table .unviewed.error {
       color: var(--color-watch-table-error); }
 
-#toggle-light-mode {
-  width: 3rem;
-  /* default */ }
-  #toggle-light-mode .icon-dark {
-    display: none; }
-
-html[data-darkmode="true"] #toggle-light-mode .icon-light {
-  display: none; }
-
-html[data-darkmode="true"] #toggle-light-mode .icon-dark {
-  display: block; }
-
 body {
   color: var(--color-text);
   background: var(--color-background-page); }
@@ -362,6 +350,15 @@ a.github-link {
   a.github-link:hover {
     color: var(--color-icon-github-hover); }
 
+#toggle-light-mode {
+  width: 3rem; }
+  #toggle-light-mode .icon-dark {
+    display: none; }
+  #toggle-light-mode.dark .icon-light {
+    display: none; }
+  #toggle-light-mode.dark .icon-dark {
+    display: block; }
+
 #toggle-search {
   width: 2rem; }
 

requirements.txt

@@ -10,8 +10,7 @@ flask~=2.0
 inscriptis~=2.2
 pytz
 timeago~=1.0
-validators~=0.21
-
+validators
 
 # Set these versions together to avoid a RequestsDependencyWarning
 # >= 2.26 also adds Brotli support if brotli is installed
@@ -33,7 +32,7 @@ dnspython<2.3.0
 # jq not available on Windows so must be installed manually
 
 # Notification library
-apprise~=1.4.5
+apprise~=1.3.0
 
 # apprise mqtt https://github.com/dgtlmoon/changedetection.io/issues/315
 paho-mqtt
@@ -72,6 +71,3 @@ pillow
 # Include pytest, so if theres a support issue we can ask them to run these tests on their setup
 pytest ~=7.2
 pytest-flask ~=1.2
-
-# Pin jsonschema version to prevent build errors on armv6 while rpds-py wheels aren't available (1708)
-jsonschema==4.17.3