Moved all third party libs to Shared Functions submodule, fixed Brighteo login check

This commit is contained in:
2023-02-28 00:59:45 -05:00
parent f7b4a9e04c
commit 7a27fa82b7
7 changed files with 25 additions and 918 deletions

View File

@@ -29,7 +29,7 @@ global ScriptVersion
global FullScriptName
ScriptName = Freedomain Video Uploader
ScriptVersion = 3.13
ScriptVersion = 3.14
FullScriptName := ScriptName . " - " . ScriptVersion
@@ -2458,7 +2458,9 @@ Return
;--------------LocalsGrabURL----------------------------------
LocalsGrabURL:
SaveOrPostProgress(Message:="Navigating to Locals Feed to grab URL",PostType:="Tooltip,ErrorLoggingTextFile")
CurrentSite := Locals
SaveOrPostProgress(Message:="Navigating to Locals Feed to grab URL",PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
IniRead, LocalsPostPageURL, %SettingsIniFilepath%, General, LocalsPostPageURL, %A_Space%
@@ -3278,23 +3280,26 @@ Loop, %Number_of_loops_to_Check_Upload_status% {
if(AutoLogin){
Message = Trying to Log Back In
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile, DiscordErrorLogging")
js = return document.querySelector("input[placeholder='username/email']").value;
status := try driver.executeScript(JS) ;Execute Javascript
; js = return document.querySelector("input[placeholder='username/email']").value;
; status := try driver.executeScript(JS) ;Execute Javascript
if(StrLen(Status) > 0){
; sleep, 5000
; Msgbox % "status: " status
; if(StrLen(Status) > 0){
; msgbox, clicking login button
Xpath = //a[normalize-space()='Log In'] ; click login button
Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=6,SleepLength:=1000)
Xpath = //a[normalize-space()='Log In'] ; click login button at top right of page
Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
sleep, 2000
; sleep, 2000
Xpath = //button[@type='submit'] ; click login button on login page
Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=6,SleepLength:=1000)
try driver.executeScript("return document.readyState").equals("complete")
sleep, 2000
}
; }
}
@@ -3316,6 +3321,10 @@ try driver.executeScript("window.location = 'https://www.brighteon.com/dashboard
try driver.executeScript("return document.readyState").equals("complete")
try, TabURL := driver.url
Message = Current Tab URL: %TabURL%
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
; Click out of the "Support free speech" pop-up if it pops up
Xpath = //body/div[@id='__next']/div[@id='modal-root']/div/div/div[1]//*[local-name()='svg']
try driver.FindElementByXPath(Xpath).click()
@@ -4876,10 +4885,10 @@ Return
; -------------------------------Functions-------------------------------
; Included Files
#include %A_ScriptDir%\Lib\StdOutToVar.ahk ; used for chrome debugging mode connection
#Include %A_ScriptDir%\Lib\\Freedomain-Posters-Shared-Functions\Freedomain-Posters-Shared-Functions.ahk
#Include %A_ScriptDir%\Lib\JSON.ahk
#Include %A_ScriptDir%\Lib\\RunCMD.ahk
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\StdOutToVar.ahk ; used for chrome debugging mode connection
#Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Freedomain-Posters-Shared-Functions.ahk
#Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\JSON.ahk
#Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\RunCMD.ahk
; #Include %A_ScriptDir%\Lib\ChromeAutomationFunctions.ahk