fixed broken function, bit o' organization
This commit is contained in:
@@ -375,19 +375,6 @@ Return Var
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; OnMsgbox Functions
|
|
||||||
;------------------------------------------------
|
|
||||||
OnMsgBoxUpdateAvailable() {
|
|
||||||
DetectHiddenWindows, On
|
|
||||||
Process, Exist
|
|
||||||
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
|
||||||
ControlSetText Button1, Cancel
|
|
||||||
ControlSetText Button2, Install
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
SaveCurrentChromeVersionToIniFile(){
|
SaveCurrentChromeVersionToIniFile(){
|
||||||
|
|
||||||
if(InstalledChromeVersion = "")
|
if(InstalledChromeVersion = "")
|
||||||
@@ -427,14 +414,7 @@ HasSubstringVal(haystack, needle)
|
|||||||
|
|
||||||
; -------------------------------Functions-------------------------------
|
; -------------------------------Functions-------------------------------
|
||||||
|
|
||||||
OnMsgBoxConfirmChromiumOverwrite() {
|
|
||||||
DetectHiddenWindows, On
|
|
||||||
Process, Exist
|
|
||||||
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
|
||||||
ControlSetText Button1, Cancel
|
|
||||||
ControlSetText Button2, Yes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
; https://www.autohotkey.com/docs/v2/Functions.htm#Variadic
|
; https://www.autohotkey.com/docs/v2/Functions.htm#Variadic
|
||||||
Join(sep, params*) {
|
Join(sep, params*) {
|
||||||
@@ -477,23 +457,6 @@ AddToTotalVideosUploadedCount(){
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
OnMsgBoxPodcastFinish() {
|
|
||||||
DetectHiddenWindows, On
|
|
||||||
Process, Exist
|
|
||||||
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
|
||||||
WinMove,, 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OnMsgBoxSocialMediaPoster() {
|
|
||||||
DetectHiddenWindows, On
|
|
||||||
Process, Exist
|
|
||||||
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
|
||||||
ControlSetText Button1, Yes
|
|
||||||
ControlSetText Button2, Not Now
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Check_For_Stuck_Video_Upload(Index_Number, Upload_Status){
|
Check_For_Stuck_Video_Upload(Index_Number, Upload_Status){
|
||||||
@@ -616,8 +579,6 @@ CreateErrorLoggingFiles(Directory := ""){
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; if passed argument is .exe file, then script has just been updated and we need to delete the old .exe file
|
; if passed argument is .exe file, then script has just been updated and we need to delete the old .exe file
|
||||||
CheckIfUpdateInstalled(PassedInArgument :=""){
|
CheckIfUpdateInstalled(PassedInArgument :=""){
|
||||||
|
|
||||||
@@ -632,3 +593,57 @@ CheckIfUpdateInstalled(PassedInArgument :=""){
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; OnMsgbox - Custom Msgbox Screens
|
||||||
|
;------------------------------------------------
|
||||||
|
OnMsgBoxUpdateAvailable() {
|
||||||
|
DetectHiddenWindows, On
|
||||||
|
Process, Exist
|
||||||
|
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
||||||
|
ControlSetText Button1, Cancel
|
||||||
|
ControlSetText Button2, Install
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
; Show a user confirmation msgbox with a PROCEED and STOP buttons
|
||||||
|
; Used by the "Confirm before Submit" checkbox
|
||||||
|
OnMsgBoxUserConfirmation() {
|
||||||
|
DetectHiddenWindows, On
|
||||||
|
Process, Exist
|
||||||
|
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
||||||
|
ControlSetText Button1, PROCEED
|
||||||
|
ControlSetText Button2, STOP
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
OnMsgBoxConfirmChromiumOverwrite() {
|
||||||
|
DetectHiddenWindows, On
|
||||||
|
Process, Exist
|
||||||
|
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
||||||
|
ControlSetText Button1, Cancel
|
||||||
|
ControlSetText Button2, Yes
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
OnMsgBoxPodcastFinish() {
|
||||||
|
DetectHiddenWindows, On
|
||||||
|
Process, Exist
|
||||||
|
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
||||||
|
WinMove,, 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
OnMsgBoxSocialMediaPoster() {
|
||||||
|
DetectHiddenWindows, On
|
||||||
|
Process, Exist
|
||||||
|
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
||||||
|
ControlSetText Button1, Yes
|
||||||
|
ControlSetText Button2, Not Now
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -722,7 +722,7 @@ Selenium_LoopToSendValueByName(ElementName,NumOfLoops:=1,SleepLength:=1000,Strin
|
|||||||
|
|
||||||
Selenium_LoopToSendValueToXpath(Xpath,NumOfLoops:=1,SleepLength:=1000,StringTextContent:="",ClearElement:=0){
|
Selenium_LoopToSendValueToXpath(Xpath,NumOfLoops:=1,SleepLength:=1000,StringTextContent:="",ClearElement:=0){
|
||||||
; Msgbox % "StringTextContent: " StringTextContent
|
; Msgbox % "StringTextContent: " StringTextContent
|
||||||
; Msgbox % "ClearElement: " ClearElement
|
; Msgbox % "ClearElement: " ClearElement
|
||||||
|
|
||||||
loop, %NumOfLoops% {
|
loop, %NumOfLoops% {
|
||||||
; msgbox % ClearElement
|
; msgbox % ClearElement
|
||||||
@@ -834,26 +834,26 @@ SaveDriverURLOFErrorPage(){ ; save the url of the result page. That way if a tab
|
|||||||
|
|
||||||
GetHTMLValueFromXpathOuterHTML(XPATH, HTMLElementName){
|
GetHTMLValueFromXpathOuterHTML(XPATH, HTMLElementName){
|
||||||
|
|
||||||
Try ElementOuterHTML := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
Try ElementOuterHTML := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
||||||
; try Clipboard := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
; try Clipboard := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
||||||
; Try MsgBox,,Element OuterHTML: `n, % driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
; Try MsgBox,,Element OuterHTML: `n, % driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
||||||
|
|
||||||
; Match string between quotes following the HTMLELEMENTNAME
|
; Match string between quotes following the HTMLELEMENTNAME
|
||||||
RegexStatement = %HTMLElementName%="([^"]+)"
|
RegexStatement = %HTMLElementName%="([^"]+)"
|
||||||
|
|
||||||
; regexMatch := RegExMatch(ElementOuterHTML, "value=""([^""]+)""", match)
|
; regexMatch := RegExMatch(ElementOuterHTML, "value=""([^""]+)""", match)
|
||||||
regexMatch := RegExMatch(ElementOuterHTML, RegexStatement, match)
|
regexMatch := RegExMatch(ElementOuterHTML, RegexStatement, match)
|
||||||
if (regexMatch)
|
if (regexMatch)
|
||||||
{
|
{
|
||||||
ElementValue := match1
|
ElementValue := match1
|
||||||
; Msgbox % "PostURL: " PostURL
|
; Msgbox % "PostURL: " PostURL
|
||||||
; Message = URL Pulled out from OuterHTML: %PostURL%
|
; Message = URL Pulled out from OuterHTML: %PostURL%
|
||||||
Return ElementValue
|
Return ElementValue
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Message = Failed to Pull out value from OuterHTML
|
Message = Failed to Pull out value from OuterHTML
|
||||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||||
Return "Failed"
|
Return "Failed"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1004,13 +1004,3 @@ OnMsgBoxJSReturnData() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; Show a user confirmation msgbox with a proceed and STOP buttons
|
|
||||||
; Used by the "Confirm before Submit" checkbox
|
|
||||||
OnMsgBoxUserConfirmation() {
|
|
||||||
DetectHiddenWindows, On
|
|
||||||
Process, Exist
|
|
||||||
If (WinExist("ahk_class #32770 ahk_pid " . ErrorLevel)) {
|
|
||||||
ControlSetText Button1, PROCEED
|
|
||||||
ControlSetText Button2, STOP
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user