Merge pull request #13 from wjxway/master

Add new functionality

Author: arnoudbuzing

WebTools/WebDriver/FirefoxDriver/Windows-x86-64/geckodriver.exe

@@ -6,6 +6,7 @@
 setsession["Chrome"] := ($wtCurrentWebSession = post["/session", {"desiredCapabilities" -> {"browserName" -> "chrome"}}, "sessionId"]);
 setsession["InternetExplorer"] := ($wtCurrentWebSession = post["/session", {"desiredCapabilities" -> {"browserName" -> "internet explorer"}}, "sessionId"]);
 setsession["Edge"] := ($wtCurrentWebSession = post["/session", {"desiredCapabilities" -> {}, "requiredCapabilities"->{}}, "sessionId"]);
+setsession["Firefox"] := ($wtCurrentWebSession = post["/session", {"desiredCapabilities" -> {"browserName" -> "firefox"}}, "sessionId"]);
 getsession[sessionId_] := get["/session/" <> sessionId];
 
 forward[] := forward[$wtCurrentWebSession];

WebTools/WebDriverAPI.m

@@ -1,3 +1,5 @@
+(* ::Package:: *)
+
 BeginPackage["WebTools`", {"CloudObject`", "CURLLink`"}];
 
 wtInstallWebTools::usage = "wtInstallWebTools[] launches the default web driver which allows Mathematica to communicate with a web browser. wtInstallWebTools[driver] launches the specified driver.";
@@ -42,11 +44,20 @@
 wtTagName::usage = "";
 wtXPath::usage = "";
 
+wtSelector::usage="";
+
 $wtWebDriver::usage = "";
 $wtWebDriverBaseURL::usage = "";
 (* Javascript based functions *)
 
-wtGetPageHtml::usage = "";
+wtGetPageHtml::usage = "Get HTML of current tab.";
+
+wtGetHtml::usage = "Get part of HTML of current tab, search method include wtId[], wtXPath and wtSelector[].
+Option \"Seletion\" could be set to \"inner\" or \"outer\" which control the returned part of the selected HTML segment.";
+
+wtGetPageURL::usage = "Get URL of current tab.";
+
+wtOffAlert::usage = "wtOffAlert[] would turn off all bump up windows including alerts(), confirm() and prompt() and automatically confirm them."
 
 Begin["`Private`"];
 
@@ -76,7 +87,7 @@
 wtCaptureWebPage[x___] := screenshot[x];
 
 $wtSupportedWebDrivers = Switch[ $SystemID ,
-	"Windows-x86-64", {"ChromeDriver","InternetExplorerDriver","MicrosoftWebDriver"},
+	"Windows-x86-64", {"ChromeDriver","InternetExplorerDriver","MicrosoftWebDriver","FirefoxDriver"},
 	"MacOSX-x86-64", {"ChromeDriver"},
 	_, {}
 ];
@@ -89,6 +100,7 @@
 		"ChromeDriver", {"Chrome","http://localhost:9515"},
 		"InternetExplorerDriver", {"InternetExplorer","http://localhost:5555"},
 		"MicrosoftWebDriver", {"Edge", "http://localhost:17556"},
+		"FirefoxDriver", {"Firefox", "http://localhost:4444"},
 		_, Null ];
 	If[ TimeConstrained[URLRead[$wtWebDriverBaseURL<>"/status"],0.5] === $Aborted, (* only launch driver if not running *)
 		dir = FileNameJoin[{ $WebToolsDirectory, "WebDriver", driver, $SystemID }];
@@ -113,7 +125,7 @@
 				],
 			"FirefoxDriver",
 				Switch[ $SystemID,
-					"Windows-x86-64", Null,
+					"Windows-x86-64", StartProcess[FileNameJoin[{dir,"geckodriver.exe"}]],
 					"MacOSX-x86-64", Null,
 					_, Null
 				],
@@ -134,8 +146,8 @@
 
 QueryMethod[ wtElementClassName[_String] ] ^:= "class name";
 QueryMethod[ wtCssSelector[_String] ] ^:= "css selector";
-QueryMethod[ Id[_String] ] ^:= "id";
-QueryMethod[ Name[_String] ] ^:= "name";
+QueryMethod[ wtId[_String] ] ^:= "id";
+QueryMethod[ wtName[_String] ] ^:= "name";
 QueryMethod[ wtLinkText[_String] ] ^:= "link text";
 QueryMethod[ wtPartialLinkText[_String] ] ^:= "partial link text";
 QueryMethod[ wtTagName[_String] ] ^:= "tag name";
@@ -248,7 +260,19 @@
 
 wtGetPageHtml[] := wtJavascriptExecute["return document.getElementsBywtTagName('html')[0].innerHTML;"]
 
-GetHtmlForId[id_String] := wtJavascriptExecute[ "return document.getElementById('" <> id <> "').innerHTML;"]
+(*Get part of HTML*)
+Options[wtGetHtml]={"Selection"->"outer"};
+
+wtGetHtml[] := wtGetPageHtml[]
+wtGetHtml[wtSelector[sel_String],OptionsPattern[]] := wtJavascriptExecute[ "return document.querySelector('" <> sel <> "')."<>OptionValue["Selection"]<>"HTML;"]
+wtGetHtml[wtXPath[xp_String],OptionsPattern[]] := wtJavascriptExecute["document.evaluate('"<>xp<>"', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue."<>OptionValue["Selection"]<>"HTML;"]
+wtGetHtml[wtId[id_String],OptionsPattern[]] := wtJavascriptExecute["return document.getElementById('" <> id <> "')."<>OptionValue["Selection"]<>"HTML;"]
+
+(*Get Current URL*)
+wtGetPageURL[]:=wtJavascriptExecute["return window.location.href;"]
+
+(*Turn off all alerts! They are annoying*)
+wtOffAlert[]:=wtJavascriptExecute[ "window.alert=function(){return 1}; window.confirm=function(){return 1}; window.prompt=function(){return 1};"]
 
 End[];