From 3b43da35ec463ca2f698dcb7e6190106a8b14212 Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Tue, 31 Oct 2023 10:31:34 +0100
Subject: [PATCH 1/2] Docker build - upgrade image to "bookworm" debian version
 - fix glibc mismatch (#1918)

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7d4865d0..d0f4ea75 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # pip dependencies install stage
-FROM python:3.11-slim-bullseye as builder
+FROM python:3.11-slim-bookworm as builder
 
 # See `cryptography` pin comment in requirements.txt
 ARG CRYPTOGRAPHY_DONT_BUILD_RUST=1
@@ -34,10 +34,9 @@ RUN pip install --target=/dependencies playwright~=1.27.1 \
     || echo "WARN: Failed to install Playwright. The application can still run, but the Playwright option will be disabled."
 
 # Final image stage
-FROM python:3.11-slim-bullseye
+FROM python:3.11-slim-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libssl1.1 \
     libxslt1.1 \
     # For pdftohtml
     poppler-utils \

From e209d9fba018c0f7c5893f4b25054e9a8599370e Mon Sep 17 00:00:00 2001
From: dgtlmoon <dgtlmoon@gmail.com>
Date: Wed, 1 Nov 2023 15:36:49 +0100
Subject: [PATCH 2/2] Ability to Import from Wachete XLSX (or any XLSX) -
 Wachete alternative made easy (#1921)

---
 changedetectionio/__init__.py                 |  28 +++-
 changedetectionio/forms.py                    |  40 +++--
 changedetectionio/importer.py                 | 146 ++++++++++++++++++
 changedetectionio/store.py                    |   2 +
 changedetectionio/templates/import.html       |  39 ++++-
 .../tests/import/spreadsheet.xlsx             | Bin 0 -> 29444 bytes
 changedetectionio/tests/test_import.py        |  88 ++++++++++-
 requirements.txt                              |   2 +-
 8 files changed, 323 insertions(+), 22 deletions(-)
 create mode 100644 changedetectionio/tests/import/spreadsheet.xlsx

diff --git a/changedetectionio/__init__.py b/changedetectionio/__init__.py
index 850e9966..54c02804 100644
--- a/changedetectionio/__init__.py
+++ b/changedetectionio/__init__.py
@@ -822,6 +822,7 @@ def changedetection_app(config=None, datastore_o=None):
         from . import forms
 
         if request.method == 'POST':
+
             from .importer import import_url_list, import_distill_io_json
 
             # URL List import
@@ -845,11 +846,32 @@ def changedetection_app(config=None, datastore_o=None):
                 for uuid in d_importer.new_uuids:
                     update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
 
+            # XLSX importer
+            if request.files and request.files.get('xlsx_file'):
+                file = request.files['xlsx_file']
+                from .importer import import_xlsx_wachete, import_xlsx_custom
+
+                if request.values.get('file_mapping') == 'wachete':
+                    w_importer = import_xlsx_wachete()
+                    w_importer.run(data=file, flash=flash, datastore=datastore)
+                else:
+                    w_importer = import_xlsx_custom()
+                    # Building mapping of col # to col # type
+                    map = {}
+                    for i in range(10):
+                        c = request.values.get(f"custom_xlsx[col_{i}]")
+                        v = request.values.get(f"custom_xlsx[col_type_{i}]")
+                        if c and v:
+                            map[int(c)] = v
+
+                    w_importer.import_profile = map
+                    w_importer.run(data=file, flash=flash, datastore=datastore)
+
+                for uuid in w_importer.new_uuids:
+                    update_q.put(queuedWatchMetaData.PrioritizedItem(priority=1, item={'uuid': uuid, 'skip_when_checksum_same': True}))
 
-        form = forms.importForm(formdata=request.form if request.method == 'POST' else None,
-#                               data=default,
-                               )
         # Could be some remaining, or we could be on GET
+        form = forms.importForm(formdata=request.form if request.method == 'POST' else None)
         output = render_template("import.html",
                                  form=form,
                                  import_url_list_remaining="\n".join(remaining_urls),
diff --git a/changedetectionio/forms.py b/changedetectionio/forms.py
index 4177ed80..e8c35cb8 100644
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@@ -15,9 +15,14 @@ from wtforms import (
     validators,
     widgets
 )
+from flask_wtf.file import FileField, FileAllowed
 from wtforms.fields import FieldList
+
 from wtforms.validators import ValidationError
 
+from validators.url import url as url_validator
+
+
 # default
 # each select <option data-enabled="enabled-0-0"
 from changedetectionio.blueprint.browser_steps.browser_steps import browser_step_ui_config
@@ -41,7 +46,7 @@ valid_method = {
 }
 
 default_method = 'GET'
-
+allow_simplehost = not strtobool(os.getenv('BLOCK_SIMPLEHOSTS', 'False'))
 
 class StringListField(StringField):
     widget = widgets.TextArea()
@@ -261,19 +266,23 @@ class validateURL(object):
         self.message = message
 
     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)
-        except validators.ValidationFailure:
-            message = field.gettext('\'%s\' is not a valid URL.' % (field.data.strip()))
-            raise ValidationError(message)
-
-        from .model.Watch import is_safe_url
-        if not is_safe_url(field.data):
-            raise ValidationError('Watch protocol is not permitted by SAFE_PROTOCOL_REGEX')
-
+        # This should raise a ValidationError() or not
+        validate_url(field.data)
+
+def validate_url(test_url):
+    # If hosts that only contain alphanumerics are allowed ("localhost" for example)
+    try:
+        url_validator(test_url, simple_host=allow_simplehost)
+    except validators.ValidationError:
+        #@todo check for xss
+        message = f"'{test_url}' is not a valid URL."
+        # This should be wtforms.validators.
+        raise ValidationError(message)
+
+    from .model.Watch import is_safe_url
+    if not is_safe_url(test_url):
+        # This should be wtforms.validators.
+        raise ValidationError('Watch protocol is not permitted by SAFE_PROTOCOL_REGEX or incorrect URL format')
 
 class ValidateListRegex(object):
     """
@@ -398,6 +407,9 @@ class importForm(Form):
     from . import processors
     processor = RadioField(u'Processor', choices=processors.available_processors(), default="text_json_diff")
     urls = TextAreaField('URLs')
+    xlsx_file = FileField('Upload .xlsx file', validators=[FileAllowed(['xlsx'], 'Must be .xlsx file!')])
+    file_mapping = SelectField('File mapping', [validators.DataRequired()], choices={('wachete', 'Wachete mapping'), ('custom','Custom mapping')})
+
 
 class SingleBrowserStep(Form):
 
diff --git a/changedetectionio/importer.py b/changedetectionio/importer.py
index f046c895..963482de 100644
--- a/changedetectionio/importer.py
+++ b/changedetectionio/importer.py
@@ -1,6 +1,9 @@
 from abc import ABC, abstractmethod
 import time
 import validators
+from wtforms import ValidationError
+
+from changedetectionio.forms import validate_url
 
 
 class Importer():
@@ -12,6 +15,7 @@ class Importer():
         self.new_uuids = []
         self.good = 0
         self.remaining_data = []
+        self.import_profile = None
 
     @abstractmethod
     def run(self,
@@ -132,3 +136,145 @@ class import_distill_io_json(Importer):
                     good += 1
 
         flash("{} Imported from Distill.io in {:.2f}s, {} Skipped.".format(len(self.new_uuids), time.time() - now, len(self.remaining_data)))
+
+class import_xlsx_wachete(Importer):
+
+    def run(self,
+            data,
+            flash,
+            datastore,
+            ):
+        good = 0
+        now = time.time()
+        self.new_uuids = []
+
+        from openpyxl import load_workbook
+
+        try:
+            wb = load_workbook(data)
+        except Exception as e:
+            #@todo correct except
+            flash("Unable to read export XLSX file, something wrong with the file?", 'error')
+            return
+
+        sheet_obj = wb.active
+
+        i = 1
+        row = 2
+        while sheet_obj.cell(row=row, column=1).value:
+            data = {}
+            while sheet_obj.cell(row=row, column=i).value:
+                column_title = sheet_obj.cell(row=1, column=i).value.strip().lower()
+                column_row_value = sheet_obj.cell(row=row, column=i).value
+                data[column_title] = column_row_value
+
+                i += 1
+
+            extras = {}
+            if data.get('xpath'):
+                #@todo split by || ?
+                extras['include_filters'] = [data.get('xpath')]
+            if data.get('name'):
+                extras['title'] = [data.get('name').strip()]
+            if data.get('interval (min)'):
+                minutes = int(data.get('interval (min)'))
+                hours, minutes = divmod(minutes, 60)
+                days, hours = divmod(hours, 24)
+                weeks, days = divmod(days, 7)
+                extras['time_between_check'] = {'weeks': weeks, 'days': days, 'hours': hours, 'minutes': minutes, 'seconds': 0}
+
+
+            # At minimum a URL is required.
+            if data.get('url'):
+                try:
+                    validate_url(data.get('url'))
+                except ValidationError as e:
+                    print(">> import URL error", data.get('url'), str(e))
+                    # Don't bother processing anything else on this row
+                    continue
+
+                new_uuid = datastore.add_watch(url=data['url'].strip(),
+                                               extras=extras,
+                                               tag=data.get('folder'),
+                                               write_to_disk_now=False)
+                if new_uuid:
+                    # Straight into the queue.
+                    self.new_uuids.append(new_uuid)
+                    good += 1
+
+            row += 1
+            i = 1
+
+
+        flash(
+            "{} imported from Wachete .xlsx in {:.2f}s".format(len(self.new_uuids), time.time() - now))
+
+class import_xlsx_custom(Importer):
+
+    def run(self,
+            data,
+            flash,
+            datastore,
+            ):
+        good = 0
+        now = time.time()
+        self.new_uuids = []
+
+        from openpyxl import load_workbook
+
+        try:
+            wb = load_workbook(data)
+        except Exception as e:
+            #@todo correct except
+            flash("Unable to read export XLSX file, something wrong with the file?", 'error')
+            return
+
+        # @todo cehck atleast 2 rows, same in other method
+
+        sheet_obj = wb.active
+        from .forms import validate_url
+        row = 2
+        while sheet_obj.cell(row=row, column=1).value:
+            url = None
+            tags = None
+            extras = {}
+            for col_i, cell_map in self.import_profile.items():
+                cell_val = sheet_obj.cell(row=row, column=col_i).value
+                if cell_map == 'url':
+                    url = cell_val.strip()
+                    try:
+                        validate_url(url)
+                    except ValidationError as e:
+                        print (">> Import URL error",url, str(e))
+                        # Don't bother processing anything else on this row
+                        url = None
+                        break
+
+                elif cell_map == 'tag':
+                    tags = cell_val.strip()
+                elif cell_map == 'include_filters':
+                    # @todo validate?
+                    extras['include_filters'] = [cell_val.strip()]
+                elif cell_map == 'interval_minutes':
+                    hours, minutes = divmod(int(cell_val), 60)
+                    days, hours = divmod(hours, 24)
+                    weeks, days = divmod(days, 7)
+                    extras['time_between_check'] = {'weeks': weeks, 'days': days, 'hours': hours, 'minutes': minutes, 'seconds': 0}
+                else:
+                    extras[cell_map] = cell_val.strip()
+
+            # At minimum a URL is required.
+            if url:
+                new_uuid = datastore.add_watch(url=url,
+                                               extras=extras,
+                                               tag=tags,
+                                               write_to_disk_now=False)
+                if new_uuid:
+                    # Straight into the queue.
+                    self.new_uuids.append(new_uuid)
+                    good += 1
+
+            row += 1
+
+        flash(
+            "{} imported from custom .xlsx in {:.2f}s".format(len(self.new_uuids), time.time() - now))
diff --git a/changedetectionio/store.py b/changedetectionio/store.py
index e476afae..6306a391 100644
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -360,6 +360,8 @@ class ChangeDetectionStore:
         if write_to_disk_now:
             self.sync_to_json()
 
+        print("added ", url)
+
         return new_uuid
 
     def visualselector_data_is_ready(self, watch_uuid):
diff --git a/changedetectionio/templates/import.html b/changedetectionio/templates/import.html
index 9824ccf5..a1c575f7 100644
--- a/changedetectionio/templates/import.html
+++ b/changedetectionio/templates/import.html
@@ -8,11 +8,12 @@
         <ul>
             <li class="tab" id=""><a href="#url-list">URL List</a></li>
             <li class="tab"><a href="#distill-io">Distill.io</a></li>
+            <li class="tab"><a href="#xlsx">.XLSX &amp; Wachete</a></li>
         </ul>
     </div>
 
     <div class="box-wrap inner">
-        <form class="pure-form pure-form-aligned" action="{{url_for('import_page')}}" method="POST">
+        <form class="pure-form" action="{{url_for('import_page')}}" method="POST" enctype="multipart/form-data">
             <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="tab-pane-inner" id="url-list">
                     <legend>
@@ -79,6 +80,42 @@
 " rows="25">{{ original_distill_json }}</textarea>
 
             </div>
+            <div class="tab-pane-inner" id="xlsx">
+            <fieldset>
+                <div class="pure-control-group">
+                {{ render_field(form.xlsx_file, class="processor") }}
+                </div>
+                <div class="pure-control-group">
+                    {{ render_field(form.file_mapping, class="processor") }}
+                </div>
+            </fieldset>
+                <div class="pure-control-group">
+                <span class="pure-form-message-inline">
+                    Table of custom column and data types mapping for the <strong>Custom mapping</strong> File mapping type.
+                </span>
+                    <table style="border: 1px solid #aaa; padding: 0.5rem; border-radius: 4px;">
+                        <tr>
+                            <td><strong>Column #</strong></td>
+                            {% for n in range(4) %}
+                                <td><input type="number" name="custom_xlsx[col_{{n}}]" style="width: 4rem;" min="1"></td>
+                            {%  endfor %}
+                        </tr>
+                        <tr>
+                            <td><strong>Type</strong></td>
+                            {% for n in range(4) %}
+                                <td><select name="custom_xlsx[col_type_{{n}}]">
+                                    <option value="" style="color: #aaa"> -- none --</option>
+                                    <option value="url">URL</option>
+                                    <option value="title">Title</option>
+                                    <option value="include_filter">CSS/xPath filter</option>
+                                    <option value="tag">Group / Tag name(s)</option>
+                                    <option value="interval_minutes">Recheck time (minutes)</option>
+                                </select></td>
+                            {%  endfor %}
+                        </tr>
+                    </table>
+                </div>
+            </div>
             <button type="submit" class="pure-button pure-input-1-2 pure-button-primary">Import</button>
         </form>
 
diff --git a/changedetectionio/tests/import/spreadsheet.xlsx b/changedetectionio/tests/import/spreadsheet.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..600847b897dd564c4af1b59632e492b6bc697d5c
GIT binary patch
literal 29444
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

literal 0
HcmV?d00001

diff --git a/changedetectionio/tests/test_import.py b/changedetectionio/tests/test_import.py
index a044ff79..4772226c 100644
--- a/changedetectionio/tests/test_import.py
+++ b/changedetectionio/tests/test_import.py
@@ -1,16 +1,19 @@
 #!/usr/bin/python3
-
+import io
+import os
 import time
 
 from flask import url_for
 
-from .util import live_server_setup
+from .util import live_server_setup, wait_for_all_checks
+
+
 def test_setup(client, live_server):
     live_server_setup(live_server)
 
 def test_import(client, live_server):
     # Give the endpoint time to spin up
-    time.sleep(1)
+    wait_for_all_checks(client)
 
     res = client.post(
         url_for("import_page"),
@@ -119,3 +122,82 @@ def test_import_distillio(client, live_server):
     res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)
     # Clear flask alerts
     res = client.get(url_for("index"))
+
+def test_import_custom_xlsx(client, live_server):
+    """Test can upload a excel spreadsheet and the watches are created correctly"""
+
+    #live_server_setup(live_server)
+    dirname = os.path.dirname(__file__)
+    filename = os.path.join(dirname, 'import/spreadsheet.xlsx')
+    with open(filename, 'rb') as f:
+
+        data= {
+            'file_mapping': 'custom',
+            'custom_xlsx[col_0]': '1',
+            'custom_xlsx[col_1]': '3',
+            'custom_xlsx[col_2]': '5',
+            'custom_xlsx[col_3]': '4',
+            'custom_xlsx[col_type_0]': 'title',
+            'custom_xlsx[col_type_1]': 'url',
+            'custom_xlsx[col_type_2]': 'include_filters',
+            'custom_xlsx[col_type_3]': 'interval_minutes',
+            'xlsx_file': (io.BytesIO(f.read()), 'spreadsheet.xlsx')
+        }
+
+    res = client.post(
+        url_for("import_page"),
+        data=data,
+        follow_redirects=True,
+    )
+
+    assert b'2 imported from custom .xlsx' in res.data
+
+    res = client.get(
+        url_for("index")
+    )
+
+
+    assert b'Somesite results ABC' in res.data
+    assert b'City news results' in res.data
+
+    # Just find one to check over
+    for uuid, watch in live_server.app.config['DATASTORE'].data['watching'].items():
+        if watch.get('title') == 'Somesite results ABC':
+            filters = watch.get('include_filters')
+            assert filters[0] == '/html[1]/body[1]/div[4]/div[1]/div[1]/div[1]||//*[@id=\'content\']/div[3]/div[1]/div[1]||//*[@id=\'content\']/div[1]'
+            assert watch.get('time_between_check') == {'weeks': 0, 'days': 1, 'hours': 6, 'minutes': 24, 'seconds': 0}
+
+def test_import_watchete_xlsx(client, live_server):
+    """Test can upload a excel spreadsheet and the watches are created correctly"""
+
+    #live_server_setup(live_server)
+    dirname = os.path.dirname(__file__)
+    filename = os.path.join(dirname, 'import/spreadsheet.xlsx')
+    with open(filename, 'rb') as f:
+
+        data= {
+            'file_mapping': 'wachete',
+            'xlsx_file': (io.BytesIO(f.read()), 'spreadsheet.xlsx')
+        }
+
+    res = client.post(
+        url_for("import_page"),
+        data=data,
+        follow_redirects=True,
+    )
+
+    assert b'2 imported from Wachete .xlsx' in res.data
+
+    res = client.get(
+        url_for("index")
+    )
+
+    assert b'Somesite results ABC' in res.data
+    assert b'City news results' in res.data
+
+    # Just find one to check over
+    for uuid, watch in live_server.app.config['DATASTORE'].data['watching'].items():
+        if watch.get('title') == 'Somesite results ABC':
+            filters = watch.get('include_filters')
+            assert filters[0] == '/html[1]/body[1]/div[4]/div[1]/div[1]/div[1]||//*[@id=\'content\']/div[3]/div[1]/div[1]||//*[@id=\'content\']/div[1]'
+            assert watch.get('time_between_check') == {'weeks': 0, 'days': 1, 'hours': 6, 'minutes': 24, 'seconds': 0}
diff --git a/requirements.txt b/requirements.txt
index 8d050066..1ffe38c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -59,7 +59,7 @@ werkzeug~=2.0.0
 # Templating, so far just in the URLs but in the future can be for the notifications also
 jinja2~=3.1
 jinja2-time
-
+openpyxl
 # https://peps.python.org/pep-0508/#environment-markers
 # https://github.com/dgtlmoon/changedetection.io/pull/1009
 jq~=1.3; python_version >= "3.8" and sys_platform == "darwin"