diff --git a/config.py b/config.py index 9b4b9ba..0688f54 100644 --- a/config.py +++ b/config.py @@ -2,12 +2,14 @@ from enum import Enum credentialsNickname = "praxis_bot" -twitch_module: bool = True -discord_module: bool = True +twitch_module: bool = False +discord_module: bool = False -autojoinTwitchChannels = ("thecuriousnerd") +test_module: bool = True -selected_discordTTSChannels = ("431129571308339210") +autojoinTwitchChannels = ["thecuriousnerd"] + +selected_discordTTSChannels = ["431129571308339210"] class Speaker(Enum): diff --git a/db.py b/db.py index 7fcb395..d8be4d2 100644 --- a/db.py +++ b/db.py @@ -73,5 +73,6 @@ if __name__ == "__main__": credentials_manager = credentials.Credentials_Module() credentials_manager.load_credentials() - testModule.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") - testModule.setup_engine() + testModule.dbCredential = credentials_manager.find_DB_Credential(config.credentialsNickname) + + testModule.setup_engine() \ No newline at end of file diff --git a/discord_script.py b/discord_script.py index 188b169..907aa3c 100644 --- a/discord_script.py +++ b/discord_script.py @@ -170,9 +170,10 @@ if __name__ == "__main__": credentials_manager = credentials.Credentials_Module() credentials_manager.load_credentials() - testModule.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") - testModule.discordCredential = credentials_manager.find_Discord_Credential("praxis_bot") - testModule.main() + testModule.dbCredential = credentials_manager.find_DB_Credential(config.credentialsNickname) + testModule.discordCredential = credentials_manager.find_Discord_Credential(config.credentialsNickname) - testModule.main() + for ttsChannel in config.selected_discordTTSChannels: + testModule.selected_ttsChannels.append(int(ttsChannel)) + testModule.main() \ No newline at end of file diff --git a/main.py b/main.py index 56a59bb..054f577 100644 --- a/main.py +++ b/main.py @@ -7,6 +7,8 @@ import time import twitch_script import discord_script +import test_module + import utilities_script as utility import config as config @@ -14,57 +16,72 @@ import credentials import threading -twitch_chat: twitch_script.Twitch_Module +twitchModule_: twitch_script.Twitch_Module +discordModule_: discord_script.Discord_Module +testModule_: test_module.Test_Module + credentials_manager: credentials.Credentials_Module -discord_connection: discord_script.Discord_Module def main(inputArg): args = utility.get_args(inputArg) def twitch_module_init(dbCert, twitchCert): - twitch_chat.db_manager.setup_engine(dbCert) - twitch_chat.twitchCredential = twitchCert - - for twitchChannel in config.autojoinTwitchChannels.split(): - twitch_chat.join_channel(None, twitchChannel) + print("-init [TWITCH Module]") + twitchModule_.db_manager.setup_engine(dbCert) + twitchModule_.twitchCredential = twitchCert + for twitchChannel in config.autojoinTwitchChannels: + twitchModule_.join_channel(None, twitchChannel) def discord_module_init(dbCert, discordCert): - discord_connection.dbCredential = dbCert - discord_connection.discordCredential = discordCert + print("-init [DISCORD Module]") + discordModule_.dbCredential = dbCert + discordModule_.discordCredential = discordCert - for ttsChannel in config.selected_discordTTSChannels.split(): - discord_connection.selected_ttsChannels.append(int(ttsChannel)) + for ttsChannel in config.selected_discordTTSChannels: + discordModule_.selected_ttsChannels.append(int(ttsChannel)) - discord_connection.main() + discordModule_.main() +def test_module_init(dbCert, Empty): + print("-init [TEST Module]") + #testModule_.dbCredential = dbCert + testModule_.main() def thread_main(): - global twitch_chat - global discord_connection global credentials_manager + global twitchModule_ + global discordModule_ + global testModule_ - twitch_chat = twitch_script.Twitch_Module() - discord_connection = discord_script.Discord_Module() credentials_manager = credentials.Credentials_Module() + twitchModule_ = twitch_script.Twitch_Module() + discordModule_ = discord_script.Discord_Module() + testModule_ = test_module.Test_Module() + credentials_manager.load_credentials() dbCert: credentials.DB_Credential = credentials_manager.find_Credential(credentials.DB_Credential, config.credentialsNickname) threads = [] if config.twitch_module == True: twitchCert: credentials.Twitch_Credential = credentials_manager.find_Twitch_Credential(config.credentialsNickname) - twitch = threading.Thread(target=twitch_module_init, args=(dbCert, twitchCert)) - threads.append(twitch) - twitch.start() + thread_ = threading.Thread(target=twitch_module_init, args=(dbCert, twitchCert)) + threads.append(thread_) + thread_.start() if config.discord_module == True: discordCert: credentials.Discord_Credential = credentials_manager.find_Discord_Credential(config.credentialsNickname) - discord = threading.Thread(target=discord_module_init, args=(dbCert, discordCert)) - threads.append(discord) - discord.start() + thread_ = threading.Thread(target=discord_module_init, args=(dbCert, discordCert)) + threads.append(thread_) + thread_.start() + + if config.test_module == True: + thread_ = threading.Thread(target=test_module_init, args=(dbCert, None)) + threads.append(thread_) + thread_.start() print("---Post Thread Creation Test---") for t in threads: diff --git a/test_module.py b/test_module.py new file mode 100644 index 0000000..605d286 --- /dev/null +++ b/test_module.py @@ -0,0 +1,21 @@ +import config as config +import db + +import credentials + +class Test_Module(): + def __init__(self): + super().__init__() + #self.dbCredential: credentials.DB_Credential + + def main(self): + print("[TEST Module]> test") + + +if __name__ == "__main__": + testModule = Test_Module() + + credentials_manager = credentials.Credentials_Module() + credentials_manager.load_credentials() + testModule.dbCredential = credentials_manager.find_DB_Credential(config.credentialsNickname) + testModule.main() \ No newline at end of file diff --git a/twitch_script.py b/twitch_script.py index 3f75df5..41f0755 100644 --- a/twitch_script.py +++ b/twitch_script.py @@ -21,8 +21,8 @@ class Twitch_Module(): super().__init__() self.twitchCredential: credentials.Twitch_Credential self.dbCredential: credentials.DB_Credential - self.db_manager: db.db_module = db.db_module() + self.chat: twitch.Chat self.commands = command_loader.load_commands_new(AbstractCommand.CommandType.TWITCH) self.tts_enabled: bool = False @@ -168,6 +168,8 @@ if __name__ == "__main__": credentials_manager = credentials.Credentials_Module() credentials_manager.load_credentials() - testModule.twitchCredential = credentials_manager.find_Twitch_Credential("praxis_bot") - testModule.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") - testModule.join_channel(None ,"thecuriousnerd") + testModule.twitchCredential = credentials_manager.find_Twitch_Credential(config.credentialsNickname) + testModule.dbCredential = credentials_manager.find_DB_Credential(config.credentialsNickname) + + for twitchChannel in config.autojoinTwitchChannels: + testModule.join_channel(None, twitchChannel) \ No newline at end of file