na testing
This commit is contained in:
parent
bb9e679970
commit
3f1a8f5b0a
|
@ -162,7 +162,8 @@ public class Config {
|
||||||
String json = new String(fileContent, UTF_8).trim();
|
String json = new String(fileContent, UTF_8).trim();
|
||||||
json = migrateJson(json);
|
json = migrateJson(json);
|
||||||
settings = Objects.requireNonNull(mapper.readValue(json, Settings.class));
|
settings = Objects.requireNonNull(mapper.readValue(json, Settings.class));
|
||||||
settings.filterNAcamsOnly = json.has("filterNAcamsOnly") ? json.getBoolean("filterNAcamsOnly") : false;
|
JSONObject jsonObject = new JSONObject(json);
|
||||||
|
settings.filterNAcamsOnly = jsonObject.optBoolean("filterNAcamsOnly", false);
|
||||||
|
|
||||||
settings.httpTimeout = Math.max(settings.httpTimeout, 10_000);
|
settings.httpTimeout = Math.max(settings.httpTimeout, 10_000);
|
||||||
if (settings.recordingsDir.endsWith("/")) {
|
if (settings.recordingsDir.endsWith("/")) {
|
||||||
|
@ -259,9 +260,9 @@ public class Config {
|
||||||
if (savingDisabled) {
|
if (savingDisabled) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
JSONObject json = new JSONObject(mapper.writeValueAsString(settings));
|
JSONObject jsonObject = new JSONObject(mapper.writeValueAsString(settings));
|
||||||
json.put("filterNAcamsOnly", settings.filterNAcamsOnly);
|
jsonObject.put("filterNAcamsOnly", settings.filterNAcamsOnly);
|
||||||
String jsonString = json.toString();
|
String jsonString = jsonObject.toString();
|
||||||
File configFile = new File(configDir, filename);
|
File configFile = new File(configDir, filename);
|
||||||
log.debug("Saving config to {}", configFile.getAbsolutePath());
|
log.debug("Saving config to {}", configFile.getAbsolutePath());
|
||||||
Files.createDirectories(configDir.toPath());
|
Files.createDirectories(configDir.toPath());
|
||||||
|
|
Loading…
Reference in New Issue