0.39.15

Watch overview list - adding spinner to make it easier to see whats currently being 'Checked'
Preview section - add helpful check
2022-06-12 14:05:34 +02:00 · 2022-06-12 12:52:17 +02:00 · 2022-06-12 11:10:06 +02:00 · 2022-06-12 10:47:00 +02:00 · 2022-06-11 23:07:09 +02:00 · 2022-06-11 00:43:28 +02:00
11 changed files with 164 additions and 23 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error

-! ALWAYS INCLUDE AN EXAMPLE URL WHERE IT IS POSSIBLE TO RE-CREATE THE ISSUE !
+! ALWAYS INCLUDE AN EXAMPLE URL WHERE IT IS POSSIBLE TO RE-CREATE THE ISSUE - USE THE 'SHARE WATCH' FEATURE AND PASTE IN THE SHARE-LINK!

 **Expected behavior**
 A clear and concise description of what you expected to happen.
--- a/changedetectionio/init.py
+++ b/changedetectionio/init.py
@@ -20,6 +20,7 @@ from copy import deepcopy
 from threading import Event

 import flask_login
+import logging
 import pytz
 import timeago
 from feedgen.feed import FeedGenerator
@@ -43,7 +44,7 @@ from flask_wtf import CSRFProtect
 from changedetectionio import html_tools
 from changedetectionio.api import api_v1

-__version__ = '0.39.14'
+__version__ = '0.39.15'

 datastore = None

@@ -107,7 +108,7 @@ def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"):
    # Worker thread tells us which UUID it is currently processing.
    for t in running_update_threads:
        if t.current_uuid == watch_obj['uuid']:
-            return "Checking now.."
+            return '<span class="loader"></span><span> Checking now</span>'

    if watch_obj['last_checked'] == 0:
        return 'Not yet'
@@ -351,9 +352,8 @@ def changedetection_app(config=None, datastore_o=None):
                latest_fname = watch.history[dates[-1]]

                html_diff = diff.render_diff(prev_fname, latest_fname, include_equal=False, line_feed_sep="</br>")
-                fe.description(description="<![CDATA["
-                                           "<html><body><h4>{}</h4>{}</body></html>"
-                                           "]]>".format(watch_title, html_diff))
+                fe.content(content="<html><body><h4>{}</h4>{}</body></html>".format(watch_title, html_diff),
+                           type='CDATA')

                fe.guid(guid, permalink=False)
                dt = datetime.datetime.fromtimestamp(int(watch.newest_history_key))
@@ -458,6 +458,19 @@ def changedetection_app(config=None, datastore_o=None):

        return 'OK'

+
+    @app.route("/scrub/<string:uuid>", methods=['GET'])
+    @login_required
+    def scrub_watch(uuid):
+        try:
+            datastore.scrub_watch(uuid)
+        except KeyError:
+            flash('Watch not found', 'error')
+        else:
+            flash("Scrubbed watch {}".format(uuid))
+
+        return redirect(url_for('index'))
+
    @app.route("/scrub", methods=['GET', 'POST'])
    @login_required
    def scrub_page():
@@ -842,6 +855,12 @@ def changedetection_app(config=None, datastore_o=None):
        if uuid == 'first':
            uuid = list(datastore.data['watching'].keys()).pop()

+        # Normally you would never reach this, because the 'preview' button is not available when there's no history
+        # However they may try to scrub and reload the page
+        if datastore.data['watching'][uuid].history_n == 0:
+            flash("Preview unavailable - No fetch/check completed or triggers not reached", "error")
+            return redirect(url_for('index'))
+
        extra_stylesheets = [url_for('static_content', group='styles', filename='diff.css')]

        try:
@@ -911,7 +930,7 @@ def changedetection_app(config=None, datastore_o=None):
    def notification_logs():
        global notification_debug_log
        output = render_template("notification-log.html",
-                                 logs=notification_debug_log if len(notification_debug_log) else ["No errors or warnings detected"])
+                                 logs=notification_debug_log if len(notification_debug_log) else ["Notification logs are empty - no notifications sent yet."])

        return output

@@ -1182,7 +1201,8 @@ def changedetection_app(config=None, datastore_o=None):


        except Exception as e:
-            flash("Could not share, something went wrong while communicating with the share server.", 'error')
+            logging.error("Error sharing -{}".format(str(e)))
+            flash("Could not share, something went wrong while communicating with the share server - {}".format(str(e)), 'error')

        # https://changedetection.io/share/VrMv05wpXyQa
        # in the browser - should give you a nice info page - wtf
@@ -1230,6 +1250,9 @@ def check_for_new_version():

 def notification_runner():
    global notification_debug_log
+    from datetime import datetime
+    import json
+
    while not app.config.exit.is_set():
        try:
            # At the moment only one thread runs (single runner)
@@ -1238,13 +1261,16 @@ def notification_runner():
            time.sleep(1)

        else:
-            # Process notifications
+
+            now = datetime.now()
+
            try:
                from changedetectionio import notification
+
                notification.process_notification(n_object, datastore)

            except Exception as e:
