Compare commits
15 Commits
8395c5c367
...
a3d89a9892
| Author | SHA1 | Date | |
|---|---|---|---|
| a3d89a9892 | |||
| a5bc6225b6 | |||
| 4ac3c76641 | |||
| 96a8fb9566 | |||
| cf56ae8136 | |||
| 738e1af443 | |||
| f71def4542 | |||
| 20c2f44b0c | |||
| 997ee862ed | |||
| b378de8106 | |||
| ed307493b8 | |||
| 2860e4868f | |||
| 0e02ae24bd | |||
| b19482e10d | |||
| d7d3ce039f |
BIN
Assets/Icon.png
Normal file
BIN
Assets/Icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
Assets/Icon.xcf
Normal file
BIN
Assets/Icon.xcf
Normal file
Binary file not shown.
BIN
Assets/Share.png
Normal file
BIN
Assets/Share.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
@@ -128,6 +128,7 @@ DownloadLatestChromium(){
|
||||
IfMsgBox OK, {
|
||||
|
||||
} Else IfMsgBox Cancel, {
|
||||
ToolTip
|
||||
return
|
||||
}
|
||||
|
||||
@@ -153,6 +154,7 @@ DownloadLatestChromium(){
|
||||
|
||||
Process, Close, chromedriver.exe
|
||||
sleep, 5000 ; wait 5 seconds before checking again
|
||||
continue
|
||||
}
|
||||
else,
|
||||
break
|
||||
@@ -309,10 +311,13 @@ DownloadLatestChromium(){
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
MsgBox 0x40,, %Message%
|
||||
|
||||
ChromeFilepath := ; clear out chromefilepath variable in case the path changed
|
||||
|
||||
ToolTip
|
||||
return
|
||||
}
|
||||
|
||||
/*
|
||||
*/
|
||||
|
||||
|
||||
CheckForChromeUpdates(ChromeFilepath := ""){
|
||||
@@ -334,7 +339,6 @@ DownloadLatestChromium(){
|
||||
|
||||
GetInstalledChromeFilepath(){
|
||||
; ChromeFilepath is global variable
|
||||
|
||||
if(ChromeFilepath = ""){
|
||||
|
||||
ChromePortableFilepath = %A_ScriptDir%\Lib\chrome-win64\chrome.exe
|
||||
@@ -351,15 +355,7 @@ DownloadLatestChromium(){
|
||||
SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
}
|
||||
else {
|
||||
MsgBox 0x10, Chromium Portable not Found, Chromium Portable not found. `nPlease make sure it's located at one of the following paths and then try again.`n`n%ChromePortableFilepath% `nOR`n%ChromePortableFilepath2%
|
||||
|
||||
|
||||
; Leave this in for now, but i don't think we will be going to using the system Chrome in the future.
|
||||
; if(FileExist("C:\Program Files (x86)\Google\Chrome\Application\chrome.exe"))
|
||||
; ChromeFilepath = C:\Program Files (x86)\Google\Chrome\Application\chrome.exe
|
||||
|
||||
; if(FileExist("C:\Program Files\Google\Chrome\Application\chrome.exe"))
|
||||
; ChromeFilepath = C:\Program Files\Google\Chrome\Application\chrome.exe
|
||||
MsgBox 0x10, Chrome Not Found, Chrome for Testing not found.`nIf this is your first time running on this computer, please click the "Chrome Up-To-Date" button to download the latest chrome binaries.
|
||||
}
|
||||
}
|
||||
ToolTip
|
||||
|
||||
@@ -137,6 +137,10 @@ CheckDirExistAndCreate(Path){
|
||||
; -------------------------------/CheckDirExistAndCreate-------------------------------
|
||||
|
||||
|
||||
; Script Updates
|
||||
; ------------------------------------------------
|
||||
|
||||
|
||||
|
||||
CheckIfUpdateAvailable(Filepath, CurrentVersion){
|
||||
FileRead, ScriptUpdateContents, %Filepath%
|
||||
@@ -605,6 +609,33 @@ GetDateOrdinalSuffix(D) {
|
||||
|
||||
; OnMsgbox - Custom Msgbox Screens
|
||||
;------------------------------------------------
|
||||
|
||||
ConfirmBeforeSubmitMsgboxFunc(){
|
||||
/*
|
||||
; Snippet to for check:
|
||||
if (ConfirmBeforeSubmit && ConfirmBeforeSubmitMsgboxFunc() != true) {
|
||||
Message = User Selected STOP button when asked for confirmation. Cancelling Rest of Site Upload.
|
||||
SaveOrPostProgress(Message:=Message, PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||
return
|
||||
}
|
||||
*/
|
||||
OnMessage(0x44, "OnMsgBoxUserConfirmation")
|
||||
MsgBox 0x21, User Confirmation, Please check that all data was input correctly and fix any mistakes and then click PROCEED to finalize the Upload.`n`nClick STOP to cancel the rest of this Upload and move on to the next website.
|
||||
OnMessage(0x44, "")
|
||||
IfMsgBox OK, {
|
||||
return true
|
||||
} Else IfMsgBox Cancel, {
|
||||
Message = User Selected STOP button when asked for confirmation. Cancelling Rest of Site Upload.
|
||||
Return %Message%
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
OnMsgBoxUpdateAvailable() {
|
||||
DetectHiddenWindows, On
|
||||
Process, Exist
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
Function Libraries used in the following Projects:
|
||||
- [Freedomain Social Media Poster](https://freedomain.dev/yuriy/social-media-poster)
|
||||
- [Freedomain Video Uploader](https://freedomain.dev/yuriy/video-uploader)
|
||||
- [Freedomain Clips Uploader](https://freedomain.dev/yuriy/clips-uploader)
|
||||
- [Freedomain Livestream Scheduler](https://freedomain.dev/yuriy/livestream-scheduler)
|
||||
@@ -721,21 +721,27 @@ Selenium_LoopToSendValueByName(ElementName,NumOfLoops:=1,SleepLength:=1000,Strin
|
||||
}
|
||||
|
||||
Selenium_LoopToSendValueToXpath(Xpath,NumOfLoops:=1,SleepLength:=1000,StringTextContent:="",ClearElement:=0){
|
||||
; Msgbox % "StringTextContent: " StringTextContent
|
||||
; Msgbox % "ClearElement: " ClearElement
|
||||
|
||||
loop, %NumOfLoops% {
|
||||
; msgbox % ClearElement
|
||||
|
||||
if(ClearElement){
|
||||
Loop, 3 { ; have to do it multiple times to make it trigger properly
|
||||
Loop, 3 { ; sometimes have to do it multiple times to make it trigger properly
|
||||
Try PreviousValue := driver.findelementbyxpath(Xpath).Attribute("value") ;Xpath Value
|
||||
|
||||
try, driver.FindElementByXPath(Xpath).clear()
|
||||
sleep, 500
|
||||
|
||||
Try CurrentValue := driver.findelementbyxpath(Xpath).Attribute("value") ;Xpath Value
|
||||
|
||||
if(PreviousValue != CurrentValue){
|
||||
break
|
||||
}
|
||||
|
||||
sleep, 1000
|
||||
; msgbox
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
; ToolTip, Loop attempt: %A_index%
|
||||
try driver.FindElementByXPath(Xpath).sendKeys(StringTextContent) ; Click on "upload image" button
|
||||
try driver.FindElementByXPath(Xpath).sendKeys(StringTextContent) ; Input Text
|
||||
catch e {
|
||||
if(A_index = NumOfLoops){
|
||||
Return "Failed"
|
||||
@@ -790,17 +796,27 @@ Selenium_LoopToClickXpathAndWaitForOpenWindow(Xpath,NumOfLoops:=1,SleepLength:=1
|
||||
}
|
||||
|
||||
|
||||
Selenium_LoopToClearXpath(Xpath,NumOfLoops:=1,SleepLength:=1000){
|
||||
loop, %NumOfLoops% {
|
||||
Selenium_LoopToClearXpath(Xpath,NumberOfAttemps:=1,SleepLength:=1000){
|
||||
loop, %NumberOfAttemps% {
|
||||
|
||||
try driver.FindElementByXPath(Xpath).clear()
|
||||
catch e {
|
||||
if(A_index = NumOfLoops){
|
||||
Return "Failed"
|
||||
}
|
||||
|
||||
sleep, %SleepLength%
|
||||
Continue
|
||||
|
||||
try, InerText := driver.findelementbyxpath(Xpath).Attribute("value")
|
||||
; Msgbox % "InerText: " InerText
|
||||
if(InerText = "")
|
||||
return
|
||||
|
||||
if(A_index = NumberOfAttemps){
|
||||
return "Failed after %NumberOfAttemps"
|
||||
}
|
||||
Return
|
||||
|
||||
Continue
|
||||
; Return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
105
Shared-GoTos.ahk
Normal file
105
Shared-GoTos.ahk
Normal file
@@ -0,0 +1,105 @@
|
||||
; This #include needs to be at the bottom of the parent script
|
||||
|
||||
|
||||
CheckForUpdates:
|
||||
; The GUI buttons must have variable set to vUpdateAvailable and vChromeUpdateAvailable for button to get updated
|
||||
|
||||
; The following variables need to be set in the parent script
|
||||
; GitReleasesAPIURL
|
||||
; ChromeFilepath
|
||||
|
||||
; Message = Checking for Updates
|
||||
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
|
||||
|
||||
if(CheckForUpdates(GitReleasesAPIURL)){
|
||||
GuiControl,,UpdateAvailable, %ScriptAbbreviatedName% Update Available!
|
||||
}
|
||||
|
||||
if(CheckForChromeUpdates(ChromeFilepath)){
|
||||
GuiControl,,ChromeUpdateAvailable, Chrome Update Available!
|
||||
; ChromeUpdateAvailable := 1
|
||||
}
|
||||
ToolTip
|
||||
Return
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
UpdateChrome:
|
||||
|
||||
; if chroem doesn't exist, download it
|
||||
if(ChromeFilepath = ""){
|
||||
Status := DownloadLatestChromium()
|
||||
if(Status)
|
||||
GuiControl,,ChromeUpdateAvailable, Chrome Up-To-Date
|
||||
Return
|
||||
}
|
||||
|
||||
if(CheckForChromeUpdates = "")
|
||||
Status := CheckForChromeUpdates(ChromeFilepath)
|
||||
|
||||
if(!status){
|
||||
OnMessage(0x44, "OnMsgBoxConfirmChromiumOverwrite")
|
||||
MsgBox 0x41, Already Up-to-Date, Yor current Chromium version is already up to date. `nDo you want to download and overwrite it?
|
||||
OnMessage(0x44, "")
|
||||
|
||||
IfMsgBox OK, {
|
||||
Return
|
||||
} Else IfMsgBox Cancel, {
|
||||
ToolTip
|
||||
}
|
||||
}
|
||||
|
||||
Status := DownloadLatestChromium()
|
||||
if(Status)
|
||||
GuiControl,,ChromeUpdateAvailable, Chrome Up-To-Date
|
||||
|
||||
Return
|
||||
/*
|
||||
*/
|
||||
|
||||
|
||||
|
||||
PasteClipboardToEditBox:
|
||||
if(A_GuiControl = "PasteClipboardToSMPBody"){
|
||||
GuiControl,,PostBody, %Clipboard%
|
||||
}
|
||||
|
||||
if(A_GuiControl = "PasteClipboardToSMPTitle"){
|
||||
GuiControl,,PostTitle, %Clipboard%
|
||||
}
|
||||
|
||||
if(A_GuiControl = "PasteClipboardToFLSTitle"){
|
||||
GuiControl,,LivestreamTitle, %Clipboard%
|
||||
}
|
||||
|
||||
if(A_GuiControl = "PasteClipboardToFLSDescription"){
|
||||
GuiControl,,LivestreamDescription, %Clipboard%
|
||||
}
|
||||
|
||||
if(A_GuiControl = "PasteClipboardToFLSTags"){
|
||||
GuiControl,,LivestreamTags, %Clipboard%
|
||||
}
|
||||
|
||||
|
||||
Return
|
||||
|
||||
OpenErrorLog:
|
||||
run, %ErrorLoggingFilePath%
|
||||
Return
|
||||
|
||||
OpenGiteaPage:
|
||||
if(ScriptAbbreviatedName = "FLS")
|
||||
URL = https://freedomain.dev/yuriy/livestream-scheduler
|
||||
|
||||
if(ScriptAbbreviatedName = "FVU")
|
||||
URL = https://freedomain.dev/yuriy/video-uploader
|
||||
|
||||
if(ScriptAbbreviatedName = "FSMP")
|
||||
URL = https://freedomain.dev/yuriy/social-media-poster
|
||||
|
||||
|
||||
run, %URL%
|
||||
Return
|
||||
1
Update-Functions.ahk
Normal file
1
Update-Functions.ahk
Normal file
@@ -0,0 +1 @@
|
||||
; Code migrated to Shared-GoTo's
|
||||
Reference in New Issue
Block a user