Skip to content
Snippets Groups Projects
Commit 32d0b660 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #640 - add backup time to file name on manual export

parent a5336c72
No related branches found
No related tags found
No related merge requests found
......@@ -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)
{
String formatString = "yyyy_MM_dd";
if(includeTime)
public static String getExportFileName()
{
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()
......
......@@ -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");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment