GitLab

at 2020-04-16T12:01:30+02:00

Le nom du fichier de sauvegarde par défaut pourrait être modernisé - Closes #1212

             ClientConfigOption.MAP_LAYER10);

     private static final Logger log = LogManager.getLogger(ClientConfig.class);

     /** le pattern du fichier de sauvegarde d'une base locale */

-    private static final String BACKUP_DB_PATTERN = "obstuna-local-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz";

+    private static final String BACKUP_DB_PATTERN = "observe-v%1$s-%2$tF--%2$tk-%2$tM-%2$tS.sql.gz";

     private static final String APPLICATION_VERSION = "application.version";

     private static final String VERSION = "version";

 

     }

 

     public File newBackupDataFile() {

-        return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, new Date()));

+        return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion(), new Date()));

     }

 

     public void saveForUser() {

 

     private static final Logger log = LogManager.getLogger(BackupsManager.class);

 

-    private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obstuna-local-([0-9-]+)\\.sql\\.gz");

+    private static final Pattern AUTOMATIC_BACKUP_FILENAME_PATTERN = Pattern.compile("obs.+-([0-9-]+)\\.sql\\.gz");

 

     private final Path backupsPath;

     private final ObserveDataSourcesManager dataSourcesManager;

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

Changes: