From 32d0b6606f93ba17c388fedc2f7f840050bfa62d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 21 Aug 2021 21:14:32 +0200
Subject: [PATCH] Fixed #640 - add backup time to file name on manual export
---
.../budgetmaster/database/DatabaseService.java | 14 +++++---------
.../budgetmaster/settings/SettingsController.java | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
index 4f906c186..36a177eda 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
@@ -47,6 +47,8 @@ public class DatabaseService
public static final Gson GSON = new GsonBuilder().create();
private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseService.class);
+ private static final String BACKUP_DATE_FORMAT = "yyyy_MM_dd_HH_mm_ss";
+
private final AccountService accountService;
private final CategoryService categoryService;
private final TransactionService transactionService;
@@ -221,7 +223,7 @@ public class DatabaseService
rotatingBackup(backupFolderPath);
- final String fileName = getExportFileName(true);
+ final String fileName = getExportFileName();
final Path backupPath = backupFolderPath.resolve(fileName);
exportDatabase(backupPath);
@@ -244,15 +246,9 @@ public class DatabaseService
}
}
- public static String getExportFileName(boolean includeTime)
+ public static String getExportFileName()
{
- String formatString = "yyyy_MM_dd";
- if(includeTime)
- {
- formatString = "yyyy_MM_dd_HH_mm_ss";
- }
-
- return "BudgetMasterDatabase_" + DateTime.now().toString(formatString) + ".json";
+ return "BudgetMasterDatabase_" + DateTime.now().toString(BACKUP_DATE_FORMAT) + ".json";
}
public BackupDatabase_v7 getDatabaseForJsonSerialization()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index 832322498..34a4a9e13 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -222,7 +222,7 @@ public class SettingsController extends BaseController
String data = DatabaseService.GSON.toJson(databaseForJsonSerialization);
byte[] dataBytes = data.getBytes(StandardCharsets.UTF_8);
- String fileName = DatabaseService.getExportFileName(false);
+ String fileName = DatabaseService.getExportFileName();
response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
response.setContentType("application/json; charset=UTF-8");
--
GitLab