gui updates, odysee small bug fix

Freedomain Livestream Scheduler.ahk

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

Modules/Odysee-Schedule.ahk

@@ -43,9 +43,10 @@ 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")
@@ -231,7 +232,7 @@ if(LivestreamThumbnail != ""){
 Message = Submitting Livestream
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
 
-; Click Create Button in the confirmation popup
+; Click Create Button at bottom of the screen
 Xpath = //span[contains(text(),'Create')]
 Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
 if(Status){
@@ -240,8 +241,10 @@ if(Status){
 	Return
 }
 
+sleep, 1000
+
 ; Click confirm button in the popup
-Xpath = //button[@aria-label='Confirm']//span[@class='button__content']
+Xpath = //span[contains(text(),'Confirm')]
 Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
 if(Status){
 	Message = Failed to click "Confirm" button in confirmation popup
@@ -249,8 +252,15 @@ if(Status){
 	Return
 }
 
-OdyseeLivestreamURL := "https://" . OdyseeChannelURL .  OdyseeURLSLUG
+
-; OdyseeURL := "https://" . OdyseeURL
+IniRead, OdyseeChannelURL, %SettingsIniFilepath%, %ScriptSettingsSection%, OdyseeChannelURL, %A_Space%
+if(!OdyseeChannelURL){
+	OdyseeChannelURL := "https://odysee.com/@freedomain:b/"
+	IniWrite, %OdyseeChannelURL%, %SettingsIniFilepath%, %ScriptSettingsSection%, OdyseeChannelURL
+}
+
+
+OdyseeLivestreamURL := OdyseeChannelURL .  OdyseeURLSLUG
 IniWrite, %OdyseeLivestreamURL%, %PostStatusesFilepath%, Livestream,OdyseeLivestreamURL