From d5e500ce2dd7fe0d2fdc360fca496313d1109fd7 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Thu, 17 May 2018 09:28:02 +0200 Subject: [PATCH] Added case management for target review file already existing. --- src/org/april/hebdobot/model/Hebdobot.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/model/Hebdobot.java index 933e6c7..69016ad 100644 --- a/src/org/april/hebdobot/model/Hebdobot.java +++ b/src/org/april/hebdobot/model/Hebdobot.java @@ -357,7 +357,13 @@ public class Hebdobot extends PircBot } logger.info("Write review file."); - File file = new File(this.reviewDirectory, date + StringUtils.defaultString(this.reviewFileSuffix, DEFAULT_SUFFIX)); + File reviewFile = new File(this.reviewDirectory, date + StringUtils.defaultString(this.reviewFileSuffix, DEFAULT_SUFFIX)); + if (reviewFile.exists()) + { + LocalTime now = LocalTime.now(); + String newSuffix = String.format("-%02d'h'%02d.txt", now.getHour(), now.getMinute()); + reviewFile = new File(reviewFile.getAbsolutePath().replace(".txt", newSuffix)); + } try { if (!this.reviewDirectory.exists()) @@ -365,8 +371,8 @@ public class Hebdobot extends PircBot logger.info("Create review directory: " + this.reviewDirectory.getAbsolutePath()); this.reviewDirectory.mkdirs(); } - FileUtils.writeStringToFile(file, textReview, StandardCharsets.UTF_8); - logger.info("File review saved in: [{}]", file.getAbsolutePath()); + FileUtils.writeStringToFile(reviewFile, textReview, StandardCharsets.UTF_8); + logger.info("File review saved in: [{}]", reviewFile.getAbsolutePath()); } catch (final Exception exception) { @@ -378,7 +384,7 @@ public class Hebdobot extends PircBot String reminderMessage = String.format( "%% %s, ne pas oublier d'ajouter le compte-rendu de la revue sur https://agir.april.org/issues/135 en utilisant comme nom de fichier %s", - this.review.getOwner(), file.getName()); + this.review.getOwner(), reviewFile.getName()); logger.info("reminderMessage=[{}]", reminderMessage); sendMessage(reminderMessage);