ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Use defaults, if settings cannot be loaded 

If the settings cannot be loaded, make a backup of the settings file
and use the defaults, so that the application at least starts.
This commit is contained in:
0xboobface 2018-11-30 13:42:51 +01:00
parent 308a40210f
commit 918f63b1f5
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/main/java/ctbrec/ui/CamrecApplication.java
View File

@ -250,9 +250,8 @@ public class CamrecApplication extends Application {
LOG.error("Couldn't load settings", e); LOG.error("Couldn't load settings", e);
Alert alert = new AutosizeAlert(Alert.AlertType.ERROR); Alert alert = new AutosizeAlert(Alert.AlertType.ERROR);
alert.setTitle("Whoopsie"); alert.setTitle("Whoopsie");
alert.setContentText("Couldn't load settings."); alert.setContentText("Couldn't load settings. Falling back to defaults. A backup of your settings has been created.");
alert.showAndWait(); alert.showAndWait();
System.exit(1);
} }
config = Config.getInstance(); config = Config.getInstance();
} }

22
common/src/main/java/ctbrec/Config.java
View File

@ -7,6 +7,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -46,7 +47,6 @@ public class Config {
} else { } else {
filename = "settings.json"; filename = "settings.json";
} }
load();
} }
private void load() throws FileNotFoundException, IOException { private void load() throws FileNotFoundException, IOException {
@ -61,6 +61,13 @@ public class Config {
BufferedSource source = buffer.readFrom(fin); BufferedSource source = buffer.readFrom(fin);
settings = adapter.fromJson(source); settings = adapter.fromJson(source);
settings.httpTimeout = Math.max(settings.httpTimeout, 10_000); settings.httpTimeout = Math.max(settings.httpTimeout, 10_000);
} catch(Throwable e) {
settings = OS.getDefaultSettings();
for (Site site : sites) {
site.setEnabled(!settings.disabledSites.contains(site.getName()));
}
makeBackup(configFile);
throw e;
} }
} else { } else {
LOG.error("Config file does not exist. Falling back to default values."); LOG.error("Config file does not exist. Falling back to default values.");
@ -71,9 +78,22 @@ public class Config {
} }
} }
private void makeBackup(File source) {
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss");
String timestamp = sdf.format(new Date());
String backup = source.getName() + '.' + timestamp;
File target = new File(source.getParentFile(), backup);
Files.copy(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch(Throwable e) {
LOG.error("Couldn't create backup of settings file", e);
}
}
public static synchronized void init(List<Site> sites) throws FileNotFoundException, IOException { public static synchronized void init(List<Site> sites) throws FileNotFoundException, IOException {
if(instance == null) { if(instance == null) {
instance = new Config(sites); instance = new Config(sites);
instance.load();
} }
} }