Skip to content

Commit 31ca984

Browse files
RhythmicSysRhythmicSys
committed
separate defaults
1 parent ea473df commit 31ca984

10 files changed

Lines changed: 40 additions & 33 deletions

File tree

‎src/main/java/simplexity/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import simplexity.config.AbstractConfig;
1313
import simplexity.config.config.AwsConfig;
1414
import simplexity.config.config.ReplaceTextConfig;
15-
import simplexity.config.config.TTSConfig;
15+
import simplexity.config.config.TtsConfig;
1616
import simplexity.config.locale.LocaleConfig;
1717
import simplexity.httpserver.LocalServer;
1818
import simplexity.amazon.PollySetup;
@@ -55,7 +55,7 @@ private static void registerCommands(CommandManager commandManager) {
5555
private static void setupConfigs(){
5656
AwsConfig awsConfig = new AwsConfig();
5757
configs.add(awsConfig);
58-
TTSConfig ttsConfig = new TTSConfig();
58+
TtsConfig ttsConfig = new TtsConfig();
5959
configs.add(ttsConfig);
6060
ReplaceTextConfig replaceTextConfig = new ReplaceTextConfig();
6161
configs.add(replaceTextConfig);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.slf4j.event.Level;
77
import simplexity.Main;
88
import simplexity.config.config.AwsConfig;
9-
import simplexity.config.config.TTSConfig;
9+
import simplexity.config.config.TtsConfig;
1010
import simplexity.config.locale.Message;
1111
import simplexity.util.Logging;
1212

@@ -45,7 +45,7 @@ public static void connectToPolly(){
4545
}
4646
Logging.logAndPrint(logger, Message.PLEASE_SAVE_AWS_INFO_IN_CONFIG.getMessage(), Level.INFO);
4747
scanner.nextLine();
48-
TTSConfig.getInstance().reloadConfig();
48+
TtsConfig.getInstance().reloadConfig();
4949
if (Main.getPollyHandler() != null) {
5050
return;
5151
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import simplexity.Main;
1414
import simplexity.config.config.AwsConfig;
1515
import simplexity.config.config.ReplaceTextConfig;
16-
import simplexity.config.config.TTSConfig;
1716
import simplexity.config.locale.Message;
1817
import simplexity.util.Logging;
1918

‎src/main/java/simplexity/config/config/AwsConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public static AwsConfig getInstance() {
4343
public void createDefaultConfig(File configFile) {
4444
try (FileWriter writer = new FileWriter(configFile)) {
4545
Logging.log(logger, "Writing default AWS configuration", Level.INFO);
46-
writer.write(ConfigDefaults.AWS_ACCESS_KEY);
47-
writer.write(ConfigDefaults.AWS_SECRET_KEY);
48-
writer.write(ConfigDefaults.AWS_REGION);
49-
writer.write(ConfigDefaults.DEFAULT_VOICE);
50-
writer.write(ConfigDefaults.VOICE_PREFIXES);
46+
writer.write(AwsConfigDefaults.AWS_ACCESS_KEY);
47+
writer.write(AwsConfigDefaults.AWS_SECRET_KEY);
48+
writer.write(AwsConfigDefaults.AWS_REGION);
49+
writer.write(AwsConfigDefaults.DEFAULT_VOICE);
50+
writer.write(AwsConfigDefaults.VOICE_PREFIXES);
5151
} catch (IOException exception) {
5252
Logging.logAndPrint(logger, "Failed to create default Replace Text Config: " + exception.getMessage(), Level.INFO);
5353
}

‎src/main/java/simplexity/config/config/AwsConfigDefaults.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package simplexity.config.config;
2+
3+
public class AwsConfigDefaults {
4+
public static final String DEFAULT_VOICE = "default-voice= \"Brian\"\n";
5+
public static final String VOICE_PREFIXES = """
6+
voice-prefixes {
7+
"Sal:"= "Salli"
8+
"Kim:"= "Kimberly"
9+
"Bri:"= "Brian"
10+
}
11+
""";
12+
public static final String AWS_REGION = "aws-region= \"US_EAST_1\"\n";
13+
public static final String AWS_ACCESS_KEY = "aws-access-id= \"\"\n";
14+
public static final String AWS_SECRET_KEY = "aws-secret-key= \"\"\n";
15+
}

‎src/main/java/simplexity/config/config/ReplaceTextConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static ReplaceTextConfig getInstance() {
3333
public void createDefaultConfig(File configFile) {
3434
try (FileWriter writer = new FileWriter(configFile)) {
3535
Logging.log(logger, "Writing default replace text configuration", Level.INFO);
36-
writer.write(ConfigDefaults.REPLACE_TEXT);
36+
writer.write(ReplaceTextConfigDefaults.REPLACE_TEXT);
3737
} catch (IOException exception) {
3838
Logging.logAndPrint(logger, "Failed to create default Replace Text Config: " + exception.getMessage(), Level.INFO);
3939
}

src/main/java/simplexity/config/config/ConfigDefaults.java renamed to src/main/java/simplexity/config/config/ReplaceTextConfigDefaults.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package simplexity.config.config;
22

3-
public class ConfigDefaults {
4-
public static final String AWS_REGION = "aws-region= \"US_EAST_1\"\n";
5-
public static final String AWS_ACCESS_KEY = "aws-access-id= \"\"\n";
6-
public static final String AWS_SECRET_KEY = "aws-secret-key= \"\"\n";
7-
public static final String SERVER_PORT = "server-port= 3000";
3+
public class ReplaceTextConfigDefaults {
84
public static final String REPLACE_TEXT = """
95
replace-text {
106
" **"= "<prosody volume=\\"x-loud\\" pitch=\\"low\\" rate=\\"slow\\">"
@@ -26,12 +22,4 @@ public class ConfigDefaults {
2622
"<3"= "heart emoji"
2723
}
2824
""";
29-
public static final String DEFAULT_VOICE = "default-voice= \"Brian\"\n";
30-
public static final String VOICE_PREFIXES = """
31-
voice-prefixes {
32-
"Sal:"= "Salli"
33-
"Kim:"= "Kimberly"
34-
"Bri:"= "Brian"
35-
}
36-
""";
3725
}

src/main/java/simplexity/config/config/TTSConfig.java renamed to src/main/java/simplexity/config/config/TtsConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111
import java.io.FileWriter;
1212
import java.io.IOException;
1313

14-
public class TTSConfig extends AbstractConfig {
14+
public class TtsConfig extends AbstractConfig {
1515

16-
private static final Logger logger = LoggerFactory.getLogger(TTSConfig.class);
16+
private static final Logger logger = LoggerFactory.getLogger(TtsConfig.class);
1717

1818

1919
private int port;
2020

21-
public TTSConfig() {
21+
public TtsConfig() {
2222
super();
2323
Logging.log(logger, "Initializing TTS config class", Level.INFO);
2424
}
2525

26-
private static TTSConfig instance;
26+
private static TtsConfig instance;
2727

28-
public static TTSConfig getInstance() {
29-
if (instance == null) instance = new TTSConfig();
28+
public static TtsConfig getInstance() {
29+
if (instance == null) instance = new TtsConfig();
3030
return instance;
3131
}
3232

3333
@Override
3434
public void createDefaultConfig(File configFile) {
3535
try (FileWriter writer = new FileWriter(configFile)) {
36-
writer.write(ConfigDefaults.SERVER_PORT);
36+
writer.write(TtsConfigDefaults.SERVER_PORT);
3737
} catch (IOException exception) {
3838
Logging.logAndPrint(logger, "Failed to create default TTS Config: " + exception.getMessage(), Level.INFO);
3939
}

‎src/main/java/simplexity/config/config/TtsConfigDefaults.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package simplexity.config.config;
2+
3+
public class TtsConfigDefaults {
4+
public static final String SERVER_PORT = "server-port= 3000";
5+
}

‎src/main/java/simplexity/httpserver/LocalServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55
import org.slf4j.event.Level;
6-
import simplexity.config.config.TTSConfig;
6+
import simplexity.config.config.TtsConfig;
77
import simplexity.config.locale.Message;
88
import simplexity.util.Logging;
99

@@ -29,7 +29,7 @@ public static void stop() {
2929
private static void setupServer() {
3030
try {
3131
server = com.sun.net.httpserver.HttpServer.create(
32-
new InetSocketAddress(TTSConfig.getInstance().getPort()), 0);
32+
new InetSocketAddress(TtsConfig.getInstance().getPort()), 0);
3333
server.setExecutor(null);
3434
server.createContext("/", new ChatHandler());
3535
server.start();

0 commit comments

Comments
 (0)