Updated README

Updated urlwatcher and screenshot script to use new element arguments

Author: iComputerfreak

README.md

@@ -11,6 +11,8 @@ Lists all commands and their descriptions
 Lists all entries including their areas  
 `/listurls`  
 Lists all entries including their websites  
+`/info <name>`  
+Shows more information about a specific entry  
 `/myid`  
 Returns your User ID  
 `/add <name> <URL> [x y width height]`  
@@ -21,8 +23,12 @@ Removes an entry from the list
 Updates the screenshot area of an entry  
 `/setdelay <name> <delay>`  
 Specifies a delay in seconds to wait after the website has been loaded  
-`/setelement <name> [html element]`  
+`/setcaptureelement <name> [html element]`  
 Specifies which HTML element to capture  
+`/setclickelement <name> [html element]`  
+Specifies which HTML element to click before taking the screenshot  
+`/setwaitelement <name> [html element]`  
+Specifies which HTML element to wait for before taking the screenshot  
 `/fetch <name>`  
 Takes a screenshot with the stored settings and sends it into this chat  
 `/fetchurl <URL> [x y width height]`  

tools/screenshot.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-# Arguments: URL, File, Delay, Element
+# Arguments: URL, File, Delay, CaptureElement, ClickElement, WaitElement
 
-capture-website "$1" --output="$2" --overwrite --full-page --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.50 Safari/537.36" --delay="$3" --element="$4"
+capture-website "$1" --output="$2" --overwrite --full-page --user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.50 Safari/537.36" --delay="$3" --element="$4" --click-element="$5" --wait-for-element="$6"

urlwatcher/urlwatcher.sh

@@ -67,14 +67,16 @@ function reportNew {
 function takeScreenshot {
     local URL="$1"
     local DELAY="$2"
-    local ELEMENT="$3"
-    "$SCREENSHOT_SCRIPT" "$URL" latest.png "$DELAY" "$ELEMENT"
+    local CAPTURE_ELEMENT="$3"
+    local CLICK_ELEMENT="$4"
+    local WAIT_ELEMENT="$5"
+    "$SCREENSHOT_SCRIPT" "$URL" latest.png "$DELAY" "$CAPTURE_ELEMENT" "$CLICK_ELEMENT" "$WAIT_ELEMENT"
 
     # On Error, retry once
     if [ ! -f latest.png ]; then
         echo "Error taking screenshot. Retrying..."
 	    sleep 0.2
-        "$SCREENSHOT_SCRIPT" "$URL" latest.png "$DELAY" "$ELEMENT"
+        "$SCREENSHOT_SCRIPT" "$URL" latest.png "$DELAY" "$CAPTURE_ELEMENT" "$CLICK_ELEMENT" "$WAIT_ELEMENT"
     fi
 }
 
@@ -119,7 +121,7 @@ function screenshotsMatch {
         # We first have to delete the changed screenshot (otherwise we cannot confirm that taking the second screenshot was a success)
         rm -f latest.png
         sleep 1
-        takeScreenshot "$URL" "$DELAY" "$ELEMENT"
+        takeScreenshot "$URL" "$DELAY" "$CAPTURE_ELEMENT" "$CLICK_ELEMENT" "$WAIT_ELEMENT"
         # If no luck taking the second screenshot, abort
         if [ ! -f latest.png ]; then
             # Roll back the screenshot and report an error
@@ -165,12 +167,14 @@ while IFS='' read -r line || [ -n "${line}" ]; do
     WIDTH=$(echo $line | cut -d ',' -f4)
     HEIGHT=$(echo $line | cut -d ',' -f5)
     DELAY=$(echo $line | cut -d ',' -f6)
-    ELEMENT=$(echo $line | cut -d ',' -f7)
-    CHAT_ID=$(echo $line | cut -d ',' -f8)
-    URL=$(echo $line | cut -d ',' -f9-)
+    CAPTURE_ELEMENT=$(echo $line | cut -d ',' -f7)
+    CLICK_ELEMENT=$(echo $line | cut -d ',' -f8)
+    WAIT_ELEMENT=$(echo $line | cut -d ',' -f9)
+    CHAT_ID=$(echo $line | cut -d ',' -f10)
+    URL=$(echo $line | cut -d ',' -f11-)
 
     echo "Checking $URL"
-    
+
     # As image directory, we use the name and chat id to create unique directories
 
     # Create the image directory, if it does not exist yet
@@ -191,7 +195,7 @@ while IFS='' read -r line || [ -n "${line}" ]; do
     #######################
 
     # Take the screenshot
-    takeScreenshot "$URL" "$DELAY" "$ELEMENT"
+    takeScreenshot "$URL" "$DELAY" "$CAPTURE_ELEMENT" "$CLICK_ELEMENT" "$WAIT_ELEMENT"
 
     # If no luck taking the screenshot, abort
     if [ ! -f latest.png ]; then