Fix voice prefixes

Author: RhythmicSys

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

@@ -14,6 +14,8 @@
 import simplexity.config.ConfigHandler;
 import simplexity.config.LocaleHandler;
 import simplexity.config.SpeechEffectRule;
+import simplexity.config.TextReplaceRule;
+import simplexity.config.VoicePrefixRule;
 import simplexity.util.Logging;
 
 import java.io.InputStream;
@@ -57,14 +59,17 @@ public void processSpeech(String text) {
      */
 
     public String replaceText(String text) {
+        for (VoicePrefixRule prefixRule : ConfigHandler.getInstance().getVoicePrefixRules()) {
+            if (!prefixRule.matches(text)) continue;
+            text = prefixRule.applyRule(text);
+            voiceId = prefixRule.getVoiceId();
+            break;
+        }
         for (SpeechEffectRule effectRule : ConfigHandler.getInstance().getEffectRules()) {
             text = effectRule.applyRule(text);
         }
-        for (String key : ConfigHandler.getInstance().getVoicePrefixes().keySet()) {
-            if (text.startsWith(key)) {
-                text = text.replace(key, "");
-                voiceId = ConfigHandler.getInstance().getVoicePrefixes().get(key);
-            }
+        for (TextReplaceRule replaceRule : ConfigHandler.getInstance().getTextReplaceRules()) {
+            text = replaceRule.applyRule(text);
         }
         return text;
     }

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

@@ -36,6 +36,6 @@ public void execute() {
         LocalServer.stop();
         Logging.log(logger, "Starting local server", Level.INFO);
         LocalServer.run();
-        Logging.logAndPrint(logger, LocaleHandler.getInstance().getFeedbackReload(), Level.ERROR);
+        Logging.logAndPrint(logger, LocaleHandler.getInstance().getFeedbackReload(), Level.INFO);
     }
 }

src/main/java/simplexity/config/ConfigHandler.java

@@ -9,14 +9,13 @@
 import simplexity.Main;
 import simplexity.util.Logging;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
 public class ConfigHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(ConfigHandler.class);
-    private final HashMap<String, VoiceId> voicePrefixes = new HashMap<>();
+    private final HashSet<VoicePrefixRule> voicePrefixRules = new HashSet<>();
     private final HashSet<SpeechEffectRule> effectRules = new HashSet<>();
     private final HashSet<TextReplaceRule> textReplaceRules = new HashSet<>();
 
@@ -52,11 +51,17 @@ public void reloadAwsValues(YmlConfig config) {
     }
 
     public void reloadVoicePrefixes(YmlConfig config) {
-        voicePrefixes.clear();
+        voicePrefixRules.clear();
         for (String key : config.getKeys("aws-api.voice-prefixes")) {
-            VoiceId voice = config.getOption("aws-api.voice-prefixes." + key, VoiceId.class);
-            if (voice == null) continue;
-            voicePrefixes.put(key, voice);
+            String voiceName = config.getOption("aws-api.voice-prefixes." + key, String.class);
+            if (voiceName == null) continue;
+            try {
+                VoiceId voiceId = VoiceId.valueOf(voiceName);
+                VoicePrefixRule prefixRule = new VoicePrefixRule(key, voiceId);
+                voicePrefixRules.add(prefixRule);
+            } catch (IllegalArgumentException e) {
+                Logging.logAndPrint(logger, "issue", Level.WARN); //todo actual warning
+            }
         }
     }
 
@@ -102,8 +107,8 @@ public String getAwsSecretKey() {
         return awsSecretKey;
     }
 
-    public HashMap<String, VoiceId> getVoicePrefixes() {
-        return voicePrefixes;
+    public HashSet<VoicePrefixRule> getVoicePrefixRules() {
+        return voicePrefixRules;
     }
 
     public Region getAwsRegion() {
@@ -118,6 +123,10 @@ public HashSet<SpeechEffectRule> getEffectRules() {
         return effectRules;
     }
 
+    public HashSet<TextReplaceRule> getTextReplaceRules() {
+        return textReplaceRules;
+    }
+
     public Integer getServerPort() {
         return serverPort;
     }

src/main/java/simplexity/config/VoicePrefixRule.java

@@ -0,0 +1,28 @@
+package simplexity.config;
+
+import com.amazonaws.services.polly.model.VoiceId;
+
+import java.util.regex.Pattern;
+
+public class VoicePrefixRule {
+    private VoiceId voiceId;
+    private Pattern prefixPattern;
+
+    public VoicePrefixRule(String prefix, VoiceId voiceId) {
+        this.voiceId = voiceId;
+        this.prefixPattern = Pattern.compile("(?i)^" + Pattern.quote(prefix) + "[:\\s-]?");
+    }
+
+    public VoiceId getVoiceId() {
+        return voiceId;
+    }
+
+    public boolean matches(String input) {
+        return prefixPattern.matcher(input).find();
+    }
+
+    public String applyRule(String input) {
+        return prefixPattern.matcher(input).replaceAll("");
+    }
+
+}