From 0f84ed83556b678954e25d222baf546959c8d701 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Sat, 19 Mar 2022 13:31:23 +0100 Subject: [PATCH] =?UTF-8?q?Nouvelles=20Regex=20:=20FFE=5FGET=5FFILE=5FRESU?= =?UTF-8?q?LT=5FERROR=20valid=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/rules/writer/GetFileErrorRule.java | 5 ++++- app/src/main/resources/appdata.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java b/app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java index e43ec21..59af4fb 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/writer/GetFileErrorRule.java @@ -1,6 +1,9 @@ package lightcontainer.protocol.rules.writer; import lightcontainer.protocol.ProtocolWriter; +import lightcontainer.protocol.StandardizedDefinitions; + +import static lightcontainer.protocol.StandardizedDefinitions.FFE_GET_FILE_RESULT_ERROR; /** * Règle utilisé dans le cas ou une erreur survient lors @@ -9,7 +12,7 @@ import lightcontainer.protocol.ProtocolWriter; public class GetFileErrorRule extends ProtocolWriter { // Constants //"^GETFILE_ERROR\r\n$" - private static final String PATTERN = "^GETFILE_ERROR\r\n$"; + private static final String PATTERN = FFE_GET_FILE_RESULT_ERROR; public static final String NAME = "GETFILE_ERROR"; // Constructors diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index f8ee259..51fa9da 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -1 +1 @@ -{"unicast_port":8000,"multicast_ip":"224.66.66.1","multicast_port":15502,"network_interface":"lo","tls":true,"storagePath":"C:\\Users\\ledou\\Documents\\ffe","users":[{"name":"aaaaa","password":"$2a$10$Up/pME2iFKALVSu8/JDpG.8Vc2vidOm99SeVoayCB1th7KHMZ1gq2","aes_key":"4+D3geivckhduP14646nYBb91N71HJj+8uvHFb0su0o=","files":[]}]} \ No newline at end of file +{"unicast_port":8000,"multicast_ip":"224.66.66.1","multicast_port":15502,"network_interface":"lo","tls":true,"storagePath":"C:\\Users\\ledou\\Documents\\ffe","users":[{"name":"aaaaa","password":"$2a$10$Up/pME2iFKALVSu8/JDpG.8Vc2vidOm99SeVoayCB1th7KHMZ1gq2","aes_key":"4+D3geivckhduP14646nYBb91N71HJj+8uvHFb0su0o=","files":[{"name":"test.txt","fileNameSalt":"FIjFt/hfscPkTLksP0IT4A==","size":301,"iv":"ATf85tYHY7WoGmyy3XRqyA==","storage":["lightcontainerSB01"]}]}]} \ No newline at end of file