-                print("Watch URL: {}  Error {}".format(n_object['watch_url'], str(e)))
+                logging.error("Watch URL: {}  Error {}".format(n_object['watch_url'], str(e)))

                # UUID wont be present when we submit a 'test' from the global settings
                if 'uuid' in n_object:
@@ -1254,9 +1280,10 @@ def notification_runner():
                log_lines = str(e).splitlines()
                notification_debug_log += log_lines

-                # Trim the log length
-                notification_debug_log = notification_debug_log[-100:]
-
+            # Process notifications
+            notification_debug_log+= ["{} - SENDING {}".format(now.strftime("%Y/%m/%d %H:%M:%S,000"), json.dumps(n_object))]
+            # Trim the log length
+            notification_debug_log = notification_debug_log[-100:]

 # Thread runner to check every minute, look for new watches to feed into the Queue.
 def ticker_thread_check_time_launch_checks():
--- a/changedetectionio/notification.py
+++ b/changedetectionio/notification.py
@@ -97,6 +97,8 @@ def process_notification(n_object, datastore):
                if log_value and 'WARNING' in log_value or 'ERROR' in log_value:
                    raise Exception(log_value)

+
+
 # Notification title + body content parameters get created here.
 def create_notification_parameters(n_object, datastore):
    from copy import deepcopy
--- a/changedetectionio/static/js/notifications.js
+++ b/changedetectionio/static/js/notifications.js
@@ -40,13 +40,19 @@ $(document).ready(function() {
    $.ajax({
      type: "POST",
      url: notification_base_url,
-      data : data
+      data : data,
+        statusCode: {
+        400: function() {
+            // More than likely the CSRF token was lost when the server restarted
+          alert("There was a problem processing the request, please reload the page.");
+        }
+      }
    }).done(function(data){
      console.log(data);
      alert('Sent');
    }).fail(function(data){
      console.log(data);
-      alert('Error: '+data.responseJSON.error);
+      alert('There was an error communicating with the server.');
    })
  });
 });
--- a/changedetectionio/static/styles/styles.css
+++ b/changedetectionio/static/styles/styles.css
@@ -353,6 +353,8 @@ and also iPads specifically.
    /* Hide table headers (but not display: none;, for accessibility) */ }
    .watch-table thead, .watch-table tbody, .watch-table th, .watch-table td, .watch-table tr {
      display: block; }
+    .watch-table .last-checked > span {
+      vertical-align: middle; }
    .watch-table .last-checked::before {
      color: #555;
      content: "Last Checked "; }
@@ -370,7 +372,8 @@ and also iPads specifically.
    .watch-table td {
      /* Behave  like a "row" */
      border: none;
-      border-bottom: 1px solid #eee; }
+      border-bottom: 1px solid #eee;
+      vertical-align: middle; }
      .watch-table td:before {
        /* Top/left values mimic padding */
        top: 6px;
@@ -490,3 +493,42 @@ ul {

 #api-key-copy {
  color: #0078e7; }
+
+/* spinner */
+.loader,
+.loader:after {
+  border-radius: 50%;
+  width: 10px;
+  height: 10px; }
+
+.loader {
+  margin: 0px auto;
+  font-size: 3px;
+  vertical-align: middle;
+  display: inline-block;
+  text-indent: -9999em;
+  border-top: 1.1em solid rgba(38, 104, 237, 0.2);
+  border-right: 1.1em solid rgba(38, 104, 237, 0.2);
+  border-bottom: 1.1em solid rgba(38, 104, 237, 0.2);
+  border-left: 1.1em solid #2668ed;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+  -webkit-animation: load8 1.1s infinite linear;
+  animation: load8 1.1s infinite linear; }
+
+@-webkit-keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg); } }
+
+@keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg); } }
--- a/changedetectionio/static/styles/styles.scss
+++ b/changedetectionio/static/styles/styles.scss
@@ -487,6 +487,11 @@ and also iPads specifically.
      display: block;
    }

