Fix up config, update speech effects to be more dynamic and better detected

Author: RhythmicSys

pom.xml

@@ -90,8 +90,17 @@
             <artifactId>logback-classic</artifactId>
             <version>1.5.16</version>
         </dependency>
-
-
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>26.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.4</version>
+        </dependency>
     </dependencies>
 
-</project>
+</project>

src/main/java/simplexity/Main.java

@@ -4,27 +4,25 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.amazon.PollyHandler;
+import simplexity.amazon.PollySetup;
 import simplexity.amazon.SpeechHandler;
 import simplexity.commands.CommandManager;
 import simplexity.commands.ExitCommand;
 import simplexity.commands.HelpCommand;
 import simplexity.commands.ReloadCommand;
-import simplexity.config.AbstractConfig;
-import simplexity.config.config.AwsConfig;
-import simplexity.config.config.ReplaceTextConfig;
-import simplexity.config.config.TtsConfig;
-import simplexity.config.locale.LocaleConfig;
+import simplexity.config.config.ConfigHandler;
+import simplexity.config.config.YmlConfig;
 import simplexity.httpserver.LocalServer;
-import simplexity.amazon.PollySetup;
 import simplexity.util.Logging;
 
-import java.util.ArrayList;
+import java.io.File;
+import java.io.IOException;
 import java.util.Scanner;
 
 public class Main {
     private static final Logger logger = LoggerFactory.getLogger(Main.class);
+    private static YmlConfig ymlConfig;
     private static CommandManager commandManager;
-    private static final ArrayList<AbstractConfig> configs = new ArrayList<>();
     public static PollyHandler pollyHandler;
     private static SpeechHandler speechHandler;
     public static Scanner scanner;
@@ -35,7 +33,15 @@ public static void main(String[] args) {
         scanner = new Scanner(System.in);
         commandManager = new CommandManager();
         registerCommands(commandManager);
-        setupConfigs();
+        File file = new File("config/config.yml");
+        try {
+            ymlConfig = new YmlConfig(file, "config.yml");
+        } catch (IOException e) {
+            System.out.println("Fatal Error: Config was unable to be generated.");
+            e.printStackTrace();
+            return;
+        }
+        ConfigHandler.getInstance().reloadValues(ymlConfig);
         PollySetup.setupPollyAndSpeech();
         LocalServer.run();
         while (runApp) {
@@ -52,17 +58,6 @@ 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);
-        LocaleConfig localeConfig = new LocaleConfig();
-        configs.add(localeConfig);
-    }
-
     public static CommandManager getCommandManager() {
         return commandManager;
     }
@@ -71,20 +66,20 @@ public static PollyHandler getPollyHandler() {
         return pollyHandler;
     }
 
-    public static void setSpeechHandler(SpeechHandler speechHandlerToSet){
+    public static void setSpeechHandler(SpeechHandler speechHandlerToSet) {
         speechHandler = speechHandlerToSet;
     }
 
-    public static void setPollyHandler(PollyHandler pollyHandlerToSet){
+    public static void setPollyHandler(PollyHandler pollyHandlerToSet) {
         pollyHandler = pollyHandlerToSet;
     }
 
-    public static Scanner getScanner(){
+    public static Scanner getScanner() {
         return scanner;
     }
 
-    public static ArrayList<AbstractConfig> getConfigs() {
-        return configs;
+    public static YmlConfig getYmlConfig(){
+        return ymlConfig;
     }
 
-}
+}

src/main/java/simplexity/amazon/PollySetup.java

@@ -5,8 +5,7 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.Main;
-import simplexity.config.config.AwsConfig;
-import simplexity.config.config.TtsConfig;
+import simplexity.config.config.ConfigHandler;
 import simplexity.config.locale.Message;
 import simplexity.util.Logging;
 
@@ -16,15 +15,16 @@ public class PollySetup {
     private static final Logger logger = LoggerFactory.getLogger(PollySetup.class);
     private static final Scanner scanner = Main.getScanner();
 
-    public static void setupPollyAndSpeech(){
+    public static void setupPollyAndSpeech() {
         connectToPolly();
         Main.setSpeechHandler(new SpeechHandler());
     }
+
     public static PollyHandler createPollyHandler() {
         PollyHandler pollyHandler = null;
-        String awsAccessID = AwsConfig.getInstance().getAwsAccessID();
-        String awsSecretKey = AwsConfig.getInstance().getAwsSecretKey();
-        Region awsRegion = AwsConfig.getInstance().getAwsRegion();
+        String awsAccessID = ConfigHandler.getInstance().getAwsAccessID();
+        String awsSecretKey = ConfigHandler.getInstance().getAwsSecretKey();
+        Region awsRegion = ConfigHandler.getInstance().getAwsRegion();
         if (awsAccessID.isEmpty() || awsSecretKey.isEmpty() || awsRegion == null) {
             System.out.println(Message.NULL_AWS_CREDENTIALS);
             return null;
@@ -37,15 +37,15 @@ public static PollyHandler createPollyHandler() {
         return pollyHandler;
     }
 
-    public static void connectToPolly(){
+    public static void connectToPolly() {
         while (true) {
             Main.setPollyHandler(createPollyHandler());
             if (Main.getPollyHandler() != null) {
                 return;
             }
             Logging.logAndPrint(logger, Message.PLEASE_SAVE_AWS_INFO_IN_CONFIG.getMessage(), Level.INFO);
             scanner.nextLine();
-            TtsConfig.getInstance().reloadConfig();
+            ConfigHandler.getInstance().reloadValues(Main.getYmlConfig());
             if (Main.getPollyHandler() != null) {
                 return;
             }

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

@@ -11,8 +11,8 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.Main;
-import simplexity.config.config.AwsConfig;
-import simplexity.config.config.ReplaceTextConfig;
+import simplexity.config.config.ConfigHandler;
+import simplexity.config.config.SpeechEffectRule;
 import simplexity.config.locale.Message;
 import simplexity.util.Logging;
 
@@ -23,7 +23,7 @@ public class SpeechHandler {
     private VoiceId voiceId;
 
     public SpeechHandler() {
-        this.voiceId = AwsConfig.getInstance().getDefaultVoice();
+        this.voiceId = ConfigHandler.getInstance().getDefaultVoice();
         Logging.log(logger, "Initialized SpeechHandler with default voice: " + voiceId.toString(), Level.INFO);
     }
 
@@ -57,13 +57,13 @@ public void processSpeech(String text) {
      */
 
     public String replaceText(String text) {
-        for (String key : ReplaceTextConfig.getInstance().getReplaceText().keySet()) {
-            text = text.replace(key, ReplaceTextConfig.getInstance().getReplaceText().get(key));
+        for (SpeechEffectRule effectRule : ConfigHandler.getInstance().getEffectRules()) {
+            text = effectRule.applyRule(text);
         }
-        for (String key : AwsConfig.getInstance().getVoicePrefixes().keySet()) {
+        for (String key : ConfigHandler.getInstance().getVoicePrefixes().keySet()) {
             if (text.startsWith(key)) {
                 text = text.replace(key, "");
-                voiceId = AwsConfig.getInstance().getVoicePrefixes().get(key);
+                voiceId = ConfigHandler.getInstance().getVoicePrefixes().get(key);
             }
         }
         return text;

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

@@ -4,35 +4,34 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import simplexity.Main;
-import simplexity.config.AbstractConfig;
 import simplexity.config.locale.Message;
 import simplexity.httpserver.LocalServer;
 import simplexity.util.Logging;
 
-import java.util.ArrayList;
+import java.io.IOException;
 
 public class ReloadCommand extends Command {
 
     private static final Logger logger = LoggerFactory.getLogger(ReloadCommand.class);
+
     public ReloadCommand(String name, String usage) {
         super(name, usage);
     }
 
     @Override
     public void execute() {
         Logging.log(logger, "Reloading configs", Level.INFO);
-        reloadConfigs();
+        try {
+            Main.getYmlConfig().reloadConfig();
+        } catch (IOException e) {
+            Logging.logAndPrint(logger, "Fatal Error Reloading Config Files", Level.WARN);
+            Logging.logAndPrint(logger, e.getStackTrace().toString(), Level.WARN);
+            System.exit(-1);
+        }
         Logging.log(logger, "Stopping local server", Level.INFO);
         LocalServer.stop();
         Logging.log(logger, "Starting local server", Level.INFO);
         LocalServer.run();
         Logging.logAndPrint(logger, Message.RELOAD_MESSAGE.getMessage(), Level.ERROR);
     }
-
-    private void reloadConfigs() {
-        ArrayList<AbstractConfig> configs = Main.getConfigs();
-        for (AbstractConfig config : configs) {
-            config.reloadConfig();
-        }
-    }
 }