mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-09 21:18:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename LANG_PATH to LANG_FOLDER

Browse Source
This commit is contained in:
NovaFox161
2020-08-03 00:20:25 -05:00
parent caa300ceca
commit 2addccae4b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/dreamexposure/discal/core/file/ReadFile.java
View File

@@ -20,27 +20,28 @@ import reactor.core.scheduler.Schedulers;
* For Project: DisCal-Discord-Bot
*/
public class ReadFile {
@SuppressWarnings({"resource", "IOResourceOpenedButNotSafelyClosed"})
public static Mono<JSONObject> readAllLangFiles() {
return Mono.fromCallable(() -> {
JSONObject langs = new JSONObject();
final JSONObject langs = new JSONObject();
try {
File langDir = new File(BotSettings.LANG_PATH.get());
final File langDir = new File(BotSettings.LANG_FOLDER.get());
for (File f : langDir.listFiles()) {
for (final File file : langDir.listFiles()) {
// Open the file
FileReader fr = new FileReader(f);
final FileReader fr = new FileReader(file);
byte[] encoded = Files.readAllBytes(Paths.get(f.getAbsolutePath()));
String contents = new String(encoded, StandardCharsets.UTF_8);
final byte[] encoded = Files.readAllBytes(Paths.get(file.getAbsolutePath()));
final String contents = new String(encoded, StandardCharsets.UTF_8);
JSONObject json = new JSONObject(contents);
final JSONObject json = new JSONObject(contents);
langs.put(json.getString("Language"), json);
fr.close();
}
} catch (Exception e) {
} catch (final Exception e) {
LogFeed.log(LogObject.forException("Failed to load lang files", e, ReadFile.class));
}
return langs;

2
core/src/main/java/org/dreamexposure/discal/core/object/BotSettings.java
View File

@@ -27,7 +27,7 @@ public enum BotSettings {
SHARD_COUNT, SHARD_INDEX,
LANG_PATH, LOG_FOLDER, CREDENTIAL_FOLDER,
LANG_FOLDER, LOG_FOLDER, CREDENTIAL_FOLDER,
PW_TOKEN, DBO_TOKEN,