From e5570dd61c044f7da1f1e2cf6491e38166c3cc67 Mon Sep 17 00:00:00 2001 From: yuriy Date: Sat, 29 Jul 2023 20:34:19 -0400 Subject: [PATCH] hardcoded -reuse chrome tabs- variable, removed the checkbox and removed all old, commented out screenshot function calls --- Freedomain Video Uploader.ahk | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/Freedomain Video Uploader.ahk b/Freedomain Video Uploader.ahk index 815f411..3b8648c 100644 --- a/Freedomain Video Uploader.ahk +++ b/Freedomain Video Uploader.ahk @@ -105,7 +105,6 @@ ErrorLogVar := global ReuseTabs ; reuse tabs variable global DevMode -global ScreenshotResult global LBRYNetFilepath LBRYNetFilepath := "C:\Program Files\LBRY\resources\static\daemon\lbrynet.exe" @@ -159,15 +158,19 @@ IniRead, UpdateAvailable, %SettingsIniFilepath%, %ScriptSettingsSection%, Update ; Msgbox % "SettingsIniFilepath: " SettingsIniFilepath ; Msgbox % "UpdateAvailable: " UpdateAvailable IniRead, DevMode, %SettingsIniFilepath%, General, DevMode, 0 -IniRead, ScreenshotResult, %SettingsIniFilepath%, General, ScreenshotResult, 0 IniRead, TotalVideosUploaded, %SettingsIniFilepath%, General, TotalVideosUploaded, 0 ; Checkbox Settings IniRead, ShowTooltipProgress, %SettingsIniFilepath%, General, ShowTooltipProgress, 1 (ShowTooltipProgress)?(ShowTooltipProgressCheckStatus := 1) : (ShowTooltipProgressCheckStatus := 0) +/* +@todo delete later IniRead, ReuseTabs, %SettingsIniFilepath%, General, ReuseTabs, 1 (ReuseTabs)?(ReuseTabsCheckStatus := 1) : (ReuseTabsCheckStatus := 0) +*/ +; ReuseTabs is permanantly on. There is never a time where you want to create new tabs for every website +ReuseTabs := 1 IniRead, AutoUpdateCheck, %SettingsIniFilepath%, General, AutoUpdateCheck, 1 (AutoUpdateCheck)?(AutoUpdateCheckCheckStatus := 1) : (AutoUpdateCheckCheckStatus := 0) @@ -385,7 +388,6 @@ if(FileExist(VideoLinksIniFile)){ ; MISC IniRead, ErrorLoggingFilePath, %VideoLinksIniFile%, Misc, ErrorLoggingFilePath, %A_Space% - IniRead, ScreenShotSavePath, %VideoLinksIniFile%, Misc, ScreenShotSavePath, %A_Space% if(VideoFileSizeInMB < 50){ IniRead, Telegram, %VideoLinksIniFile%, Misc, Telegram, %A_Space% @@ -393,18 +395,16 @@ if(FileExist(VideoLinksIniFile)){ } -; Create a directory for errorlogging and screenshots if this is the first time working on this project +; Create a directory for errorlogging if this is the first time working on this project if(ErrorLoggingFilePath = ""){ ; DevModeMsgBox("generating filepath") FormatTime, TodayDate , YYYYMMDDHH24MISS, yyyyMMdd_hhmmss ErrorLoggingDirectory := ErrorLoggingFolder . "\" . TodayDate . "_FVU" FileCreateDir, %ErrorLoggingDirectory% ErrorLoggingFilePath := ErrorLoggingFolder . "\" . TodayDate . "_FVU\ErrorLogging.txt" ; Set locaiton where error logging text will go - ScreenShotSavePath = %ErrorLoggingDirectory% ; Write both filepaths to .ini file IniWrite, %ErrorLoggingFilePath%, %VideoLinksIniFile%, Misc, ErrorLoggingFilePath - IniWrite, %ScreenShotSavePath%, %VideoLinksIniFile%, Misc, ScreenShotSavePath } if(PodcastNumber = ""){ @@ -756,12 +756,12 @@ Gui, Add, GroupBox,r5 y+0 x%PageTwoXStartPos% w%PageTwoGroupBoxWidth%,Settings ; Gui, Add, Text, y%CheckboxesStartYPos% x+80, Miscellaneous Settings: ; Gui, Font, Normal ; Gui, Add, Checkbox, vIncludeDescriptionWhenPostingToVideos %IncludeDescriptionWhenPostingToVideos%, Include Description in #videos Posts -Gui, Add, Checkbox, xp+10 yp+20 vReuseTabs Checked%ReuseTabsCheckStatus% gUpdateVars, Try to Re-Use Tabs +; Gui, Add, Checkbox, vReuseTabs Checked%ReuseTabsCheckStatus% gUpdateVars, Try to Re-Use Tabs +Gui, Add, Checkbox, xp+10 yp+20 vAutoUpdateCheck gUpdateVars Checked%AutoUpdateCheckCheckStatus%, Auto Update Check Gui, Add, Checkbox, vShowTooltipProgress Checked%ShowTooltipProgressCheckStatus% gUpdateVars,Show Tooltip Progress -Gui, Add, Checkbox, vKillLBRYAfterUpload Checked%KillLBRYAfterUploadCheckStatus% ,Kill LBRY After Uploading -Gui, Add, Checkbox, vAutoUpdateCheck gUpdateVars Checked%AutoUpdateCheckCheckStatus%, Auto Update Check +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 Finish +Gui, Add, Checkbox, vPingOnCompletion gUpdateVars Checked%PingOnCompletionCheckStatus%, Discord Ping Upon Completion ; Gui, Add, Checkbox, vAutoUploadErrorLog gUpdateVars Checked%AutoUploadErrorLog%, Auto-Upload Large Errors @@ -2318,7 +2318,6 @@ if(DevMode){ Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000) if(Status){ SaveOrPostProgress(Message:="Post Failed: Check Login Status, or Website is Down",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging") - ; TakeScreenshotOfPage(ScreenShotSavePath) Return } @@ -2606,7 +2605,6 @@ IniWrite, %ShareLink%, %VideoLinksIniFile%, URLs, LocalsURL AddToTotalVideosUploadedCount() SaveDriverURL() -; TakeScreenshotOfPage(ScreenShotSavePath) Return @@ -2854,7 +2852,6 @@ Loop, %Number_of_loops_to_Check_Upload_status% { AddToTotalVideosUploadedCount() SaveDriverURL() - ; TakeScreenshotOfPage(ScreenShotSavePath) Return @@ -3232,7 +3229,6 @@ IniWrite, %BitChuteURL%, %VideoLinksIniFile%, URLs, BitChuteURL SaveDriverURL() AddToTotalVideosUploadedCount() -; TakeScreenshotOfPage(ScreenShotSavePath) Return @@ -3692,7 +3688,6 @@ SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,Disc IniWrite, %BrighteonURL%, %VideoLinksIniFile%, URLs, BrighteonURL SaveDriverURL() AddToTotalVideosUploadedCount() -; TakeScreenshotOfPage(ScreenShotSavePath) Return ; -------------------------------/Brighteon Upload------------------------------- @@ -4077,7 +4072,6 @@ SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,Disc IniWrite, %DailyMotionURL%, %VideoLinksIniFile%, URLs, DailyMotionURL SaveDriverURL() AddToTotalVideosUploadedCount() -; TakeScreenshotOfPage(ScreenShotSavePath) Return ; -------------------------------/DailyMotion------------------------------- @@ -4772,7 +4766,6 @@ Message = Upload Complete: %RumbleURL% SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging") SaveDriverURL() AddToTotalVideosUploadedCount() -; TakeScreenshotOfPage(ScreenShotSavePath) Return