Misc fixes

12 months ago · 465ff6ee44
parent 5e2049c538
commit 465ff6ee44
3 changed files with 9 additions and 8 deletions
--- a/changedetectionio/forms.py
+++ b/changedetectionio/forms.py
@ -351,7 +351,7 @@ class ValidateCSSJSONXPATHInput(object):
                    raise ValidationError("XPath not permitted in this field!")
                from lxml import etree, html
                tree = html.fromstring("<html></html>")
-                line = line.replace('xpath1:', '')
+                line = re.sub(r'^xpath1:', '', line)

                try:
                    tree.xpath(line.strip())
--- a/changedetectionio/res/xpath_element_scraper.js
+++ b/changedetectionio/res/xpath_element_scraper.js
@ -170,9 +170,12 @@ if (include_filters.length) {

        try {
            // is it xpath?
-            if (f.startsWith('/') || f.startsWith('xpath:')) {
-                q = document.evaluate(f.replace('xpath:', ''), document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
+            if (f.startsWith('/') || f.startsWith('xpath')) {
+                var qry_f = f.replace(/xpath(:|\d:)/, '')
+                console.log("[xpath] Scanning for included filter " + qry_f)
+                q = document.evaluate(qry_f, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
            } else {
+                console.log("[css] Scanning for included filter " + f)
                q = document.querySelector(f);
            }
        } catch (e) {
@ -183,7 +186,7 @@ if (include_filters.length) {

        if (q) {
            // #1231 - IN the case XPath attribute filter is applied, we will have to traverse up and find the element.
-            if (q.hasOwnProperty('getBoundingClientRect')) {
+            if (typeof q.getBoundingClientRect == 'function') {
                bbox = q.getBoundingClientRect();
                console.log("xpath_element_scraper: Got filter element, scroll from top was " + scroll_y)
            } else {
@ -192,7 +195,8 @@ if (include_filters.length) {
                    bbox = q.ownerElement.getBoundingClientRect();
                    console.log("xpath_element_scraper: Got filter by ownerElement element, scroll from top was " + scroll_y)
                } catch (e) {
-                    console.log("xpath_element_scraper: error looking up ownerElement")
+                    console.log(e)
+                    console.log("xpath_element_scraper: error looking up q.ownerElement")
                }
            }
        }
--- a/changedetectionio/tests/test_extract_regex.py
+++ b/changedetectionio/tests/test_extract_regex.py
@ -227,9 +227,6 @@ def test_regex_error_handling(client, live_server):
        follow_redirects=True
    )

-    with open('/tmp/fuck.html', 'wb') as f:
-        f.write(res.data)
-
    assert b'is not a valid regular expression.' in res.data

    res = client.get(url_for("form_delete", uuid="all"), follow_redirects=True)