From 4b9993a8d3f45da052d88669d3179e47ecc04b49 Mon Sep 17 00:00:00 2001 From: Kuba Orlik Date: Mon, 11 Jul 2022 15:24:14 +0200 Subject: [PATCH] Avoid displaying "hl=pl" in current_action --- Docker/run-analysis.sh | 4 ++-- Docker/utils.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Docker/run-analysis.sh b/Docker/run-analysis.sh index 281d716..ce4280e 100755 --- a/Docker/run-analysis.sh +++ b/Docker/run-analysis.sh @@ -29,7 +29,7 @@ ORIGIN_DOMAIN=$(sed -e 's/[^/]*\/\/\([^@]*@\)\?\([^:/]*\).*/\2/' <<< "$URL") while IFS= read -r DOMAIN; do - load_website "$DOMAIN?hl=pl" + load_website "$DOMAIN?hl=pl" "$DOMAIN" open_console grab "$DOMAIN before" (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 -load_website "$URL" +load_website "$URL" "$URL" echo "{\"current_action\": \"Strona wczytana\"}" grab load_website open_network_inspector diff --git a/Docker/utils.sh b/Docker/utils.sh index 7486910..c790574 100644 --- a/Docker/utils.sh +++ b/Docker/utils.sh @@ -158,6 +158,7 @@ wait_for_website_to_load(){ load_website(){ WEBSITE_URL=$1 + WEBSITE_NAME=$2 keycombo Control_L l grab ctrl+l quicktype "$WEBSITE_URL" @@ -166,7 +167,7 @@ load_website(){ xdotool key Return grab enter sleep 1 - echo "{\"current_action\": \"Wczytywanie strony $WEBSITE_URL...\"}" + echo "{\"current_action\": \"Wczytywanie strony $WEBSITE_NAME...\"}" wait_for_website_to_load sleep 0.3 wait_for_website_to_load