yeet

Author: RhythmicSys

pom.xml

@@ -91,6 +91,7 @@
             <version>1.5.6</version>
         </dependency>
 
+
     </dependencies>
 
 </project>

src/main/java/simplexity/Main.java

@@ -9,16 +9,22 @@
 import simplexity.commands.ExitCommand;
 import simplexity.commands.HelpCommand;
 import simplexity.commands.ReloadCommand;
-import simplexity.config.TTSConfig;
+import simplexity.config.AbstractConfig;
+import simplexity.config.config.AwsConfig;
+import simplexity.config.config.ReplaceTextConfig;
+import simplexity.config.config.TTSConfig;
 import simplexity.httpserver.LocalServer;
 import simplexity.setup.PollySetup;
+import simplexity.util.ColorTags;
 import simplexity.util.Util;
 
+import java.util.ArrayList;
 import java.util.Scanner;
 
 public class Main {
     private static final Logger logger = LoggerFactory.getLogger(Main.class);
     private static CommandManager commandManager;
+    private static ArrayList<AbstractConfig> configs = new ArrayList<>();
     public static PollyHandler pollyHandler;
     private static SpeechHandler speechHandler;
     public static Scanner scanner;
@@ -29,9 +35,10 @@ public static void main(String[] args) {
         scanner = new Scanner(System.in);
         commandManager = new CommandManager();
         registerCommands(commandManager);
-        TTSConfig.getInstance().reloadConfig();
+        setupConfigs();
         PollySetup.setupPollyAndSpeech();
         LocalServer.run();
+        System.out.println(ColorTags.parse("<red>TEST</red> <bold> THIS IS A TEST</bold>"));
         while (runApp) {
             String input = scanner.nextLine();
             if (!commandManager.runCommand(input)) {
@@ -46,6 +53,15 @@ private static void registerCommands(CommandManager commandManager) {
         commandManager.registerCommand(new ReloadCommand("--reload", "Reloads the configuration"));
     }
 
+    private static void setupConfigs(){
+        AwsConfig awsConfig = new AwsConfig();
+        configs.add(awsConfig);
+        TTSConfig ttsConfig = new TTSConfig();
+        configs.add(ttsConfig);
+        ReplaceTextConfig replaceTextConfig = new ReplaceTextConfig();
+        configs.add(replaceTextConfig);
+    }
+
     public static CommandManager getCommandManager() {
         return commandManager;
     }

src/main/java/simplexity/amazon/SpeechHandler.java

@@ -11,7 +11,9 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.Main;
-import simplexity.config.TTSConfig;
+import simplexity.config.config.AwsConfig;
+import simplexity.config.config.ReplaceTextConfig;
+import simplexity.config.config.TTSConfig;
 import simplexity.messages.Errors;
 import simplexity.util.Util;
 
@@ -22,7 +24,7 @@ public class SpeechHandler {
     private VoiceId voiceId;
 
     public SpeechHandler() {
-        this.voiceId = TTSConfig.getInstance().getDefaultVoice();
+        this.voiceId = AwsConfig.getInstance().getDefaultVoice();
         Util.log(logger, "Initialized SpeechHandler with default voice: " + voiceId.toString(), Level.INFO);
     }
 
@@ -57,13 +59,13 @@ public void processSpeech(String text) {
 
     public String replaceText(String text) {
         TTSConfig ttsConfig = TTSConfig.getInstance();
-        for (String key : ttsConfig.getReplaceText().keySet()) {
-            text = text.replace(key, ttsConfig.getReplaceText().get(key));
+        for (String key : ReplaceTextConfig.getInstance().getReplaceText().keySet()) {
+            text = text.replace(key, ReplaceTextConfig.getInstance().getReplaceText().get(key));
         }
-        for (String key : ttsConfig.getVoicePrefixes().keySet()) {
+        for (String key : AwsConfig.getInstance().getVoicePrefixes().keySet()) {
             if (text.startsWith(key)) {
                 text = text.replace(key, "");
-                voiceId = ttsConfig.getVoicePrefixes().get(key);
+                voiceId = AwsConfig.getInstance().getVoicePrefixes().get(key);
             }
         }
         return text;

src/main/java/simplexity/commands/ReloadCommand.java

@@ -1,7 +1,7 @@
 package simplexity.commands;
 
 import org.slf4j.event.Level;
-import simplexity.config.TTSConfig;
+import simplexity.config.config.TTSConfig;
 import simplexity.httpserver.LocalServer;
 import simplexity.messages.Output;
 import simplexity.util.Util;

src/main/java/simplexity/config/AbstractConfig.java

@@ -0,0 +1,56 @@
+package simplexity.config;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
+import simplexity.util.Util;
+
+import java.io.File;
+
+public abstract class AbstractConfig {
+    private static final Logger logger = LoggerFactory.getLogger(AbstractConfig.class);
+    protected Config config;
+
+    public AbstractConfig(String configPath, String folderPath) {
+        loadConfig(configPath, folderPath);
+        reloadConfig();
+    }
+
+    private void loadConfig(String configPath, String folderPath) {
+        Util.log(logger, "Loading configuration from directory: " + folderPath + ", file:" + configPath, Level.INFO);
+        File folder = checkForOrCreateFolder(folderPath);
+        if (folder == null) {
+            Util.logAndPrint(logger, "Unable to continue loading: " + configPath, Level.WARN);
+        }
+        File configFile = new File(folder, configPath);
+        if (!configFile.exists()) {
+            Util.log(logger, "Config file does not exist: " + configPath, Level.INFO);
+            createDefaultConfig(configFile);
+        }
+        this.config = ConfigFactory.parseFile(configFile).resolve();
+        Util.log(logger, "Loaded configuration from: " + configPath, Level.INFO);
+    }
+
+    private File checkForOrCreateFolder(String folderPath) {
+        File directory = new File(folderPath);
+        if (!directory.exists()) {
+            if (!directory.mkdirs()) {
+                Util.logAndPrint(logger, "Failed to create directory: " + folderPath, Level.WARN);
+                return null;
+            } else {
+                Util.log(logger, "Successfully created directory: " + folderPath, Level.INFO);
+            }
+        }
+        return directory;
+    }
+
+    public abstract void createDefaultConfig(File configFile);
+
+    public abstract void reloadConfig();
+
+    public Config getConfig() {
+        return config;
+    }
+}