diff --git a/.gitignore b/.gitignore index 64e03e5..7a1ef6f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,5 @@ body.txt **/Templates **/Testing **/ConnectToActiveChromeTab.ahk -Freedomain Social Media Poster.exe +Freedomain Social Media Poster*.exe Compile Scripts to EXE.ahk \ No newline at end of file diff --git a/Freedomain Social Media Poster.ahk b/Freedomain Social Media Poster.ahk index 08f6e47..cb067d8 100644 --- a/Freedomain Social Media Poster.ahk +++ b/Freedomain Social Media Poster.ahk @@ -31,7 +31,7 @@ global UpdateVersionNumber ;---Notes/Extra Info/#Includes------------------------------------------------------ ScriptName = Freedomain Social Media Poster -ScriptVersion = 2.71 +ScriptVersion = 2.73 FullScriptName := ScriptName . " " . ScriptVersion ;---ToDo--- @@ -191,7 +191,6 @@ if(ErrorLoggingDirectory = "LastPost"){ ; if passed argument is .exe file, then script has just been udpated and we need to move the old version if(InStr(ErrorLoggingDirectory,ScriptName) and InStr(ErrorLoggingDirectory,".exe")){ - SaveOrPostProgress(Message:="Starting Up: Moving Old Version",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar") ; create backups folder if it doesn't exist BackupsFolder = %LibFolder%\Backups\ @@ -204,20 +203,19 @@ if(InStr(ErrorLoggingDirectory,ScriptName) and InStr(ErrorLoggingDirectory,".exe ; move old version to backups folder, overwrite if name conflict FileMove, %ErrorLoggingDirectory%, %BackupsFolder%\*, 1 if(ErrorLevel){ ; most likely because the old version hasn't finished exiting yet - sleep, 2000 - FileMove, %ErrorLoggingDirectory%, %BackupsFolder%\*, 1 - if(ErrorLevel){ - MsgBox,,Update Successful, Update was successful`, but unable to move old version to the Backups folder.`nPlease move it or delete it manually. - } + SaveOrPostProgress(Message:="Starting Up: Moving Old Version",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar") + sleep, 2000 + FileMove, %ErrorLoggingDirectory%, %BackupsFolder%\*, 1 + if(ErrorLevel){ + MsgBox,,Update Successful, Update was successful`, but unable to move old version to the Backups folder.`nPlease move it or delete it manually. } ToolTip - ; MsgBox,,Update Successful, Previous version was backed up to: %BackupsFolder% } - +} if(StrLen(ErrorLoggingDirectory) > 5 and !InStr(ErrorLoggingDirectory, ".exe")){ ; if argument was passed in, read contents from that directory - SaveOrPostProgress(Message:="Starting Up: Reading Information from Files",PostType:="Tooltip") + ; SaveOrPostProgress(Message:="Starting Up: Reading Information from Files",PostType:="Tooltip") SkipUpdateCheckThisRun := 1 @@ -265,10 +263,10 @@ if(StrLen(ErrorLoggingDirectory) > 5 and !InStr(ErrorLoggingDirectory, ".exe")){ ; Append bitchute url to bottom of description PostBody := PostBody . "`n`n" . VideoURL -/* Msgbox % "PostTitle: " PostTitle - Msgbox % "PostBody: " PostBody + ; Msgbox % "PostTitle: " PostTitle + ; Msgbox % "PostBody: " PostBody - */ + Discord := 0 Telegram := 0 } @@ -420,7 +418,7 @@ Gui, Add, Edit, x%MarginSpace% y+2 vImageAttachmentFilepath gUpdateVars h33 w%Im Gui, Add, Button, gSelectFilepath w%ImageSelectionButtonWidth% x+M yp+0 h33, Select Gui, Font, Bold -Gui, Add, GroupBox,r2.5 x%MarginSpace% y+15 Center w%TemplatesGroupBoxWidth%, Other +Gui, Add, GroupBox,r2.5 x%MarginSpace% y+30 Center w%TemplatesGroupBoxWidth%, Other Gui, Font, Normal Gui, Add, Button,xp+%Marginspace% yp+35 w%EditBoxThirdsWidth% h30 gSaveAsTemplate, Save As Template Gui, Add, Button,x+%MarginSpace% w%EditBoxThirdsWidth% h30 gLoadTemplate, Load Template @@ -465,10 +463,11 @@ Gui, Font, s%GUINormalFontSize% Gui, Add, GroupBox,r4 x%PlatformsGroupBoxXLocation% y%MarginSpace% w300, Settings Gui, Font, s11 Gui, Font, Normal -Gui, Add, Checkbox, xp+10 yp+25 vReuseTabs Checked%ReuseTabsCheckStatus% gUpdateVars, Try to Re-Use Tabs +Gui, Add, Checkbox, xp+10 yp+25 vAutoUpdateCheck Checked%AutoUpdateCheckCheckStatus% gUpdateVars, Auto Update Check +Gui, Add, Checkbox, vReuseTabs Checked%ReuseTabsCheckStatus% gUpdateVars, Try to Re-Use Tabs ; Gui, Add, Checkbox, vNewChromeWindow Checked%AutoUpdateCheckCheckStatus% gUpdateVars, Create New Chrome Window (WIP) Gui, Add, Checkbox,vShowTooltipProgress Checked%ShowTooltipProgressCheckStatus% gUpdateVars, Show Tooltip of Progress -Gui, Add, Checkbox, vAutoUpdateCheck Checked%AutoUpdateCheckCheckStatus% gUpdateVars, Auto Update Check +; Gui, Add, Checkbox, vAutoUpdateCheck Checked%AutoUpdateCheckCheckStatus% gUpdateVars, Auto Update Check Gui, Add, Checkbox, vSaveTagsBetweenPosts Checked%SaveTagsBetweenPostsCheckStatus% gUpdateVars, Save Tags Between Posts Gui, Add, Checkbox, vPauseBetweenPosts Checked%PauseBetweenPostsCheckCheckStatus% gUpdateVars, Pause Briefly Between Posts ; Gui, Add, Checkbox, vAutoRestartChromeDebug Checked%PauseBetweenPostsCheckCheckStatus% gUpdateVars, Auto Restart Chrome in Debug Mode @@ -479,7 +478,7 @@ Gui, Font, s%GUINormalFontSize% Gui, Font, Bold -Gui, Add, GroupBox,r8 x%PlatformsGroupBoxXLocation% y185 w300, Platforms +Gui, Add, GroupBox,r7 x%PlatformsGroupBoxXLocation% y185 w300, Platforms Gui, Font, Normal Gui, Add, Checkbox, xp+10 yp+30 vDiscord Checked%DiscordCheckStatus% gUpdateVars, Discord Gui, Add, Checkbox, y+7 vTelegram Checked%TelegramCheckStatus% gUpdateVars, Telegram @@ -488,12 +487,13 @@ Gui, Add, Checkbox, y+7 vMinds Checked%MindsCheckStatus% gUpdateVars, Minds Gui, Add, Checkbox, y+7 vGab Checked%GabCheckStatus% gUpdateVars, Gab Gui, Add, Checkbox, y+7 vLocals Checked%LocalsCheckStatus% gUpdateVars, Locals Gui, Add, Checkbox, y+7 vTwetch Checked%TwetchCheckStatus% gUpdateVars, Twetch +Gui, Add, Checkbox, y+7vMeWe Checked%MeWeCheckStatus% gUpdateVars, MeWe ; Second Row ; Gui, Add, Checkbox, vLinkedIn Checked%LinkedINCheckStatus% gUpdateVars, LinkedIn -Gui, Add, Checkbox, x+60 yp-185 vMeWe Checked%MeWeCheckStatus% gUpdateVars, MeWe -Gui, Add, Checkbox, y+7 vLinkedIn Checked%LinkedINCheckStatus% gUpdateVars, LinkedIn +Gui, Add, Checkbox, x+75 yp-210 vLinkedIn Checked%LinkedINCheckStatus% gUpdateVars, LinkedIn +; Gui, Add, Checkbox, y+7 vLinkedIn Checked%LinkedINCheckStatus% gUpdateVars, LinkedIn Gui, Add, Checkbox, y+7 vThinkspot Checked%ThinkSpotCheckStatus% gUpdateVars, Thinkspot Gui, Add, Checkbox, y+7 vFlote Checked%FloteCheckStatus% gUpdateVars, Flote Gui, Add, Checkbox, y+7 vParler Checked%ParlerCheckStatus% gUpdateVars, Parler diff --git a/Lib/SharedFunctions.ahk b/Lib/SharedFunctions.ahk index 92ac4c3..fa9e414 100644 --- a/Lib/SharedFunctions.ahk +++ b/Lib/SharedFunctions.ahk @@ -97,7 +97,7 @@ UpdateScript(){ Return } Else IfMsgBox No, { SaveOrPostProgress(Message:="Downloading Update",PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging") - Msgbox, downloading to: %A_ScriptDir%\%UpdateExeName% + ; Msgbox, downloading to: %A_ScriptDir%\%UpdateExeName% UrlDownloadToFile, %exeURL%, %UpdateExeFilepath% run, "%UpdateExeFilepath%" "%A_ScriptFullPath%" ExitApp