Adding new Visual Selector for choosing the area of the webpage to monitor - playwright/browserless only (#566)
dgtlmoon
3 years ago
parent
8e3195f394
commit
eef56e52c6
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 12 KiB |
@ -0,0 +1,56 @@
|
|||||||
|
/**
|
||||||
|
* debounce
|
||||||
|
* @param {integer} milliseconds This param indicates the number of milliseconds
|
||||||
|
* to wait after the last call before calling the original function.
|
||||||
|
* @param {object} What "this" refers to in the returned function.
|
||||||
|
* @return {function} This returns a function that when called will wait the
|
||||||
|
* indicated number of milliseconds after the last call before
|
||||||
|
* calling the original function.
|
||||||
|
*/
|
||||||
|
Function.prototype.debounce = function (milliseconds, context) {
|
||||||
|
var baseFunction = this,
|
||||||
|
timer = null,
|
||||||
|
wait = milliseconds;
|
||||||
|
|
||||||
|
return function () {
|
||||||
|
var self = context || this,
|
||||||
|
args = arguments;
|
||||||
|
|
||||||
|
function complete() {
|
||||||
|
baseFunction.apply(self, args);
|
||||||
|
timer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (timer) {
|
||||||
|
clearTimeout(timer);
|
||||||
|
}
|
||||||
|
|
||||||
|
timer = setTimeout(complete, wait);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* throttle
|
||||||
|
* @param {integer} milliseconds This param indicates the number of milliseconds
|
||||||
|
* to wait between calls before calling the original function.
|
||||||
|
* @param {object} What "this" refers to in the returned function.
|
||||||
|
* @return {function} This returns a function that when called will wait the
|
||||||
|
* indicated number of milliseconds between calls before
|
||||||
|
* calling the original function.
|
||||||
|
*/
|
||||||
|
Function.prototype.throttle = function (milliseconds, context) {
|
||||||
|
var baseFunction = this,
|
||||||
|
lastEventTimestamp = null,
|
||||||
|
limit = milliseconds;
|
||||||
|
|
||||||
|
return function () {
|
||||||
|
var self = context || this,
|
||||||
|
args = arguments,
|
||||||
|
now = Date.now();
|
||||||
|
|
||||||
|
if (!lastEventTimestamp || now - lastEventTimestamp >= limit) {
|
||||||
|
lastEventTimestamp = now;
|
||||||
|
baseFunction.apply(self, args);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
@ -0,0 +1,219 @@
|
|||||||
|
// Horrible proof of concept code :)
|
||||||
|
// yes - this is really a hack, if you are a front-ender and want to help, please get in touch!
|
||||||
|
|
||||||
|
$(document).ready(function() {
|
||||||
|
|
||||||
|
$('#visualselector-tab').click(function () {
|
||||||
|
$("img#selector-background").off('load');
|
||||||
|
bootstrap_visualselector();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).on('keydown', function(event) {
|
||||||
|
if ($("img#selector-background").is(":visible")) {
|
||||||
|
if (event.key == "Escape") {
|
||||||
|
state_clicked=false;
|
||||||
|
ctx.clearRect(0, 0, c.width, c.height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// For when the page loads
|
||||||
|
if(!window.location.hash || window.location.hash != '#visualselector') {
|
||||||
|
$("img#selector-background").attr('src','');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle clearing button/link
|
||||||
|
$('#clear-selector').on('click', function(event) {
|
||||||
|
if(!state_clicked) {
|
||||||
|
alert('Oops, Nothing selected!');
|
||||||
|
}
|
||||||
|
state_clicked=false;
|
||||||
|
ctx.clearRect(0, 0, c.width, c.height);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
bootstrap_visualselector();
|
||||||
|
|
||||||
|
var current_selected_i;
|
||||||
|
var state_clicked=false;
|
||||||
|
|
||||||
|
var c;
|
||||||
|
|
||||||
|
// greyed out fill context
|
||||||
|
var xctx;
|
||||||
|
// redline highlight context
|
||||||
|
var ctx;
|
||||||
|
|
||||||
|
var current_default_xpath;
|
||||||
|
var x_scale=1;
|
||||||
|
var y_scale=1;
|
||||||
|
var selector_image;
|
||||||
|
var selector_image_rect;
|
||||||
|
var vh;
|
||||||
|
var selector_data;
|
||||||
|
|
||||||
|
|
||||||
|
function bootstrap_visualselector() {
|
||||||
|
if ( 1 ) {
|
||||||
|
// bootstrap it, this will trigger everything else
|
||||||
|
$("img#selector-background").bind('load', function () {
|
||||||
|
console.log("Loaded background...");
|
||||||
|
c = document.getElementById("selector-canvas");
|
||||||
|
// greyed out fill context
|
||||||
|
xctx = c.getContext("2d");
|
||||||
|
// redline highlight context
|
||||||
|
ctx = c.getContext("2d");
|
||||||
|
current_default_xpath =$("#css_filter").val();
|
||||||
|
fetch_data();
|
||||||
|
$('#selector-canvas').off("mousemove");
|
||||||
|
// screenshot_url defined in the edit.html template
|
||||||
|
}).attr("src", screenshot_url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function fetch_data() {
|
||||||
|
// Image is ready
|
||||||
|
$('.fetching-update-notice').html("Fetching element data..");
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
url: watch_visual_selector_data_url,
|
||||||
|
context: document.body
|
||||||
|
}).done(function (data) {
|
||||||
|
$('.fetching-update-notice').html("Rendering..");
|
||||||
|
selector_data = data;
|
||||||
|
console.log("Reported browser width from backend: "+data['browser_width']);
|
||||||
|
state_clicked=false;
|
||||||
|
set_scale();
|
||||||
|
reflow_selector();
|
||||||
|
$('.fetching-update-notice').fadeOut();
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function set_scale() {
|
||||||
|
|
||||||
|
// some things to check if the scaling doesnt work
|
||||||
|
// - that the widths/sizes really are about the actual screen size cat elements.json |grep -o width......|sort|uniq
|
||||||
|
selector_image = $("img#selector-background")[0];
|
||||||
|
selector_image_rect = selector_image.getBoundingClientRect();
|
||||||
|
|
||||||
|
// make the canvas the same size as the image
|
||||||
|
$('#selector-canvas').attr('height', selector_image_rect.height);
|
||||||
|
$('#selector-canvas').attr('width', selector_image_rect.width);
|
||||||
|
$('#selector-wrapper').attr('width', selector_image_rect.width);
|
||||||
|
x_scale = selector_image_rect.width / selector_data['browser_width'];
|
||||||
|
y_scale = selector_image_rect.height / selector_image.naturalHeight;
|
||||||
|
ctx.strokeStyle = 'rgba(255,0,0, 0.9)';
|
||||||
|
ctx.fillStyle = 'rgba(255,0,0, 0.1)';
|
||||||
|
ctx.lineWidth = 3;
|
||||||
|
console.log("scaling set x: "+x_scale+" by y:"+y_scale);
|
||||||
|
$("#selector-current-xpath").css('max-width', selector_image_rect.width);
|
||||||
|
}
|
||||||
|
|
||||||
|
function reflow_selector() {
|
||||||
|
$(window).resize(function() {
|
||||||
|
set_scale();
|
||||||
|
highlight_current_selected_i();
|
||||||
|
});
|
||||||
|
var selector_currnt_xpath_text=$("#selector-current-xpath span");
|
||||||
|
|
||||||
|
set_scale();
|
||||||
|
|
||||||
|
console.log(selector_data['size_pos'].length + " selectors found");
|
||||||
|
|
||||||
|
// highlight the default one if we can find it in the xPath list
|
||||||
|
// or the xpath matches the default one
|
||||||
|
found = false;
|
||||||
|
if(current_default_xpath.length) {
|
||||||
|
for (var i = selector_data['size_pos'].length; i!==0; i--) {
|
||||||
|
var sel = selector_data['size_pos'][i-1];
|
||||||
|
if(selector_data['size_pos'][i - 1].xpath == current_default_xpath) {
|
||||||
|
console.log("highlighting "+current_default_xpath);
|
||||||
|
current_selected_i = i-1;
|
||||||
|
highlight_current_selected_i();
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!found) {
|
||||||
|
alert("unfortunately your existing CSS/xPath Filter was no longer found!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$('#selector-canvas').bind('mousemove', function (e) {
|
||||||
|
if(state_clicked) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ctx.clearRect(0, 0, c.width, c.height);
|
||||||
|
current_selected_i=null;
|
||||||
|
|
||||||
|
// Reverse order - the most specific one should be deeper/"laster"
|
||||||
|
// Basically, find the most 'deepest'
|
||||||
|
var found=0;
|
||||||
|
ctx.fillStyle = 'rgba(205,0,0,0.35)';
|
||||||
|
for (var i = selector_data['size_pos'].length; i!==0; i--) {
|
||||||
|
// draw all of them? let them choose somehow?
|
||||||
|
var sel = selector_data['size_pos'][i-1];
|
||||||
|
// If we are in a bounding-box
|
||||||
|
if (e.offsetY > sel.top * y_scale && e.offsetY < sel.top * y_scale + sel.height * y_scale
|
||||||
|
&&
|
||||||
|
e.offsetX > sel.left * y_scale && e.offsetX < sel.left * y_scale + sel.width * y_scale
|
||||||
|
|
||||||
|
) {
|
||||||
|
|
||||||
|
// FOUND ONE
|
||||||
|
set_current_selected_text(sel.xpath);
|
||||||
|
ctx.strokeRect(sel.left * x_scale, sel.top * y_scale, sel.width * x_scale, sel.height * y_scale);
|
||||||
|
ctx.fillRect(sel.left * x_scale, sel.top * y_scale, sel.width * x_scale, sel.height * y_scale);
|
||||||
|
|
||||||
|
// no need to keep digging
|
||||||
|
// @todo or, O to go out/up, I to go in
|
||||||
|
// or double click to go up/out the selector?
|
||||||
|
current_selected_i=i-1;
|
||||||
|
found+=1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}.debounce(5));
|
||||||
|
|
||||||
|
function set_current_selected_text(s) {
|
||||||
|
selector_currnt_xpath_text[0].innerHTML=s;
|
||||||
|
}
|
||||||
|
|
||||||
|
function highlight_current_selected_i() {
|
||||||
|
if(state_clicked) {
|
||||||
|
state_clicked=false;
|
||||||
|
xctx.clearRect(0,0,c.width, c.height);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var sel = selector_data['size_pos'][current_selected_i];
|
||||||
|
if (sel[0] == '/') {
|
||||||
|
// @todo - not sure just checking / is right
|
||||||
|
$("#css_filter").val('xpath:'+sel.xpath);
|
||||||
|
} else {
|
||||||
|
$("#css_filter").val(sel.xpath);
|
||||||
|
}
|
||||||
|
xctx.fillStyle = 'rgba(205,205,205,0.95)';
|
||||||
|
xctx.strokeStyle = 'rgba(225,0,0,0.9)';
|
||||||
|
xctx.lineWidth = 3;
|
||||||
|
xctx.fillRect(0,0,c.width, c.height);
|
||||||
|
// Clear out what only should be seen (make a clear/clean spot)
|
||||||
|
xctx.clearRect(sel.left * x_scale, sel.top * y_scale, sel.width * x_scale, sel.height * y_scale);
|
||||||
|
xctx.strokeRect(sel.left * x_scale, sel.top * y_scale, sel.width * x_scale, sel.height * y_scale);
|
||||||
|
state_clicked=true;
|
||||||
|
set_current_selected_text(sel.xpath);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$('#selector-canvas').bind('mousedown', function (e) {
|
||||||
|
highlight_current_selected_i();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
"""Tests for the app."""
|
||||||
|
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/python3
|
||||||
|
|
||||||
|
from .. import conftest
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
#!/usr/bin/python3
|
||||||
|
|
||||||
|
import time
|
||||||
|
from flask import url_for
|
||||||
|
from ..util import live_server_setup
|
||||||
|
import logging
|
||||||
|
|
||||||
|
|
||||||
|
def test_fetch_webdriver_content(client, live_server):
|
||||||
|
live_server_setup(live_server)
|
||||||
|
|
||||||
|
#####################
|
||||||
|
res = client.post(
|
||||||
|
url_for("settings_page"),
|
||||||
|
data={"application-empty_pages_are_a_change": "",
|
||||||
|
"requests-time_between_check-minutes": 180,
|
||||||
|
'application-fetch_backend': "html_webdriver"},
|
||||||
|
follow_redirects=True
|
||||||
|
)
|
||||||
|
|
||||||
|
assert b"Settings updated." in res.data
|
||||||
|
|
||||||
|
# Add our URL to the import page
|
||||||
|
res = client.post(
|
||||||
|
url_for("import_page"),
|
||||||
|
data={"urls": "https://changedetection.io/ci-test.html"},
|
||||||
|
follow_redirects=True
|
||||||
|
)
|
||||||
|
|
||||||
|
assert b"1 Imported" in res.data
|
||||||
|
time.sleep(3)
|
||||||
|
attempt = 0
|
||||||
|
while attempt < 20:
|
||||||
|
res = client.get(url_for("index"))
|
||||||
|
if not b'Checking now' in res.data:
|
||||||
|
break
|
||||||
|
logging.getLogger().info("Waiting for check to not say 'Checking now'..")
|
||||||
|
time.sleep(3)
|
||||||
|
attempt += 1
|
||||||
|
|
||||||
|
|
||||||
|
res = client.get(
|
||||||
|
url_for("preview_page", uuid="first"),
|
||||||
|
follow_redirects=True
|
||||||
|
)
|
||||||
|
logging.getLogger().info("Looking for correct fetched HTML (text) from server")
|
||||||
|
|
||||||
|
assert b'cool it works' in res.data
|
||||||
Loading…
Reference in new issue