diff --git a/Modules/Bitchute-Upload.ahk b/Modules/Bitchute-Upload.ahk index bca1531..a8e74e0 100644 --- a/Modules/Bitchute-Upload.ahk +++ b/Modules/Bitchute-Upload.ahk @@ -272,7 +272,6 @@ try driver.executeScript("history.go(0)") ;refresh page try FirstResultVideoTitle := driver.findElementsByClass("channel-videos-title").item[1].Attribute("innerText") ; Grabb innertext -; msgbox % FirstResultVideoTitle = VideoTitle try FirstResultIDAndTag := driver.findElementsByClass("channel-videos-title").item[1].Attribute("outerHTML") ;XPath: ID=site-title & span tag ; Msgbox % "FirstResultIDAndTag: " FirstResultIDAndTag diff --git a/Modules/Brighteon-Upload.ahk b/Modules/Brighteon-Upload.ahk index e0e7848..18c3cbd 100644 --- a/Modules/Brighteon-Upload.ahk +++ b/Modules/Brighteon-Upload.ahk @@ -63,33 +63,23 @@ if(InStr(CurrentTab, "login")) ; we're logged out Message = Trying to Log Back In SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile, DiscordErrorLogging") - ; js = return document.querySelector("input[placeholder='username/email']").value; - ; status := try driver.executeScript(JS) ;Execute Javascript + Xpath = //a[normalize-space()='Log In'] ; click login button at top right of page + Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000) - ; sleep, 5000 - ; Msgbox % "status: " status + ; sleep, 2000 + Xpath = //button[@type='submit'] ; click login button on login page + Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=6,SleepLength:=1000) + try driver.executeScript("return document.readyState").equals("complete") - ; if(StrLen(Status) > 0){ - ; msgbox, clicking login button - 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:=6,SleepLength:=1000) - try driver.executeScript("return document.readyState").equals("complete") - - sleep, 2000 - ; } - - - } - else, { - SaveOrPostProgress(Message:="Login Expired. Please log back in",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging") - SaveDriverURLOFErrorPage() - Return - } } + else, { + SaveOrPostProgress(Message:="Login Expired. Please log back in",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging") + SaveDriverURLOFErrorPage() + Return + } +} } @@ -153,7 +143,7 @@ loop, 3 { try driver.FindElementByXPath(Xpath).SendKeys(driver.Keys.SPACE) try driver.FindElementByXPath(Xpath).SendKeys(driver.Keys.BACKSPACE) ;Sends Variable to an Xpath Item -*/ + */ diff --git a/Modules/DailyMotion-Upload.ahk b/Modules/DailyMotion-Upload.ahk index 486240d..d7305e6 100644 --- a/Modules/DailyMotion-Upload.ahk +++ b/Modules/DailyMotion-Upload.ahk @@ -246,10 +246,10 @@ SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,Disc ; DailyMotion page automtically splits the tags into individual tags when they're seperated by commas ; Iterate from one end of the array to another: -Loop % VideoTagsArray.Length(){ +Loop % ArrayOfVideoTags.Length(){ ; ArrayItem := ARRAY[A_Index] ; MsgBox % - DailyMotionVideoTags .= VideoTagsArray[A_Index] . "," + DailyMotionVideoTags .= ArrayOfVideoTags[A_Index] . "," } diff --git a/Modules/GUI-Main-Window.ahk b/Modules/GUI-Main-Window.ahk index e17d86d..64087c9 100644 --- a/Modules/GUI-Main-Window.ahk +++ b/Modules/GUI-Main-Window.ahk @@ -1,33 +1,35 @@ ;---GUI Variables--- ;------------------------------------------------ +SetGUIVariables: GuiHeight = 800 GuiWidth = 1366 GuiFontSize = 10 ButtonHeights := 30 +ResultsActionButtonHeights := 50 -MarginSpace := 10 -MarginSpaceDoubled := MarginSpace * 2 -MarginSpaceTripled := MarginSpace * 3 +MarginSize := 10 +MarginSizeDoubled := MarginSize * 2 +MarginSizeTripled := MarginSize * 3 EditBoxWidths := (GuiWidth / 100) * 60 -EditBoxHalfWidths := (EditBoxWidths / 2) - (MarginSpace / 2) +EditBoxHalfWidths := (EditBoxWidths / 2) - (MarginSize / 2) OdyseeURLSlugEditWidth := (EditBoxHalfWidths / 4) * 3 -PodcastNumberTextXPos := EditBoxHalfWidths + OdyseeURLSlugEditWidth + (MarginSpace * 3) -PodcastNumberEditWidth := (EditBoxHalfWidths / 4) - MarginSpace +PodcastNumberTextXPos := EditBoxHalfWidths + OdyseeURLSlugEditWidth + (MarginSize * 3) +PodcastNumberEditWidth := (EditBoxHalfWidths / 4) - MarginSize EditBoxOneFourthWidth := (EditBoxWidths / 4 ) EditBoxThreeFourthsWidth := (EditBoxWidths / 4 ) * 3 -ColumnOneHalfWidthXPos := EditBoxHalfWidths + MarginSpaceDoubled +ColumnOneHalfWidthXPos := EditBoxHalfWidths + MarginSizeDoubled -EditBoxThirdsWidths := (EditBoxWidths / 3) - (MarginSpace / 2) -OdyseeURLSlugXPos := EditBoxHalfWidths + (MarginSpace * 2) +EditBoxThirdsWidths := (EditBoxWidths / 3) - (MarginSize / 2) +OdyseeURLSlugXPos := EditBoxHalfWidths + (MarginSize * 2) -EditBoxFourthWidths := (EditBoxWidths / 4) - (MarginSpace - 2) -VideoTagsTextXPos := EditBoxHalfWidths + (MarginSpace * 2) +EditBoxFourthWidths := (EditBoxWidths / 4) - (MarginSize - 2) +VideoTagsTextXPos := EditBoxHalfWidths + (MarginSize * 2) ; EditBoxHalfWidthsWithMargin := (EditBoxWidths / 2) DescriptionCharCountXPos := EditBoxHalfWidths - 40 @@ -35,21 +37,26 @@ DescriptionCharCountXPos := EditBoxHalfWidths - 40 PageTwoXStartPos := EditBoxWidths + 50 CopyButtonWidths := 150 -ResultEditBoxXPos := CopyButtonWidths + MarginSpace + 5 -ResultEditBoxWidths := EditBoxWidths - CopyButtonWidths +ResultEditBoxXPos := CopyButtonWidths + MarginSize + 5 +ResultEditBoxWidth := EditBoxWidths - ( CopyButtonWidths) -ResultEditBoxHalfWidths := (ResultEditBoxWidths / 2) - (MarginSpace /2) -ResultLBRYURLEditBoxWidthPieces := (ResultEditBoxWidths / 4) -ResultLBRYURLEditBoxWidths := ResultLBRYURLEditBoxWidthPieces * 3 +ResultsEditAndCopyButtonWidth := CopyButtonWidths + ResultEditBoxWidth + MarginSize +ResultsGUIWidth := ResultsEditAndCopyButtonWidth + ErrorLogEditBoxWidth + MarginSize -ResultEditBoxThirdsWidths := (ResultEditBoxWidths / 3) - (MarginSpace /3) +ErrorLogEditBoxXPos := ResultEditBoxWidth + CopyButtonWidths + 30 +ErrorLogEditBoxHeight := ButtonHeights * 14 + (MarginSize * 9) +ErrorLogEditBoxWidth := 330 -ResultLBRYThumbEditBoxWidth := ResultLBRYURLEditBoxWidthPieces - 5 -ErrorLogEditBoxXPos := ResultEditBoxWidths + CopyButtonWidths + 30 -ErrorLogEditBoxHeight := GuiHeight - (MarginSpace * 20) - (ButtonHeights * 2) -ErrorLogEditBoxWidth := GuiWidth - ErrorLogEditBoxXPos - (MarginSpace * 12) +ResultEditBoxHalfWidths := (((ResultEditBoxWidth + CopyButtonWidths)) - (MarginSize * 3)) +ResultLBRYURLEditBoxWidthPieces := (ResultEditBoxWidth / 4) +ResultLBRYURLEditBoxWidths := ResultLBRYURLEditBoxWidthPieces * 3 + +ResultEditBoxThirdsWidths := (ResultEditBoxWidth / 3) - (MarginSize /3) +ResultsScreenOneThirdsWidth := (ResultEditBoxWidth + CopyButtonWidths + ErrorLogEditBoxWidth) / 3 + +ResultLBRYThumbEditBoxWidth := ResultLBRYURLEditBoxWidthPieces - 5 ButtonWidths := 150 @@ -67,11 +74,11 @@ PageTwoGroupBoxWidth := ThumbnailPreviewWidth + 20 VideoDescriptionEditBoxHeight = 100 CheckboxesStartYPos := 630 -FilePathEditBoxWidths := EditBoxWidths - MarginSpace - 70 +FilePathEditBoxWidths := EditBoxWidths - MarginSize - 70 SelectFileButtonWidths := 30 ButtonStartYPos := CheckboxesStartYPos + 10 -MarginSquared := MarginSpace * 2 +MarginSquared := MarginSize * 2 if(DevMode){ MainButtonHeight := 30 @@ -82,16 +89,18 @@ else, { MainButtonHeight := 30 SecondaryButtonHeights := 35 } - +Return ; -------------------------------GUI------------------------------- +SetAndShowMainGUI: +Gosub, SetGUIVariables Gui, Font, s%GuiFontSize% -Gui, Margin, %MarginSpace%, %MarginSpace% +Gui, Margin, %MarginSize%, %MarginSize% ; Video Title Gui, Font, Bold @@ -101,35 +110,35 @@ Gui, Add, Text, x%PodcastNumberTextXPos% yp+0,Podcast # Gui, Font, Normal -Gui, Add, Edit, y+5 x%MarginSpace% w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vVideoTitle, %VideoTitle% -Gui, Add, Edit, yp+0 x+%Marginspace% w%OdyseeURLSlugEditWidth% h%EditBoxHeight% gUpdateVars vLBRYURLSlug, %LBRYURLSlug% -Gui, Add, Edit, yp+0 x+%Marginspace% w%PodcastNumberEditWidth% h%EditBoxHeight% gUpdateVars vPodcastNumber, %PodcastNumber% +Gui, Add, Edit, y+5 x%MarginSize% w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vVideoTitle, %VideoTitle% +Gui, Add, Edit, yp+0 x+%MarginSize% w%OdyseeURLSlugEditWidth% h%EditBoxHeight% gUpdateVars vLBRYURLSlug, %LBRYURLSlug% +Gui, Add, Edit, yp+0 x+%MarginSize% w%PodcastNumberEditWidth% h%EditBoxHeight% gUpdateVars vPodcastNumber, %PodcastNumber% ; LBRY URL Gui, Font, Bold -Gui, Add, Text, x%Marginspace%,Video Tags (Comma Seperated) +Gui, Add, Text, x%MarginSize%,Video Tags (Comma Seperated) Gui, Add, Text,x%ColumnOneHalfWidthXPos% yp+0,Podcast Tags (Comma Seperated) Gui, Font, Normal -Gui, Add, Edit, x%Marginspace% Y+5 w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vVideoTags, %VideoTags% -Gui, Add, Edit, yp+0 x+%Marginspace% w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vPodcastTags, %PodcastTags% +Gui, Add, Edit, x%MarginSize% Y+5 w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vVideoTags, %VideoTags% +Gui, Add, Edit, yp+0 x+%MarginSize% w%EditBoxHalfWidths% h%EditBoxHeight% gUpdateVars vPodcastTags, %PodcastTags% ; Description/Summary Headers Gui, Font, Bold -Gui, Add, Text,y+%Marginspace% x%Marginspace%,Description +Gui, Add, Text,y+%MarginSize% x%MarginSize%,Description Gui, Add, Text,yp+0 x%ColumnOneHalfWidthXPos%,Summary Gui, Font, Normal ; Video Description edit box -Gui, Add, Edit,x%Marginspace% y+5 w%EditBoxHalfWidths% h%VideoDescriptionEditBoxHeight% vVideoDescription gSubmitDescription,%VideoDescription% +Gui, Add, Edit,x%MarginSize% y+5 w%EditBoxHalfWidths% h%VideoDescriptionEditBoxHeight% vVideoDescription gSubmitDescription,%VideoDescription% ; Video Summary Edit Box Gui, Add, Edit,x%ColumnOneHalfWidthXPos% yp+0 w%EditBoxHalfWidths% h%VideoDescriptionEditBoxHeight% vVideoSummary gUpdateVars,%VideoSummary% Gui, Font, Normal gui, font, s8 -Gui, Add, Edit, x%Marginspace% y+5 vDescriptionCharCount, %DescriptionCharCount% -Gui, Add,Text, yp+4 x+%MarginSpace%,Limits: DM+Bitchute = 3K, Odysee, Brighteon = 5K +Gui, Add, Edit, x%MarginSize% y+5 vDescriptionCharCount, %DescriptionCharCount% +Gui, Add,Text, yp+4 x+%MarginSize%,Limits: DM+Bitchute = 3K, Odysee, Brighteon = 5K ; Gui, font, Bold Gui, Font, s%GuiFontSize% @@ -137,14 +146,14 @@ Gui, font, Bold -Gui, Add, GroupBox,r8.5 x%MarginSpace% y+10 w%EditBoxWidths% Center, Filepaths +Gui, Add, GroupBox,r8.5 x%MarginSize% y+10 w%EditBoxWidths% Center, Filepaths ; Video Filepath Gui, Font, Bold Gui, Add, Text,xp+5 yp+15,Video Filepath Gui, Font, Normal Gui, Add, Edit, x%MarginSquared% y+2 w%FilePathEditBoxWidths% h%EditBoxHeight% gUpdateVars vVideoFilepath,%VideoFilepath% -Gui, Add, Button, x+5 yp+0 h%EditBoxHeight% gSelectVideoFilepath, Select +Gui, Add, Button, x+%MarginSize% yp+0 h%EditBoxHeight% gSelectVideoFilepath, Select ; Video Thumbnail Filepath Gui, Font, Bold @@ -154,7 +163,7 @@ else, Gui, Add, Text,y+15 x%MarginSquared% ,Video Thumbnail Filepath Gui, Font, Normal Gui, Add, Edit, x%MarginSquared% y+2 w%FilePathEditBoxWidths% h%EditBoxHeight% gUpdateVars vVideoThumbFilepath,%VideoThumbFilepath% -Gui, Add, Button, x+5 yp+0 h%EditBoxHeight% gSelectVideoThumbFilepath, Select +Gui, Add, Button, x+%MarginSize% yp+0 h%EditBoxHeight% gSelectVideoThumbFilepath, Select ; WAV Audio File Filepath Gui, Font, Bold if(WavAudioFilepath = "") @@ -167,7 +176,7 @@ else, { ; change text depending on if WAV or FLAC file } Gui, Font, Normal Gui, Add, Edit, x%MarginSquared% y+2 w%FilePathEditBoxWidths% h%EditBoxHeight% gUpdateVars vWavAudioFilepath,%WavAudioFilepath% -Gui, Add, Button, x+5 yp+0 h%EditBoxHeight% gSelectWAVFilepath, Select +Gui, Add, Button, x+%MarginSize% yp+0 h%EditBoxHeight% gSelectWAVFilepath, Select Gui, Font, Bold if(MP3AudioFilepath = "") @@ -176,135 +185,105 @@ else, Gui, Add, Text,x%MarginSquared% y+15,Podcast MP3 Filepath Gui, Font, Normal Gui, Add, Edit, x%MarginSquared% y+2 w%FilePathEditBoxWidths% h%EditBoxHeight% gUpdateVars vMP3AudioFilepath,%MP3AudioFilepath% -Gui, Add, Button, x+5 yp+0 h%EditBoxHeight% gSelectMP3Filepath, Select +Gui, Add, Button, x+%MarginSize% yp+0 h%EditBoxHeight% gSelectMP3Filepath, Select ; Submit Button Gui, Font, s%GuiFontSize% gui, Font, Bold -; if(DevMode) -; Gui, Add, Button, x%MarginSpace% w%EditBoxHalfWidths% y+25 h%MainButtonHeight% gCancelPost hwndIcon, Close -; else, +Gui, Add, Button, w%EditBoxFourthWidths% x%MarginSize% gUpdateScript vUpdateAvailable h%SecondaryButtonHeights% center,FVU Up-to-Date +Gui, Add, Button, x+%MarginSize% w%EditBoxFourthWidths% h%SecondaryButtonHeights% gOpenProjectFolder, Open Folder -; Script Update Button -if(UpdateAvailable){ - Gui, Add, Button, w%EditBoxHalfWidths% x%MarginSpace% gUpdateScript vUpdateAvailable h%SecondaryButtonHeights% center,Uploader Update Available! - ; GuiButtonIcon(Icon, "shell32.dll", 278, "s20 a1 r2") -} -else, { - Gui, Add, Button, w%EditBoxHalfWidths% x%MarginSpace% gUpdateScript vUpdateAvailable h%SecondaryButtonHeights% center,Uploader Up-to-Date - ; Gui, Add, Button, w%EditBoxHalfWidths% x+%Marginspace% vUpdateAvailable hwndIcon, Script is Up-to-Date - ; GuiButtonIcon(Icon, "shell32.dll", 239, "s20 a1 r2") - -} -; Gui, Font, s20 -; Gui, Font, Bold -Gui, Add, Button, x+%MarginSpace% w%EditBoxHalfWidths% h%SecondaryButtonHeights% gStartScript, UPLOAD +Gui, Add, Button, x+%MarginSize% w%EditBoxHalfWidths% h%SecondaryButtonHeights% gScheduleUpload, Schedule for Later +; Gui, Add, Button, w%EditBoxFourthWidths% x%MarginSize% y+%MarginSize% h%SecondaryButtonHeights% gOpenProjectFolder, Open New Project -Gui, Font, s%GuiFontSize% +Gui, Add, Button, w%EditBoxFourthWidths% h%SecondaryButtonHeights% x%MarginSize% y+%MarginSize% vChromeUpdateAvailable gUpdateChrome, Chrome Up-to-Date -; Chrome Update Button -if(ChromeUpdateAvailable){ - Gui, Add, Button, x%MarginSpace% w%EditBoxHalfWidths% y+%Marginspace% h%SecondaryButtonHeights% vChromeUpdateAvailable gUpdateChrome center,Chrome Update Available! -} -else, { - Gui, Add, Button, x%MarginSpace% w%EditBoxHalfWidths% y+%Marginspace% h%SecondaryButtonHeights% vChromeUpdateAvailable gUpdateChrome center,Chrome Up-to-Date - -} -; Gui, Add, Button, x%MarginSpace% w%EditBoxHalfWidths% y+25 h%MainButtonHeight% gCancelPost hwndIcon, Exit -; GuiButtonIcon(Icon, "imageres.dll",208, "s20 a1 r2") - - - -if(DevMode) -Gui, Add, Button, x+%MarginSpace% yp+0 w%EditBoxFourthWidths% h%SecondaryButtonHeights% gDisplayResults, View Results -else, -Gui, Add, Button, x+%MarginSpace% yp+0 w%EditBoxFourthWidths% h%SecondaryButtonHeights% gDisplayResults, View Results - -Gui, Add, Button, w%EditBoxFourthWidths% x+%Marginspace% h%SecondaryButtonHeights% gOpenProjectFolder, Open Project Folder +Gui, Add, Button, x+%MarginSize% yp+0 w%EditBoxFourthWidths% h%SecondaryButtonHeights% gDisplayResults, View Status +Gui, Add, Button, x+%MarginSize% w%EditBoxHalfWidths% h%SecondaryButtonHeights% gStartScript, UPLOAD if(DevMode){ - Gui, Add, Button, x%MarginSpace% w%EditBoxFourthWidths% h30 y+5 h%SecondaryButtonHeights% gOpenErrorLog, Open ErrorLog - Gui, Add, Button, x+%MarginSpace% w%EditBoxFourthWidths% h30 h%SecondaryButtonHeights% gClearVideoLinks, Clear VideoLinks + Gui, Add, Button, x%MarginSize% w%EditBoxFourthWidths% h30 y+5 h%SecondaryButtonHeights% gOpenErrorLog, Open ErrorLog + Gui, Add, Button, x+%MarginSize% w%EditBoxFourthWidths% h30 h%SecondaryButtonHeights% gClearVideoLinks, Clear VideoLinks } ; -------------------------------Page 2 Side of Main GUI Window------------------------------- -LineSplitXPosition := PageTwoXStartPos - ( MarginSpace * 2) -gui, add, text, x%LineSplitXPosition% y20 h500 0x11 ; 0x11 is a "line" ; refer to here: https://autohotkey.com/board/topic/50910-draw-line-gui/ -; Thumbnail Preview -Gui, Font, Normal -gui, Font, s4 +LineSplitXPosition := PageTwoXStartPos - ( MarginSize * 2) +gui, add, text, x%LineSplitXPosition% y20 h600 0x11 ; 0x11 is a "line" + ; Miscellaneous Settings +; DevMode Buttons +gui, Font, s4 +Gui, Font, Normal DevModToggleButton := PageTwoXStartPos + 160 Gui, Add, Button, x%DevModToggleButton% y5 w50 h10 gToggleDevMode,DevMode -Gui, Add, Button, x+5 y5 w50 h10 gToggleTestingMode, Testing Mode -Gui, Add, Button, x+5 y5 w50 h10 gOpenGiteaPage, Gitea +Gui, Add, Button, x+%MarginSize% y5 w50 h10 gToggleTestingMode, Testing Mode +Gui, Add, Button, x+%MarginSize% y5 w50 h10 gOpenGiteaPage, Gitea Gui, Font, s%GuiFontSize% -Gui, Font, Bold +Gui, Font, Normal ; Settings Section -Gui, Add, GroupBox,r5 y+0 x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%,Settings -Gui, Add, Checkbox, xp+10 yp+20 vAutoUpdateCheck gUpdateVars Checked%AutoUpdateCheckCheckStatus%, Auto Update Check -Gui, Add, Checkbox, vShowTooltipProgress Checked%ShowTooltipProgressCheckStatus% gUpdateVars,Show Tooltip of Actions -Gui, Add, Checkbox, vKillLBRYAfterUpload Checked%KillLBRYAfterUploadCheckStatus%, Kill LBRY After Uploading -Gui, Add, Checkbox, vAutoLogin gUpdateVars Checked%AutoLoginCheckStatus%, Try to Login Automatically -Gui, Add, Checkbox, vPingOnCompletion gUpdateVars Checked%PingOnCompletionCheckStatus%, Discord Ping Upon Completion +Gui, Add, GroupBox,r6 y+0 x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%,Settings +Gui, Add, Checkbox, xp+10 yp+20 vAutoUpdateCheck gUpdateVars Checked%AutoUpdateCheck%, Auto Update Check +Gui, Add, Checkbox, vShowTooltipProgress Checked%ShowTooltipProgress% gUpdateVars,Show Tooltip of Actions +Gui, Add, Checkbox, vKillLBRYAfterUpload Checked%KillLBRYAfterUpload%, Kill LBRY After Uploading +Gui, Add, Checkbox, vErrorLogToDiscord gUpdateVars Checked%ErrorLogToDiscord%, Error Log to Discord +Gui, Add, Checkbox, vDiscordPingOnCompletion gUpdateVars Checked%DiscordPingOnCompletion%, Discord Ping Upon Completion +Gui, Add, Checkbox, vConfirmBeforeSubmit checked%ConfirmBeforeSubmit%, Confirm Before Submit -GroupBoxCheckboxPos := PageTwoXStartPos + MarginSpace +GroupBoxCheckboxPos := PageTwoXStartPos + MarginSize ; -------------------------------PLATFORMS------------------------------- -Gui, Add, GroupBox,r6 y+%MarginSpaceTripled% x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%, Platforms - -; Msgbox % "LocalsURL: " LocalsURL -; if(VideoFileSizeInMB < 1792) -; Gui, Add, Checkbox, x+%MarginSpaceDoubled% vFacebook Checked%FacebookCheckStatus%, Facebook +Gui, Font, s%GuiFontSize% +Gui, Font, Bold +Gui, Add, GroupBox,r6 y+%MarginSizeTripled% x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%, Platforms -Gui, Add, Checkbox, xp+10 yp+25 vBitChute Checked%BitChuteCheckStatus% gUpdateVars, BitChute +Gui, Font, s8 +Gui, Font, Bold +Gui, Add, Button, xp+80 yp+0 gUncheckAllPlatforms, Uncheck All +Gui, Font, s%GuiFontSize% +Gui, Font, Normal +Gui, Add, Checkbox, x%GroupBoxCheckboxPos% yp+30 vBitChute Checked%BitChute% gUpdateVars, BitChute if(LocalsURL = "LocalsUploadStartedNeedToGrabURL"){ ; msgbox, checking grab url - Gui, Add, Checkbox, x+%MarginSpaceTripled% yp+0 vLocalsGrabURL Checked%LocalsCheckStatus% gUpdateVars, Locals (Grab URL) + Gui, Add, Checkbox, x+%MarginSizeTripled% yp+0 vLocalsGrabURL Checked%Locals% gUpdateVars, Locals (Grab URL) LocalsGrabURL := 1 Locals := 0 } else, { ; msgbox, checking locals - Gui, Add, Checkbox, x+%MarginSpaceTripled% yp+0 vLocals Checked%LocalsCheckStatus% gUpdateVars, Locals + Gui, Add, Checkbox, x+%MarginSizeTripled% yp+0 vLocals Checked%Locals% gUpdateVars, Locals LocalsGrabURL := 0 Locals := 1 } -Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSpace% vOdyseeVideo Checked%OdyseeVideoCheckStatus% gUpdateVars, Odysee Video - +Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSize% vOdyseeVideo Checked%OdyseeVideo% gUpdateVars, Odysee Video +Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSize% vOdyseeAudio Checked%OdyseeAudio% gUpdateVars, Odysee Audio -; Gui, Add, Checkbox, x+%MarginSpace% vOdyseeVideoThumb Checked%OdyseeVideoThumbCheckStatus%,Thumbnail -Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSpace% vOdyseeAudio Checked%OdyseeAudioCheckStatus% gUpdateVars, Odysee Audio -; Gui, Add, Checkbox, x+%MarginSpace% vOdyseeAudioThumb Checked%OdyseeAudioThumbCheckStatus%, Thumbnail - -Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSpace% vRumble Checked%RumbleCheckStatus% gUpdateVars, Rumble +Gui, Add, Checkbox, x%GroupBoxCheckboxPos% y+%MarginSize% vRumble Checked%Rumble% gUpdateVars, Rumble if(VideoTotalBitrate > 300000) -Gui, Add, Checkbox, vBrighteon y+%MarginSpace% Checked%BrighteonCheckStatus% gUpdateVars, Brighteon +Gui, Add, Checkbox, vBrighteon y+%MarginSize% Checked%Brighteon% gUpdateVars, Brighteon else,{ - Gui, Add, Checkbox, cRed vBrighteon y+%MarginSpace% Checked0 gUpdateVars, Brighteon (Bitrate Below 300kbps) + Gui, Add, Checkbox, cRed vBrighteon y+%MarginSize% Checked0 gUpdateVars, Brighteon (Bitrate Below 300kbps) } -Gui, Add, Checkbox, vDailyMotion y+%MarginSpace% Checked%DailyMotionCheckStatus% gUpdateVars, DailyMotion -; Gui, Add, Checkbox, vStreamanity Checked%StreamanityCheckStatus%, Streamanity +Gui, Add, Checkbox, vDailyMotion y+%MarginSize% Checked%DailyMotion% gUpdateVars, DailyMotion -; Gui, Font, s12 -gui, Font, Bold -Gui, Add, GroupBox, r6.5 y+%MarginSpaceTripled% vImageThumbnail x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%,Thumbnail +Gui, Font, s%GuiFontSize% +Gui, Font, Bold +Gui, Add, GroupBox, r6.5 y+%MarginSizeTripled% vImageThumbnail x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%,Thumbnail gui, Font, Normal Gui, Add, Picture, xp+10 yp+20 w%ThumbnailPreviewWidth% h-1, %VideoThumbFilepath% @@ -325,19 +304,170 @@ Gui, Show,, %FullScriptName% - Upload Settings - %BodyTextFilePath% ControlFocus, Edit4, %FullScriptName% ToolTip - ; calculate run time and convert to seconds URunTime1 := round(((A_TickCount - UStartTime) / 1000), 2) -;---Check for Updates--- + +; - Check for Updates ;------------------------------------------------ if(AutoUpdateCheck AND !UpdateAvailable){ SetTimer, CheckForUpdates, -1000 } - ; calculate run time and convert to seconds URunTime2 := round(((A_TickCount - UStartTime) / 1000), 2) Return + + + +; Scheduler GUI +; ------------------------------------------------ +ScheduleUpload: +gui, Submit, NoHide ; submit the main GUI so all the variables get updated + +; Create GUI for Scheduler +Gui, ScheduleGUI:New +Gui, Font, s15 +Gui, Font, Bold +Gui, Add, Text,, Date: +Gui, Add, DateTime,w%EditBoxHalfWidths% vScheduledDate , MM/dd/yyyy +Gui, Add, Text,, Time: +Gui, Add, DateTime, w%EditBoxHalfWidths% vScheduledTime Choose200505311900, Time +Gui, Add, Button,w%EditBoxHalfWidths% gSubmitScheduler, Schedule +Gui, Show,, Scheduler + +Return + + + + + + +; Results GUI Screen +; ------------------------------------------------ +SetAndShowResultsGUI: +; Set the GUI Variables, needed if called from Scheduler +Gosub, SetGUIVariables + +Gui, Font, s%GuiFontSize% +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTranscriptURL,Transcript URL +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% w%ResultEditBoxWidth% gUpdateVars vPodcastTranscriptURL, %PodcastTranscriptURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyBitChuteURL, Bitchute +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vBitChuteURL w%ResultEditBoxWidth% gUpdateVars , %BitChuteURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyBrighteonURL, Brighteon +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vBrighteonURL w%ResultEditBoxWidth% gUpdateVars , %BrighteonURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyDailyMotionURL, DailyMotion +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vDailyMotionURL w%ResultEditBoxWidth% gUpdateVars , %DailyMotionURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeVideoURL, Odysee Video +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vOdyseeVideoURL w%ResultEditBoxWidth% gUpdateVars, %OdyseeVideoURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeAudioURL, Odysee Audio +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vOdyseeAudioURL w%ResultEditBoxWidth% gUpdateVars , %OdyseeAudioURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyRumbleURL, Rumble +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vRumbleURL w%ResultEditBoxWidth% gUpdateVars , %RumbleURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths%, Locals +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vLocalsURL w%ResultEditBoxWidth% gUpdateVars, %LocalsURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths%, Unauthorized +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vUnauthorizedTVURL w%ResultEditBoxWidth% gUpdateVars, %UnauthorizedTVURL% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoTags vVideoTagsEdit, Video Tags +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vVideoTags w%ResultEditBoxWidth% gUpdateVars , %VideoTags% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTags, Podcast Tags +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vPodcasttags w%ResultEditBoxWidth% gUpdateVars , %Podcasttags% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoDescription, Description +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vVideoDescription w%ResultEditBoxWidth% gUpdateVars , %VideoDescription% + +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoDescription, Summary +Gui, Font, Normal + +Gui, Font, Normal +Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vVideoSummary w%ResultEditBoxWidth% gUpdateVars , %VideoSummary% + +Gui, Font, s%GuiFontSize% +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% w%ResultsEditAndCopyButtonWidth% h%SecondaryButtonHeights% gUpdateINI, Save Modified Links to Files + + +; Error Log Column +; ------------------------------------------------ +Gui, Font, s%GuiFontSize% +Gui, Add, Button, x+%MarginSize% y%MarginSize% w%ErrorLogEditBoxWidth% h%ButtonHeights% y%MarginSize%, Error Log +Gui, Add, Edit,x%ErrorLogEditBoxXPos% h%ErrorLogEditBoxHeight% w%ErrorLogEditBoxWidth% y+10, %ErrorLogVar% + +gui, font, Normal +gui, font, s7 +Gui, Add, StatusBar,, Total Videos Uploaded: %TotalVideosUploaded% | Total Clicks Saved: %MouseClicksSaved% +Gui, +Resize +MaximizeBox + + + +Gui, add, text, x%MarginSize% y+%MarginSize% w%ResultsGUIWidth% 0x10 ;Horizontal Line > Etched Gray + + + +; Results GUI Action Buttons +; ------------------------------------------------ +Gui, Font, s%GuiFontSize% +Gui, Font, Bold +Gui, Add, Button, x%MarginSize% yp+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gOpenLBRYBlobFilesFolder, Open LBRY Blob Folder +Gui, Add, Button, x+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gUploadPodcast vUploadPodcast, Upload Podcast +Gui, Add, Button, x+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gRetryUpload, Try Failed Again + + +Gui, Add, Button, x%MarginSize% y+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gPostToDiscord vPostToDiscordButton, Post to Discord +Gui, Add, Button, x+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gPostToTelegram vPostToTelegramButton, Post to Telegram +Gui, Add, Button, x+%MarginSize% w%ResultsScreenOneThirdsWidth% h%SecondaryButtonHeights% gStartSocialMediaPoster, Start Social Media Poster + +; Row 3 +; Gui, Add, Button, x%ResultEditBoxXPos% y+%MarginSize% w%ResultsScreenOneThirdsWidth% h%ButtonHeights%, + + +; Gui, Add, Button, x+%MarginSize% w%ResultEditBoxHalfWidths% w%ButtonWidths% h%ButtonHeights% gCancelPost , Close +; Gui, Add, Button, x+%MarginSize% w%ResultEditBoxHalfWidths% gKillScript %ButtonWidths% , Close +; gui, Add, Text, y+10 + +OriginalVideoDescription := VideoDescription +OriginalPodcastTags := PodcastTags + + +if(XPosition and YPosition) +Gui, Show,x%XPosition% y%YPosition%,%FullScriptName% - Uploads Status +else, +Gui, Show,,%FullScriptName% - Uploads Results +Return \ No newline at end of file diff --git a/Modules/GUI-Results-Window.ahk b/Modules/GUI-Results-Window.ahk index e25b7dd..e69de29 100644 --- a/Modules/GUI-Results-Window.ahk +++ b/Modules/GUI-Results-Window.ahk @@ -1,98 +0,0 @@ - -Gui, Font, s%GuiFontSize% -Gui, Font, Bold -Gui, Add, Button, x10 y+%Marginspace% h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTranscriptURL,Transcript URL -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% w%ResultEditBoxWidths% gUpdateVars vPodcastTranscriptURL, %PodcastTranscriptURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+%Marginspace% h%ButtonHeights% w%CopyButtonWidths% gCopyBitChuteURL, Bitchute -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vBitChuteURL w%ResultEditBoxWidths% gUpdateVars , %BitChuteURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+%Marginspace% h%ButtonHeights% w%CopyButtonWidths% gCopyBrighteonURL, Brighteon -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vBrighteonURL w%ResultEditBoxWidths% gUpdateVars , %BrighteonURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyDailyMotionURL, DailyMotion -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vDailyMotionURL w%ResultEditBoxWidths% gUpdateVars , %DailyMotionURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeVideoURL, Odysee Video -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vOdyseeVideoURL w%ResultEditBoxWidths% gUpdateVars, %OdyseeVideoURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeAudioURL, Odysee Audio -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vOdyseeAudioURL w%ResultEditBoxWidths% gUpdateVars , %OdyseeAudioURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyRumbleURL, Rumble -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vRumbleURL w%ResultEditBoxWidths% gUpdateVars , %RumbleURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths%, Locals -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vLocalsURL w%ResultEditBoxWidths% gUpdateVars, %LocalsURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths%, Unauthorized -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vUnauthorizedTVURL w%ResultEditBoxWidths% gUpdateVars, %UnauthorizedTVURL% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoTags vVideoTagsEdit, Video Tags -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vVideoTags w%ResultEditBoxWidths% gUpdateVars , %VideoTags% - -Gui, Font, Bold -Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTags, Podcast Tags -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vPodcasttags w%ResultEditBoxWidths% gUpdateVars , %Podcasttags% - -Gui, Font, Bold -Gui, Add, Button, x%Marginspace% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoDescription, Description -Gui, Font, Normal -Gui, Add, Edit, x+5 yp+0 h50 vVideoDescription w%ResultEditBoxWidths% gUpdateVars , %VideoDescription% - -Gui, Font, s%GuiFontSize% -Gui, Font, Bold - -Gui, Add, Button, x%ResultEditBoxXPos% w%ResultEditBoxHalfWidths% gUpdateINI, Save Modified Links -Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gUploadPodcast vUploadPodcast, Upload Podcast - -Gui, Add, Button, x%ResultEditBoxXPos% y+%MarginSpace% w%ResultEditBoxThirdsWidths% gPostToDiscord vPostToDiscordButton, Post to Discord -Gui, Add, Button, x+5 w%ResultEditBoxThirdsWidths% gPostToTelegram vPostToTelegramButton, Post to Telegram -Gui, Add, Button, x+5 w%ResultEditBoxThirdsWidths% gStartSocialMediaPoster, Start Social Media Poster - -Gui, Font, Bold -Gui, Add, Button, x%ResultEditBoxXPos% y+%MarginSpace% w%ResultEditBoxHalfWidths% gSendErrorLoggingThroughTelegram, -Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gRetryUpload, Try Failed Again - -Gui, Add, Button, x%ResultEditBoxXPos% w%ResultEditBoxHalfWidths% gOpenLBRYBlobFilesFolder %ButtonWidths% , Open LBRY Blob Files Folder -Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gCancelPost %ButtonWidths% , Close -; Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gKillScript %ButtonWidths% , Close -; gui, Add, Text, y+10 - -Gui, Font, s%GuiFontSize% -Gui, Add, Button, x%ErrorLogEditBoxXPos% w%ErrorLogEditBoxWidth% y%MarginSpace% h%ButtonHeights%, Error Log -Gui, Add, Edit,x%ErrorLogEditBoxXPos% h%ErrorLogEditBoxHeight% w%ErrorLogEditBoxWidth% y+10, %ErrorLogVar% - -gui, font, Normal -gui, font, s7 -Gui, Add, StatusBar,, Total Videos Uploaded: %TotalVideosUploaded% | Total Clicks Saved: %MouseClicksSaved% -Gui, +Resize +MaximizeBox - -OriginalVideoDescription := VideoDescription -OriginalPodcastTags := PodcastTags - - -if(XPosition and YPosition) -Gui, Show,x%XPosition% y%YPosition%,%FullScriptName% - Upload Results -else, -Gui, Show,,%FullScriptName% - Upload Results \ No newline at end of file diff --git a/Modules/GUI-Results-Window.exe b/Modules/GUI-Results-Window.exe new file mode 100644 index 0000000..73564f4 Binary files /dev/null and b/Modules/GUI-Results-Window.exe differ