cphipps/changedetection.io
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VisualSelector - Better handling of filter targets that are no longer available in the HTML

Browse Source
This commit is contained in:
dgtlmoon
2022-05-25 10:23:43 +02:00
parent 6de4027c27
commit e3e022b0f4
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
changedetectionio/content_fetcher.py
View File

@@ -1,5 +1,6 @@
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
import chardet import chardet
import json
import os import os
import requests import requests
import time import time
@@ -123,13 +124,23 @@ class Fetcher():
// inject the current one set in the css_filter, which may be a CSS rule // inject the current one set in the css_filter, which may be a CSS rule
// used for displaying the current one in VisualSelector, where its not one we generated. // used for displaying the current one in VisualSelector, where its not one we generated.
if (css_filter.length) { if (css_filter.length) {
q=false;
try {
// is it xpath? // is it xpath?
if (css_filter.startsWith('/') ) { if (css_filter.startsWith('/') || css_filter.startsWith('xpath:')) {
q=document.evaluate(css_filter, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue; q=document.evaluate(css_filter.replace('xpath:',''), document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
} else { } else {
q=document.querySelector(css_filter); q=document.querySelector(css_filter);
} }
} catch (e) {
// Maybe catch DOMException and alert?
console.log(e);
}
bbox=false;
if(q) {
bbox = q.getBoundingClientRect(); bbox = q.getBoundingClientRect();
}
if (bbox && bbox['width'] >0 && bbox['height']>0) { if (bbox && bbox['width'] >0 && bbox['height']>0) {
size_pos.push({ size_pos.push({
xpath: css_filter, xpath: css_filter,
@@ -141,8 +152,8 @@ class Fetcher():
}); });
} }
} }
// https://stackoverflow.com/questions/1145850/how-to-get-height-of-entire-document-with-javascript // Window.width required for proper scaling in the frontend
return {'size_pos':size_pos, 'browser_width': window.innerWidth, 'browser_height':document.body.scrollHeight}; return {'size_pos':size_pos, 'browser_width': window.innerWidth};
""" """
xpath_data = None xpath_data = None
@@ -297,7 +308,7 @@ class base_html_playwright(Fetcher):
self.headers = response.all_headers() self.headers = response.all_headers()
if current_css_filter is not None: if current_css_filter is not None:
page.evaluate("var css_filter='{}'".format(current_css_filter)) page.evaluate("var css_filter={}".format(json.dumps(current_css_filter)))
else: else:
page.evaluate("var css_filter=''") page.evaluate("var css_filter=''")

2
changedetectionio/static/js/visual-selector.js
View File

@@ -138,7 +138,7 @@ $(document).ready(function() {
} }
} }
if(!found) { if(!found) {
alert("unfortunately your existing CSS/xPath Filter was no longer found!"); alert("Unfortunately your existing CSS/xPath Filter was no longer found!");
} }
} }