PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing backup persist

Browse Source
This commit is contained in:
Marc Baloup 2022-12-30 23:15:36 +01:00
parent 9a140984ca
commit 515862acbd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandalib-core/src/main/java/fr/pandacube/lib/core/backup/Persist.java
View File

@ -6,7 +6,6 @@ import fr.pandacube.lib.core.json.Json;
import fr.pandacube.lib.util.Log; import fr.pandacube.lib.util.Log;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
@ -24,7 +23,7 @@ public class Persist {
public Persist(BackupManager bm) { public Persist(BackupManager bm) {
backupManager = bm; backupManager = bm;
file = new File(bm.getBackupDirectory(), "source-dirty-since.yml"); file = new File(bm.getBackupDirectory(), "source-dirty-since.json");
load(); load();
} }
@ -34,11 +33,11 @@ public class Persist {
protected void load() { protected void load() {
boolean loaded = false; boolean loaded = false;
try { try (FileReader reader = new FileReader(file)) {
dirtySince = Json.gson.fromJson(new FileReader(file), new TypeToken<Map<String, Long>>(){}.getType()); dirtySince = Json.gson.fromJson(reader, new TypeToken<Map<String, Long>>(){}.getType());
loaded = true; loaded = true;
} }
catch (final FileNotFoundException ignored) { } catch (final IOException ignored) { }
catch (final JsonParseException e) { catch (final JsonParseException e) {
Log.severe("cannot load " + file, e); Log.severe("cannot load " + file, e);
} }
@ -53,10 +52,9 @@ public class Persist {
} }
public void save() { public void save() {
try { try (FileWriter writer = new FileWriter(file, false)) {
Json.gsonPrettyPrinting.toJson(dirtySince, new FileWriter(file, false)); Json.gsonPrettyPrinting.toJson(dirtySince, writer);
} }
catch (final FileNotFoundException ignored) { }
catch (final JsonParseException | IOException e) { catch (final JsonParseException | IOException e) {
Log.severe("could not save " + file, e); Log.severe("could not save " + file, e);
} }