Compare commits
1 Commits
3.49
...
959a81bf98
| Author | SHA1 | Date | |
|---|---|---|---|
| 959a81bf98 |
@@ -25,7 +25,7 @@ VersionIniFP = %A_ScriptDir%\Version.ini
|
|||||||
|
|
||||||
; Generate a new errorlog text file each run
|
; Generate a new errorlog text file each run
|
||||||
FormatTime, TodayDate , YYYYMMDDHH24MISS, yyyyMMdd_hhmmss
|
FormatTime, TodayDate , YYYYMMDDHH24MISS, yyyyMMdd_hhmmss
|
||||||
ErrorLogTextFile = %A_ScriptDir%\Lib\ErrorLogging\Compiler_%TodayDate%.txt
|
ErrorLogFilepath = %A_ScriptDir%\Lib\ErrorLogging\Compiler_%TodayDate%.txt
|
||||||
|
|
||||||
|
|
||||||
; Read Credential token from Windows Credential Manager using WindowCredentialManager.ahk
|
; Read Credential token from Windows Credential Manager using WindowCredentialManager.ahk
|
||||||
@@ -83,7 +83,7 @@ if(!FileExist(icopath)){
|
|||||||
; run, %comspec% /c ""C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%""
|
; run, %comspec% /c ""C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%""
|
||||||
Command = "C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%"
|
Command = "C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%"
|
||||||
Results := RunCMD(Command)
|
Results := RunCMD(Command)
|
||||||
LogToErrorLogFile(Results, ErrorLogTextFile)
|
LogToErrorLogFile(Results, ErrorLogFilepath)
|
||||||
|
|
||||||
if(!InStr(Results, "Successfully")){
|
if(!InStr(Results, "Successfully")){
|
||||||
Msgbox, Error, Compilation failed with the following error:`n`n%Results%
|
Msgbox, Error, Compilation failed with the following error:`n`n%Results%
|
||||||
@@ -104,10 +104,11 @@ ReleaseTag := VersionNumber
|
|||||||
Command = Powershell "%CreateReleasePS1Filepath%" "%CreateReleaseAPIURL%" "%ReleaseName%" "%ReleaseTag%" "'%ReleaseBody%'"
|
Command = Powershell "%CreateReleasePS1Filepath%" "%CreateReleaseAPIURL%" "%ReleaseName%" "%ReleaseTag%" "'%ReleaseBody%'"
|
||||||
|
|
||||||
Message = PowerShell Command to Create Release:`n%Command%
|
Message = PowerShell Command to Create Release:`n%Command%
|
||||||
LogToErrorLogFile(Message, ErrorLogTextFile)
|
LogToErrorLogFile(Message, ErrorLogFilepath)
|
||||||
|
|
||||||
Results := RunCMD(Command)
|
Results := RunCMD(Command)
|
||||||
LogToErrorLogFile(Results, ErrorLogTextFile)
|
Message = API Returned:`n%Results%
|
||||||
|
LogToErrorLogFile(Message, ErrorLogFilepath)
|
||||||
|
|
||||||
|
|
||||||
; Pull out the release ID Number, needed for attaching a file to the release
|
; Pull out the release ID Number, needed for attaching a file to the release
|
||||||
@@ -116,8 +117,15 @@ SplitText2 = `;
|
|||||||
ReleaseID := StrSplit(Results, SplitText)[2]
|
ReleaseID := StrSplit(Results, SplitText)[2]
|
||||||
ReleaseID := StrSplit(ReleaseID, SplitText2)[1]
|
ReleaseID := StrSplit(ReleaseID, SplitText2)[1]
|
||||||
|
|
||||||
|
if(ReleaseID = ""){
|
||||||
|
Message = Failed to Grab Release ID`nPlease See Errorlog for Details:`n%ErrorLogFilepath%
|
||||||
|
LogToErrorLogFile(Message, ErrorLogFilepath)
|
||||||
|
Msgbox, %Message%
|
||||||
|
Return
|
||||||
|
}
|
||||||
|
|
||||||
Message = ReleaseID: %ReleaseID%
|
Message = ReleaseID: %ReleaseID%
|
||||||
LogToErrorLogFile(Message, ErrorLogTextFile)
|
LogToErrorLogFile(Message, ErrorLogFilepath)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -129,10 +137,11 @@ AttachAssetToReleaseAPIURL = %AttachAssetToReleaseAPIURL%/%ReleaseID%/assets
|
|||||||
|
|
||||||
; Strings with spaces in them need to be surrounted by a single quote and double quote, eg: "'spaced string'"
|
; Strings with spaces in them need to be surrounted by a single quote and double quote, eg: "'spaced string'"
|
||||||
Command = Powershell "%AttachAssetToReleasePS1Filepath%" "%AttachAssetToReleaseAPIURL%" "%GiteaToken%" "'%ExeProgramName%'" "'%Exefilepath%'"
|
Command = Powershell "%AttachAssetToReleasePS1Filepath%" "%AttachAssetToReleaseAPIURL%" "%GiteaToken%" "'%ExeProgramName%'" "'%Exefilepath%'"
|
||||||
LogToErrorLogFile(Command, ErrorLogTextFile)
|
LogToErrorLogFile(Command, ErrorLogFilepath)
|
||||||
|
|
||||||
Results := RunCMD(Command)
|
Results := RunCMD(Command)
|
||||||
LogToErrorLogFile(Results, ErrorLogTextFile)
|
Message = API Returned: %Results%
|
||||||
|
LogToErrorLogFile(Message, ErrorLogFilepath)
|
||||||
|
|
||||||
|
|
||||||
ExitApp
|
ExitApp
|
||||||
@@ -151,5 +160,5 @@ ExitApp
|
|||||||
|
|
||||||
;---FUNCTIONS-----------------------------------------------------------------------
|
;---FUNCTIONS-----------------------------------------------------------------------
|
||||||
LogToErrorLogFile(Text, TextFileFilepath){
|
LogToErrorLogFile(Text, TextFileFilepath){
|
||||||
FileAppend, %Text%`n, %TextFileFilepath%
|
FileAppend, `n%Text%`n, %TextFileFilepath%
|
||||||
}
|
}
|
||||||
@@ -86,7 +86,9 @@ if((StrLen(VideoTitle) + StrLen(VideoDescription) + StrLen(VideoLinks)) > 2000){
|
|||||||
else,
|
else,
|
||||||
DiscordVideoDescription := VideoDescription
|
DiscordVideoDescription := VideoDescription
|
||||||
|
|
||||||
Message := "**" . VideoTitle . "**" . "`n" . VideoLinks . "`n" . DiscordVideoDescription
|
Message = VideoLinks variable contents:
|
||||||
|
|
||||||
|
Message := "**" . VideoTitle . "**" . "`n" . DiscordVideoDescription . "`n`n" . VideoLinks
|
||||||
|
|
||||||
Status := UploadImageToDiscord(DiscordVideosWebhookURL, Message, VideoThumbFilepath)
|
Status := UploadImageToDiscord(DiscordVideosWebhookURL, Message, VideoThumbFilepath)
|
||||||
Message = API Response:`n%Status%
|
Message = API Response:`n%Status%
|
||||||
|
|||||||
@@ -124,51 +124,32 @@ Loop, 5 { ; Attempt to input video description a couple of times
|
|||||||
Xpath = (//input[@placeholder='- Primary category -'])[1]
|
Xpath = (//input[@placeholder='- Primary category -'])[1]
|
||||||
try, driver.FindElementByXPath(Xpath).SendKeys("Podcasts").SendKeys(driver.Keys.ENTER)
|
try, driver.FindElementByXPath(Xpath).SendKeys("Podcasts").SendKeys(driver.Keys.ENTER)
|
||||||
|
|
||||||
|
/*
|
||||||
|
; Skip the channel selection for now
|
||||||
|
; Rumble now has a "Set this channel as default" checkbox
|
||||||
|
|
||||||
Message = Selecting Channel
|
Message = Selecting Channel
|
||||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
|
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
|
||||||
|
|
||||||
|
; Get list of channels and select the second one in the list
|
||||||
|
; First is the user profile
|
||||||
|
; Second is the Normal Channel
|
||||||
|
|
||||||
; @todo replace with regex
|
Xpath = (//fieldset[@id='channelId'])[1]
|
||||||
js = return document.querySelector("#channelId").innerHTML;
|
Try Channels := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
|
||||||
try, ChannelIDNumber := driver.executeScript(js)
|
UploadChannelName := StrSplit(Channels, "`n")[2]
|
||||||
; Msgbox % "ChannelIDNumber: " ChannelIDNumber
|
|
||||||
ChannelIDNumber := StrSplit(ChannelIDNumber, "option value=")
|
|
||||||
|
|
||||||
ChannelIDNumber := ChannelIDNumber[3]
|
if(!UploadChannelName){
|
||||||
SingleQuote = "
|
Message = Failed to Grab Upload Channel Name
|
||||||
ChannelIDNumber := StrSplit(ChannelIDNumber, "data-private")
|
SaveOrPostProgress(Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||||
ChannelIDNumber := ChannelIDNumber[1]
|
Return
|
||||||
ChannelIDNumber := StrReplace(ChannelIDNumber, SingleQuote, "")
|
|
||||||
ChannelIDNumber := StrReplace(ChannelIDNumber, " ", "")
|
|
||||||
|
|
||||||
; Msgbox % "ChannelIDNumber: " ChannelIDNumber
|
|
||||||
|
|
||||||
|
|
||||||
; js = return document.querySelector("#channelId").value;
|
|
||||||
; try, ChannelIDNumber := driver.executeScript(js)
|
|
||||||
; Msgbox % "ChannelIDNumber: " ChannelIDNumber
|
|
||||||
if(ChannelIDNumber = ""){
|
|
||||||
Message = ChannelIDNumber is blank. Unable to select Upload Channel
|
|
||||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
|
||||||
SaveDriverURLOFErrorPage()
|
|
||||||
Return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
; //option[@value='762377'] ; freedomain
|
Xpath = (//label[normalize-space()='%UploadChannelName%'])[1]
|
||||||
Xpath = //option[@value='%ChannelIDNumber%']
|
Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
|
||||||
try driver.FindElementByXPath(Xpath).click()
|
|
||||||
catch e {
|
|
||||||
Message = Failed to click on Channel using %ChannelIDNumber%.
|
|
||||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
|
||||||
SaveDriverURLOFErrorPage()
|
|
||||||
Return
|
|
||||||
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
|
||||||
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
; Input Tags
|
; Input Tags
|
||||||
Message = Inputting Tags
|
Message = Inputting Tags
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[Video-Uploader]
|
[Video-Uploader]
|
||||||
Version=3.48
|
Version=3.51
|
||||||
Name=Freedomain Video Uploader
|
Name=Freedomain Video Uploader
|
||||||
|
|||||||
Reference in New Issue
Block a user