diff --git a/Dogename/src/main/java/me/lensferno/dogename/Main.java b/Dogename/src/main/java/me/lensferno/dogename/Main.java index addc1ef..8728f89 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/Main.java +++ b/Dogename/src/main/java/me/lensferno/dogename/Main.java @@ -9,6 +9,7 @@ import me.lensferno.dogename.configs.ConfigLoader; import me.lensferno.dogename.controllers.MainInterfaceController; import me.lensferno.dogename.sayings.Gushici; import me.lensferno.dogename.sayings.Hitokoto; +import me.lensferno.dogename.utils.FilePath; import java.io.File; import java.lang.management.ManagementFactory; @@ -28,7 +29,7 @@ public class Main extends Application { new File("process").mkdirs(); - File tempFile = new File("process" + File.separator + pid); + File tempFile = new File(FilePath.toSpecificPathForm("process/" + pid)); tempFile.createNewFile(); tempFile.deleteOnExit(); diff --git a/Dogename/src/main/java/me/lensferno/dogename/configs/ConfigLoader.java b/Dogename/src/main/java/me/lensferno/dogename/configs/ConfigLoader.java index 2499ccd..1a0655f 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/configs/ConfigLoader.java +++ b/Dogename/src/main/java/me/lensferno/dogename/configs/ConfigLoader.java @@ -10,6 +10,7 @@ import me.lensferno.dogename.configs.adapters.BooleanPropertyAdapter; import me.lensferno.dogename.configs.adapters.DoublePropertyAdapter; import me.lensferno.dogename.configs.adapters.IntegerPropertyAdapter; import me.lensferno.dogename.configs.adapters.StringPropertyAdapter; +import me.lensferno.dogename.utils.FilePath; import org.apache.commons.io.IOUtils; import java.io.*; @@ -18,8 +19,8 @@ import java.nio.charset.StandardCharsets; public class ConfigLoader { - private final String mainConfigLocation = "files" + File.separator + "Config.json"; - private final String voiceConfigLocation = "files" + File.separator + "VoiceConfig.json"; + private final String mainConfigLocation = FilePath.toSpecificPathForm("files/Config.json"); + private final String voiceConfigLocation = FilePath.toSpecificPathForm("files/VoiceConfig.json"); //ConfigValuesBean config; private MainConfig mainConfig; private VoiceConfig voiceConfig; diff --git a/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java b/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java index 6ef5271..94532f2 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java +++ b/Dogename/src/main/java/me/lensferno/dogename/controllers/MainInterfaceController.java @@ -22,6 +22,7 @@ import me.lensferno.dogename.data.Data; import me.lensferno.dogename.data.History; import me.lensferno.dogename.select.Selector; import me.lensferno.dogename.utils.DialogMaker; +import me.lensferno.dogename.utils.FilePath; import me.lensferno.dogename.utils.ocr.OcrTool; import java.io.File; @@ -86,8 +87,8 @@ public final class MainInterfaceController { } public void setUpConfig(ConfigLoader configLoader) { - mainConfig = configLoader.readConfigFromFile("files" + File.separator + "Config.json"); - voiceConfig = configLoader.readVoiceConfigFromFile("files" + File.separator + "VoiceConfig.json"); + mainConfig = configLoader.readConfigFromFile(FilePath.toSpecificPathForm("files/Config.json")); + voiceConfig = configLoader.readVoiceConfigFromFile(FilePath.toSpecificPathForm("files/VoiceConfig.json")); } @FXML diff --git a/Dogename/src/main/java/me/lensferno/dogename/controllers/ProgramInfoPaneController.java b/Dogename/src/main/java/me/lensferno/dogename/controllers/ProgramInfoPaneController.java index 796135b..fbb4ac6 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/controllers/ProgramInfoPaneController.java +++ b/Dogename/src/main/java/me/lensferno/dogename/controllers/ProgramInfoPaneController.java @@ -34,11 +34,6 @@ public class ProgramInfoPaneController extends VBox { loader.setController(this); try { loader.load(); - } catch (Exception e) { - e.printStackTrace(); - } - - try { dogeView.setImage(new Image(getClass().getResourceAsStream("/images/banner.png"))); } catch (Exception e) { e.printStackTrace(); diff --git a/Dogename/src/main/java/me/lensferno/dogename/data/Data.java b/Dogename/src/main/java/me/lensferno/dogename/data/Data.java index b2cc47b..f3770d2 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/data/Data.java +++ b/Dogename/src/main/java/me/lensferno/dogename/data/Data.java @@ -1,6 +1,7 @@ package me.lensferno.dogename.data; import com.google.gson.Gson; +import me.lensferno.dogename.utils.FilePath; import java.io.*; import java.nio.charset.StandardCharsets; @@ -20,7 +21,7 @@ public class Data { public Data() { - dataFile = new File("files" + File.separator + "Namelist.data"); + dataFile = new File(FilePath.toSpecificPathForm("files/Namelist.data")); try { @@ -210,8 +211,8 @@ public class Data { class IgnoreList { - private final File nameIgnoreFile = new File("files" + File.separator + "IgnoredNameList.data"); - private final File numbIgnoreFile = new File("files" + File.separator + "IgnoredNumberList.data"); + private final File nameIgnoreFile = new File(FilePath.toSpecificPathForm("files/IgnoredNameList.data")); + private final File numbIgnoreFile = new File(FilePath.toSpecificPathForm("files/IgnoredNumberList.data")); private HashSet ignoreNameList = new HashSet<>(); private HashSet ignoreNumberList = new HashSet<>(); @@ -250,7 +251,7 @@ public class Data { public void readIgnoreList() { readNameIgnoreList(); readNumberIgnoreList(); - System.out.println("There are " + ignoreNameList.size() + " names and " + ignoreNumberList.size() + " numbers ignored."); + System.out.println(String.format("There are %d names and %d numbers ignored", ignoreNameList.size(), ignoreNumberList.size())); } private void readNameIgnoreList() { diff --git a/Dogename/src/main/java/me/lensferno/dogename/data/History.java b/Dogename/src/main/java/me/lensferno/dogename/data/History.java index ce78e95..8997b2d 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/data/History.java +++ b/Dogename/src/main/java/me/lensferno/dogename/data/History.java @@ -1,20 +1,22 @@ package me.lensferno.dogename.data; +import me.lensferno.dogename.utils.FilePath; + import java.io.*; import java.util.ArrayList; public class History { - public static final String separator = File.separator; ArrayList history; - private String HISTORY_FILE; + + private final String HISTORY_FILE = FilePath.toSpecificPathForm("files/history.data"); public void loadHistory() { - HISTORY_FILE = "files" + separator + "history.data"; + File historyFile = new File(HISTORY_FILE); try { - File historyFile = new File(HISTORY_FILE); + if (!historyFile.exists()) { historyFile.getParentFile().mkdirs(); historyFile.createNewFile(); @@ -52,7 +54,6 @@ public class History { private void writeHistory() { - HISTORY_FILE = "files" + separator + "history.data"; File historyFile = new File(HISTORY_FILE); try { diff --git a/Dogename/src/main/java/me/lensferno/dogename/utils/FilePath.java b/Dogename/src/main/java/me/lensferno/dogename/utils/FilePath.java new file mode 100644 index 0000000..a67711b --- /dev/null +++ b/Dogename/src/main/java/me/lensferno/dogename/utils/FilePath.java @@ -0,0 +1,9 @@ +package me.lensferno.dogename.utils; + +import java.io.File; + +public final class FilePath { + public static String toSpecificPathForm(String uniformFilepath) { + return uniformFilepath.replace("/", File.separator); + } +} diff --git a/Dogename/src/main/java/me/lensferno/dogename/voice/TokenManager.java b/Dogename/src/main/java/me/lensferno/dogename/voice/TokenManager.java index 78c1f2a..0bf53b6 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/voice/TokenManager.java +++ b/Dogename/src/main/java/me/lensferno/dogename/voice/TokenManager.java @@ -9,7 +9,6 @@ import java.net.URL; public class TokenManager { - public static final String separator = File.separator; public static final int TOKEN_OK = 0; public static final int TOKEN_BAD = 1; final String API_KEY = "dIHCtamVdD0ERO1yyFir2iI4"; diff --git a/Dogename/src/main/java/me/lensferno/dogename/voice/VoicePlayer.java b/Dogename/src/main/java/me/lensferno/dogename/voice/VoicePlayer.java index 0a3d270..46e0126 100644 --- a/Dogename/src/main/java/me/lensferno/dogename/voice/VoicePlayer.java +++ b/Dogename/src/main/java/me/lensferno/dogename/voice/VoicePlayer.java @@ -3,6 +3,7 @@ package me.lensferno.dogename.voice; import com.goxr3plus.streamplayer.stream.StreamPlayer; import com.goxr3plus.streamplayer.stream.StreamPlayerException; import me.lensferno.dogename.configs.VoiceConfig; +import me.lensferno.dogename.utils.FilePath; import me.lensferno.dogename.utils.IOUtil; import me.lensferno.dogename.utils.NetworkUtil; @@ -11,10 +12,10 @@ import java.net.URLEncoder; public class VoicePlayer { - public static final String separator = File.separator; - private final String VOICE_API = "https://tsn.baidu.com/text2audio"; - String cachePath = "caches" + separator + "voice" + separator; + + String cachePath = FilePath.toSpecificPathForm("caches/voice/"); + Token token; StreamPlayer streamPlayer = new StreamPlayer(); private VoiceConfig voiceConfig = null;