+    .last-checked {
+      > span {
+        vertical-align: middle;
+      }
+    }
    .last-checked::before {
      color: #555;
      content: "Last Checked ";
@@ -517,7 +522,7 @@ and also iPads specifically.
      /* Behave  like a "row" */
      border: none;
      border-bottom: 1px solid #eee;
-
+      vertical-align: middle;
      &:before {
        /* Top/left values mimic padding */
        top: 6px;
@@ -701,3 +706,48 @@ ul {
 #api-key-copy {
  color: #0078e7;
 }
+
+/* spinner */
+.loader,
+.loader:after {
+  border-radius: 50%;
+  width: 10px;
+  height: 10px;
+}
+.loader {
+  margin: 0px auto;
+  font-size: 3px;
+  vertical-align: middle;
+  display: inline-block;
+  text-indent: -9999em;
+  border-top: 1.1em solid rgba(38,104,237, 0.2);
+  border-right: 1.1em solid rgba(38,104,237, 0.2);
+  border-bottom: 1.1em solid rgba(38,104,237, 0.2);
+  border-left: 1.1em solid #2668ed;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+  -webkit-animation: load8 1.1s infinite linear;
+  animation: load8 1.1s infinite linear;
+}
+@-webkit-keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -254,12 +254,23 @@ class ChangeDetectionStore:
    def scrub_watch(self, uuid):
        import pathlib

-        self.__data['watching'][uuid].update({'history': {}, 'last_checked': 0, 'last_changed': 0, 'previous_md5': False})
-        self.needs_write_urgent = True
+        self.__data['watching'][uuid].update(
+            {'last_checked': 0,
+             'last_changed': 0,
+             'last_viewed': 0,
+             'previous_md5': False,
+             'last_notification_error': False,
+             'last_error': False})

-        for item in pathlib.Path(self.datastore_path).rglob(uuid+"/*.txt"):
+        # JSON Data, Screenshots, Textfiles (history index and snapshots), HTML in the future etc
+        for item in pathlib.Path(os.path.join(self.datastore_path, uuid)).rglob("*.*"):
            unlink(item)

+        # Force the attr to recalculate
+        bump = self.__data['watching'][uuid].history
+
+        self.needs_write_urgent = True
+
    def add_watch(self, url, tag="", extras=None, write_to_disk_now=True):

        if extras is None:
--- a/changedetectionio/templates/_common_fields.jinja
+++ b/changedetectionio/templates/_common_fields.jinja
@@ -14,7 +14,7 @@
                                <li>Use <a target=_new href="https://github.com/caronc/apprise">AppRise URLs</a> for notification to just about any service! <i><a target=_new href="https://github.com/dgtlmoon/changedetection.io/wiki/Notification-configuration-notes">Please read the notification services wiki here for important configuration notes</a></i>.</li>
                                <li><code>discord://</code> only supports a maximum <strong>2,000 characters</strong> of notification text, including the title.</li>
                                <li><code>tgram://</code> bots cant send messages to other bots, so you should specify chat ID of non-bot user.</li>
-                                <li>Go here for <a href="{{url_for('notification_logs')}}">notification debug logs</a></li>
+
                              </ul>
                            </div>
                            <br/>
@@ -22,6 +22,7 @@
 {% if emailprefix %}
                            <a id="add-email-helper" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Add email</a>
 {% endif %}
+                            <a href="{{url_for('notification_logs')}}" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Notification debug logs</a>
                        </div>
                        <div id="notification-customisation" class="pure-control-group">
                            <div class="pure-control-group">
--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -259,6 +259,8 @@ nav

                    <a href="{{url_for('form_delete', uuid=uuid)}}"
                       class="pure-button button-small button-error ">Delete</a>
+                    <a href="{{url_for('scrub_watch', uuid=uuid)}}"
+                       class="pure-button button-small button-error ">Scrub</a>
                    <a href="{{url_for('form_clone', uuid=uuid)}}"
                       class="pure-button button-small ">Create Copy</a>
                </div>
--- a/changedetectionio/templates/notification-log.html
+++ b/changedetectionio/templates/notification-log.html
@@ -4,7 +4,7 @@
 <div class="edit-form">
     <div class="inner">

-         <h4 style="margin-top: 0px;">The following issues were detected when sending notifications</h4>
+         <h4 style="margin-top: 0px;">Notification debug log</h4>
                <div id="notification-error-log">
                <ul style="font-size: 80%; margin:0px; padding: 0 0 0 7px">
                {% for log in logs|reverse %}
--- a/changedetectionio/templates/watch-overview.html
+++ b/changedetectionio/templates/watch-overview.html
@@ -67,7 +67,7 @@
                    <span class="watch-tag-list">{{ watch.tag}}</span>
                    {% endif %}
                </td>
-                <td class="last-checked">{{watch|format_last_checked_time}}</td>
+                <td class="last-checked">{{watch|format_last_checked_time|safe}}</td>
                <td class="last-changed">{% if watch.history_n >=2 and watch.last_changed %}
                    {{watch.last_changed|format_timestamp_timeago}}
                    {% else %}
Author	SHA1	Message	Date
dgtlmoon	ba8cf2c8cf	0.39.15	2022-06-12 14:05:34 +02:00
dgtlmoon	3106b6688e	Watch overview list - adding spinner to make it easier to see whats currently being 'Checked'	2022-06-12 12:52:17 +02:00
dgtlmoon	2c83845dac	Preview section - add helpful check	2022-06-12 11:10:06 +02:00
dgtlmoon	111266d6fa	Send test notification - improved handling of errors	2022-06-12 10:47:00 +02:00
dgtlmoon	ead610151f	Notification log - also log normal requests and make the log easier to find	2022-06-11 23:07:09 +02:00
dgtlmoon	7e1e763989	Update bug_report.md	2022-06-11 00:43:28 +02:00
dgtlmoon	327cc4af34	Use correct RSS CDATA handling (#662 )	2022-06-08 18:40:01 +02:00
dgtlmoon	6008ff516e	Improve logging (#671 )	2022-06-08 18:32:41 +02:00
dgtlmoon	cdcf4b353f	New [scrub] button when editing a watch - scrub single watch history (#672 )	2022-06-08 18:32:25 +02:00