diff --git a/.gitignore b/.gitignore index 0391a7e..585cf56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +Freedomain Livestream Scheduler.exe +Lib/Templates-FLS/ Settings.ini VideoLinks.ini body.txt diff --git a/Assets/Icon.ico b/Assets/Icon.ico new file mode 100644 index 0000000..0aaca39 Binary files /dev/null and b/Assets/Icon.ico differ diff --git a/Assets/Icon.png b/Assets/Icon.png new file mode 100644 index 0000000..638e95b Binary files /dev/null and b/Assets/Icon.png differ diff --git a/Assets/Icon.xcf b/Assets/Icon.xcf new file mode 100644 index 0000000..b2257b0 Binary files /dev/null and b/Assets/Icon.xcf differ diff --git a/Compile AHK to EXE.ahk b/Compile AHK to EXE.ahk new file mode 100644 index 0000000..0a6fe6c --- /dev/null +++ b/Compile AHK to EXE.ahk @@ -0,0 +1,84 @@ +;---ENVIRONMENT--------------------------------------------------------------------- +#NoEnv ; Recommended for performance and compatibility with future AutoHotkey releases. +;#Warn ; Enable warnings to assist with detecting common errors. +;DetectHiddenWindows, On +#SingleInstance, Force +DetectHiddenWindows, ON +SendMode Input ; Recommended for new scripts due to its superior speed and reliability. +SetWorkingDir %A_ScriptDir% ; Ensures a consistent starting directory. +;SetKeyDelay, 500 +CoordMode, ToolTip, Screen +CoordMode, Mouse, Screen +; #NoTrayIcon +; Menu, Tray, Icon, RMScriptManager.ico + +;---Notes/Extra Info/#Includes------------------------------------------------------ + + +;---VARIABLES----------------------------------------------------------------------- +ScriptName = Freedomain Livestream Scheduler + +AHKFilepath = %A_ScriptDir%\%ScriptName%.ahk +Exefilepath = %A_ScriptDir%\%ScriptName%.exe +icopath = %A_ScriptDir%\Assets\Icon.ico +VersionIniFP = %A_ScriptDir%\Version.ini + + +;---MAIN SCRIPT--------------------------------------------------------------------- + +; Bump the version number in the version.ini file +IniRead, VersionNumber, %VersionIniFP%, %ScriptName%, Version, 0.0 ; , Filename, Section, Key [, Default] +VersionNumber += .01 +VersionNumber := SubStr(VersionNumber, 1, 4) + +IniWrite, %VersionNumber%, %VersionIniFP%,%ScriptName%, Version + + + +; Kill any active intances of the uploaders so the .exe file can be overwriten by the compilation +process, close, %ScriptName%.exe + +sleep, 1000 + +; Delete the .exe file so it can be repalced +if(FileExist(Exefilepath)){ + FileDelete, %Exefilepath% + if(ErrorLevel){ + msgbox, failed to delete Exe file. Please delete manually and re-run the compiler. + ExitApp + } +} + + +if(!FileExist(AHKFilepath)){ + msgbox, %AHKFilepath% does not exist`nExiting + ExitApp +} + + +if(!FileExist(icopath)){ + msgbox, %icopath% does not exist`nExiting + ExitApp +} + + +run, %comspec% /c ""C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%"" + + +; OldNotify(ScriptToCompile,"Compiled Successfully",5) +; sleep, 5000 +ExitApp + + + + + + + + + + + + + +;---FUNCTIONS----------------------------------------------------------------------- diff --git a/Freedomain Livestream Scheduler.ahk b/Freedomain Livestream Scheduler.ahk index a8aaa24..59ed7cc 100644 --- a/Freedomain Livestream Scheduler.ahk +++ b/Freedomain Livestream Scheduler.ahk @@ -250,7 +250,7 @@ Gui, Add, Checkbox, checked vLocals, Locals ; Gui, Add, Checkbox,checked vOdysee, Odysee Gui, Font, Bold -Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% y+100 gSaveAsTemplate, Save as Template +Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% y+50 gSaveAsTemplate, Save as Template Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% gLoadTemplate, Load Template Gui, Font, s15 @@ -272,7 +272,7 @@ Return SaveAsTemplate: Gui, submit, NoHide ; Update variables for all modified fields -TemplateDirectory = %A_ScriptDir%\Lib\Templates +TemplateDirectory = %A_ScriptDir%\Lib\Templates-%ScriptAbbreviatedName% if(!FileExist(TemplateDirectory)){ FileCreateDir, %TemplateDirectory% } @@ -281,7 +281,7 @@ InputBox, TemplateName, Input Name, Please Input Name for the Template: if(ErrorLevel) Return -TemplateDirectory = %A_ScriptDir%\Lib\Templates\%TemplateName% +TemplateDirectory = %TemplateDirectory%\%TemplateName% ErrorLoggingDirectory := TemplateDirectory ; FileCreateDir, %TemplateDirectory% CreateErrorLoggingFiles(ErrorLoggingDirectory) @@ -304,7 +304,7 @@ LoadTemplate: Message = Loading Template SaveOrPostProgress(Message:=Message,PostType:="Tooltip,DiscordErrorLogging") -ErrorLoggingDirectory = %A_ScriptDir%\Lib\Templates\ +ErrorLoggingDirectory = %A_ScriptDir%\Lib\Templates-%ScriptAbbreviatedName%\ FileSelectFolder, ErrorLoggingDirectory, %ErrorLoggingDirectory% if(ErrorLevel){ Tooltip diff --git a/Lib/Freedomain-Posters-Shared-Functions b/Lib/Freedomain-Posters-Shared-Functions index b8ffb10..2e0c81f 160000 --- a/Lib/Freedomain-Posters-Shared-Functions +++ b/Lib/Freedomain-Posters-Shared-Functions @@ -1 +1 @@ -Subproject commit b8ffb10db187c70219c594ddfe7cdebc6885d552 +Subproject commit 2e0c81f34fa96f659153e5daba1e8be5ba28fd0c diff --git a/Version.ini b/Version.ini new file mode 100644 index 0000000..6ead315 Binary files /dev/null and b/Version.ini differ