Freedomain Livestream Scheduler.ahk

@@ -161,7 +161,6 @@ LivestreamThumbnail := ThumbnailJPEGFilepath
 ; ------------------------------------------------
 IniRead, ConfirmBeforeSubmit, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit, 1
 IniRead, AutoUpdateCheck, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck, 1
-
 IniRead, ErrorLogToDiscord, %SettingsIniFilepath%, %ScriptSettingsSection%, ErrorLogToDiscord, 1
 if(ErrorLogToDiscord){
 	; Discord
@@ -177,9 +176,6 @@ if(ErrorLogToDiscord){
 
 ; GUI Variables
 ; ------------------------------------------------
-IniRead, XPosition, %SettingsIniFilepath%, %ScriptSettingsSection%, XPosition, 0
-IniRead, YPosition, %SettingsIniFilepath%, %ScriptSettingsSection%, YPosition, 0
-
 GuiFontSize = 15
 
 MarginSize := 10
@@ -190,13 +186,13 @@ ThumbnailPreviewWidth := 150
 
 
 
-GuiHeight := 500
+GuiHeight := 470
 
 VerticalLineHeight := GuiHeight - 100
 
 
 ; Column One
-ColumnOneWidth := 550
+ColumnOneWidth := 500
 
 ColumnOneEditBoxWidth := ColumnOneWidth - (MarginSize * 2)
 ColumnOneEditBoxHalfWidth := (ColumnOneEditBoxWidth / 2) + 5
@@ -220,9 +216,8 @@ GUIWidth := ColumnThreeXPosition + ColumnThreeEditBoxWidth + MarginSize
 
 ; Results Screen
 ResultButtonWidth := 250
-ResultButtonEditWidth := 350
-ResultButtonHeights := 35
-ResultButtonDoubleHeights := ResultButtonHeights * 2
+ResultButtonEditWidth := 250
+ResultButtonHeights := 30
 ResultButtonAndEditWidth := ResultButtonWidth + ResultButtonEditWidth + MarginSize
 
 
@@ -257,7 +252,7 @@ Gui, Add, Button, x+%MarginSize% gPasteClipboardToEditBox vPasteClipboardToFLSDe
 
 Gui, Font, s%GuiFontSize%
 Gui, Font, Normal
-Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% h200 vLivestreamDescription, %LivestreamDescription%
+Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% h170 vLivestreamDescription, %LivestreamDescription%
 
 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
@@ -276,21 +271,19 @@ Gui, Add, Edit,x%MarginSize% w%ColumnOneEditBoxWidth% vLivestreamTags, %Livestre
 ; ------------------------------------------------
 ; Start with Column one and go across
 
-ScheduleButtonWidths := 250
-ScheduleButtonHeight := 55
-ScheduleButtonHalfHeight := ScheduleButtonHeight / 2
+ScheduleButtonWidths := 234
+ScheduleButtonHeight := 50
 
+Gui, Font, s%GuiFontSize%
+Gui, Font, Bold
+Gui, add, text, x0 y+%marginsizeDoubled% w970 0x10
 
-Gui, add, Text, x0 y+%marginsizeDoubled% w%GUIWidth% 0x10
 
-Gui, Font, s10
-Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% yp+%marginsizeDoubled% w%ColumnTwoEditBoxWidth% h%ScheduleButtonHalfHeight% gLoadPrevious , Load Previous
-Gui, Add, Button, y+0 w%ColumnTwoEditBoxWidth% h%ScheduleButtonHalfHeight% gShowResultsScreen , Show Results
+Gui, Add, Button, x%MarginSize% yp+%marginsizeDoubled% w%ColumnTwoEditBoxWidth% h%ScheduleButtonHeight% gLoadPrevious , Load Previous
 
-Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-Gui, Add, Button, x+%marginsize% yp-%ScheduleButtonHalfHeight% w%ScheduleButtonWidths% h%ScheduleButtonHeight% gSaveAsTemplate, Save As Template
+; Gui, Font, S10
+Gui, Add, Button, x+%marginsize% w%ScheduleButtonWidths% h%ScheduleButtonHeight% gSaveAsTemplate, Save As Template
 Gui, Add, Button,x+%marginsize%  gSchedulePost h%ScheduleButtonHeight% w%ScheduleButtonWidths%  gLoadTemplate, Load Template
 Gui, Add, Button, x+%marginsize% gSchedulePost h%ScheduleButtonHeight% w%ScheduleButtonWidths% gSchedulePost, Schedule
 
@@ -333,7 +326,7 @@ Gui, Font, Bold
 Gui, Add, Text,y+%MarginSizeDoubled% x%ColumnTwoXPosition%, Platforms
 Gui, Font, Normal
 
-Gui, Font, s8
+Gui, Font, s6
 Gui, Add, Button, x+%marginsize% yp+5 gUncheckAllPlatforms, Uncheck All
 
 ; Gui, Add, Checkbox,, Dlive
@@ -352,7 +345,7 @@ Gui, add, text, x%ColumnThreeVerticalLineXPosition% y%marginSize% h%VerticalLine
 ; ------------------------------------------------
 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-Gui, Add, Text,y%MarginSize% x%ColumnThreeXPosition%, Settings
+Gui, Add, Text,y0 x%ColumnThreeXPosition%, Settings
 
 
 Gui, Font, s12
@@ -364,26 +357,22 @@ Gui, Add, Checkbox, vConfirmBeforeSubmit checked%ConfirmBeforeSubmit%, Confirm B
 
 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-Gui, Add, Text, y+%MarginSizeDoubled% x%ColumnThreeXPosition%, System
+Gui, Add, Text, y+%MarginSizeDoubled% x%ColumnThreeXPosition%, Updates
 
 Gui, Font, S10
-/*if(UpdateAvailable)
-	Gui, Add, Button, cRed w%ColumnTwoEditBoxWidth% center vUpdateAvailable gUpdateScript, %ScriptAbbreviatedName% Update Available!
+if(UpdateAvailable)
+	Gui, Add, Button, cRed w%ColumnTwoEditBoxWidth% center vUpdateAvailable gUpdateScript, FLS Update Available!
 else, 
-*/
-Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vUpdateAvailable gUpdateScript, %ScriptAbbreviatedName% Up-to-Date
+	Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vUpdateAvailable gUpdateScript, FLS Up-to-Date
 
-/*if(ChromeUpdateAvailable)
+if(ChromeUpdateAvailable)
 	Gui, Add, Button, cRed w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome,Chrome Update Available!
 else, 
-*/
-Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome, Chrome Up-to-Date
-
-Gui, Add, Button, x%ColumnThreeXPosition% y+%MarginSize% w%ColumnThreeEditBoxWidth% center gOpenGiteaPage, Report Bug
+	Gui, Add, Button, w%ColumnThreeEditBoxWidth% center vChromeUpdateAvailable gUpdateChrome, Chrome Up-to-Date
 
 
 
-Gui, Show, h%GuiHeight% w%GUIWidth% x%XPosition% y%YPosition%, %FullScriptName%
+Gui, Show, h%GuiHeight% w%GUIWidth%, %FullScriptName%
 
 
 
@@ -490,15 +479,12 @@ Return
 SchedulePost:
 Gui, submit, NoHide
 
-WinGetPos, XPosition, YPosition, , ,  A
 
 ; Save Settings.ini
 ; ------------------------------------------------
 IniWrite, %ConfirmBeforeSubmit%, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit
 IniWrite, %AutoUpdateCheck%, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck
 IniWrite, %ErrorLogToDiscord%, %SettingsIniFilepath%, %ScriptSettingsSection%, ErrorLogToDiscord
-IniWrite, %XPosition%, %SettingsIniFilepath%, %ScriptSettingsSection%, XPosition
-IniWrite, %YPosition%, %SettingsIniFilepath%, %ScriptSettingsSection%, YPosition
 
 
 ; Re-use an existing errorlog or create new directory
@@ -545,8 +531,6 @@ if(InputRumbleCustomRTMP){
 
 ; Gui, Add, 
 
-
-ShowResultsScreen:
 ToolTip ; hide any existing tooltips
 
 Gui, Destroy
@@ -579,6 +563,11 @@ IniRead, RumbleCustomRTMPs, %PostStatusesFilepath%, Livestream,RumbleCustomRTMPs
 Gui, Font, Bold
 Gui, Font, s%GuiFontSize%
 
+
+/*Gui, Add, Button, x%MarginSize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Title
+Gui, Add, Button, x+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Description
+
+*/
 Gui, Add, Button,x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Copy Title
 Gui, Add, Button, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% center gResultsGUIAction, Copy Description
 
@@ -610,19 +599,16 @@ Gui, Font, s10
 Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, RTMPs Updated on Rumble 
 Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vRumbleCustomRTMPs gGUIUpdateVars center, %RumbleCustomRTMPs%
 
-Gui, Font, s%GuiFontSize%
-Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% 
-Gui, Add, Button, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% gResultsGUIAction ,Save Changes
-
 
-Gui, add, text, x%MarginSize%  y+%marginsize% w%ResultButtonAndEditWidth% 0x10  ;Horizontal Line > Etched Gray
+Gui, add, text, x%MarginSize%  y+%marginsizeDoubled% w%ResultButtonAndEditWidth% 0x10  ;Horizontal Line > Etched Gray
 
 Gui, Font, s%GuiFontSize%
-Gui, Add, Button, x%MarginSize% yp+%marginsize% h%ResultButtonHeights% w%ResultButtonWidth% gStartSMP, Start SMP
-Gui, Add, Button, x+%marginsize% h%ResultButtonHeights% w%ResultButtonEditWidth% gUpdateRedirects, Update M.M. Redirects
+Gui, Add, Button, x%MarginSize% y+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Save Changes
+Gui, Add, Button, x+%marginsize% h%ResultButtonHeights% w%ResultButtonEditWidth% gRetryUpload ,Try Failed Again
 
-Gui, Add, Button, x%MarginSize% h%ResultButtonHeights% w%ResultButtonWidth%
-Gui, Add, Button,  x+%marginsize%  h%ResultButtonHeights% w%ResultButtonEditWidth% gRetryUpload ,Try Failed Again
+Gui, Add, Button, x%MarginSize% h%ResultButtonHeights% w%ResultButtonEditWidth% gStartSMP, Start SMP
+; Gui, Font, s10
+Gui, Add, Button,  x+%marginsize% gUpdateRedirects h%ResultButtonHeights% w%ResultButtonEditWidth%, Update M.M. Redirects
 
 Gui, Font, s%GuiFontSize%
 
@@ -632,11 +618,11 @@ Gui, Font, s%GuiFontSize%
 Gui, Add, Button, y%MarginSize% w%ResultButtonEditWidth% Center, Error Log
 Gui, Font, s8
 Gui, Font, Normal
-Gui, Add, Edit,  y+5 h450 w%ResultButtonEditWidth%, %ErrorLogVar%
+Gui, Add, Edit,  y+5 h400 w%ResultButtonEditWidth%, %ErrorLogVar%
 
 ; Gui, Add, Button, x%MarginSize% gRetryUpload h%ResultButtonHeights% w%ResultButtonEditWidth%,Try Failed Again
 
-Gui, Show, x%XPosition% y%YPosition% w%GUIWidth%, %FullScriptName% - Results
+Gui, Show
 
 Return
 
@@ -644,12 +630,6 @@ Return
 
 ; GoSubs
 ; ------------------------------------------------
-
-OpenGiteaPage:
-run, https://freedomain.dev/yuriy/video-uploader/issues
-Return
-
-
 StartSMP:
 ; IniWrite, %A_ScriptFullPath%, %SettingsIniFilepath%, Filepaths, SMPFilepath 
 IniRead, SocialMediaPosterFilepath, %SettingsIniFilepath%, Filepaths, SocialMediaPosterFilepath, %A_Space%
@@ -680,6 +660,8 @@ if(SocialMediaPosterFilepath = "" or !FileExist(SocialMediaPosterFilepath)){
 
 UpdateRedirects:
 gosub, MediaManagerUpdate
+
+
 Return
 
 

Lib/Freedomain-Posters-Shared-Functions

@@ -1 +1 @@
-Subproject commit cf56ae8136def874793895733d595349b20d9c19
+Subproject commit 738e1af44353f55a3bd4684139381eaaf57bd8ef

Modules/Odysee-Schedule.ahk

@@ -43,10 +43,9 @@ OdyseeLivestreamSlug := "livestream-" . OdyseeLivestreamDate
 OdyseeURLSLUG := LBRYCMDTextReplacement(OdyseeLivestreamSlug)
 IniWrite, %OdyseeURLSLUG%, %PostStatusesFilepath%, Livestream,OdyseeURLSLUG
 
-/*Xpath = (//div[@class='form-field__prefix'])[1]
+Xpath = (//div[@class='form-field__prefix'])[1]
 try OdyseeChannelURL := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
 
-*/
 
 Message = Inputting Livestream Information
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
@@ -232,7 +231,7 @@ if(LivestreamThumbnail != ""){
 Message = Submitting Livestream
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
 
-; Click Create Button at bottom of the screen
+; Click Create Button in the confirmation popup
 Xpath = //span[contains(text(),'Create')]
 Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
 if(Status){
@@ -241,10 +240,8 @@ if(Status){
 	Return
 }
 
-sleep, 1000
-
 ; Click confirm button in the popup
-Xpath = //span[contains(text(),'Confirm')]
+Xpath = //button[@aria-label='Confirm']//span[@class='button__content']
 Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
 if(Status){
 	Message = Failed to click "Confirm" button in confirmation popup
@@ -252,15 +249,8 @@ if(Status){
 	Return
 }
 
-
-IniRead, OdyseeChannelURL, %SettingsIniFilepath%, %ScriptSettingsSection%, OdyseeChannelURL, %A_Space%
-if(!OdyseeChannelURL){
-	OdyseeChannelURL := "https://odysee.com/@freedomain:b/"
-	IniWrite, %OdyseeChannelURL%, %SettingsIniFilepath%, %ScriptSettingsSection%, OdyseeChannelURL
-}
-
-
-OdyseeLivestreamURL := OdyseeChannelURL .  OdyseeURLSLUG
+OdyseeLivestreamURL := "https://" . OdyseeChannelURL .  OdyseeURLSLUG
+; OdyseeURL := "https://" . OdyseeURL
 IniWrite, %OdyseeLivestreamURL%, %PostStatusesFilepath%, Livestream,OdyseeLivestreamURL