icd/screenshot-service
2
0
Fork 1
Code Issues 18 Pull Requests Projects 1 Releases Wiki Activity

Avoid displaying "hl=pl" in current_action

Browse Source
This commit is contained in:
Kuba Orlik 2022-07-11 15:24:14 +02:00
parent 7c1d776c5f
commit 4b9993a8d3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Docker/run-analysis.sh
View File

@ -29,7 +29,7 @@ ORIGIN_DOMAIN=$(sed -e 's/[^/]*\/\/\([^@]*@\)\?\([^:/]*\).*/\2/' <<< "$URL")
while IFS= read -r DOMAIN; do while IFS= read -r DOMAIN; do
load_website "$DOMAIN?hl=pl" load_website "$DOMAIN?hl=pl" "$DOMAIN"
open_console open_console
grab "$DOMAIN before" grab "$DOMAIN before"
(tr '\n' ' ' < click-accept-all.js) | xclip -sel clip (tr '\n' ' ' < click-accept-all.js) | xclip -sel clip
@ -42,7 +42,7 @@ done <<< "$DOMAINS"
click 1270 217 # the "trash" icon, so requests from plamienie don't appear in the screenshots click 1270 217 # the "trash" icon, so requests from plamienie don't appear in the screenshots
load_website "$URL" load_website "$URL" "$URL"
echo "{\"current_action\": \"Strona wczytana\"}" echo "{\"current_action\": \"Strona wczytana\"}"
grab load_website grab load_website
open_network_inspector open_network_inspector

3
Docker/utils.sh
View File

@ -158,6 +158,7 @@ wait_for_website_to_load(){
load_website(){ load_website(){
WEBSITE_URL=$1 WEBSITE_URL=$1
WEBSITE_NAME=$2
keycombo Control_L l keycombo Control_L l
grab ctrl+l grab ctrl+l
quicktype "$WEBSITE_URL" quicktype "$WEBSITE_URL"
@ -166,7 +167,7 @@ load_website(){
xdotool key Return xdotool key Return
grab enter grab enter
sleep 1 sleep 1
echo "{\"current_action\": \"Wczytywanie strony $WEBSITE_URL...\"}" echo "{\"current_action\": \"Wczytywanie strony $WEBSITE_NAME...\"}"
wait_for_website_to_load wait_for_website_to_load
sleep 0.3 sleep 0.3
wait_for_website_to_load wait_for_website_to_load