From 5d723d9acfbfa2da973cc4f65ccd827108420554 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Sat, 19 Mar 2022 13:17:25 +0100 Subject: [PATCH] =?UTF-8?q?Nouvelles=20Regex=20:=20FFE=5FERASE=5FFILE=20va?= =?UTF-8?q?lid=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/rules/writer/EraseFileRule.java | 7 +++++-- app/src/main/resources/appdata.json | 17 +---------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/lightcontainer/protocol/rules/writer/EraseFileRule.java b/app/src/main/java/lightcontainer/protocol/rules/writer/EraseFileRule.java index f0d9794..19f57a7 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/writer/EraseFileRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/writer/EraseFileRule.java @@ -1,11 +1,14 @@ package lightcontainer.protocol.rules.writer; import lightcontainer.protocol.ProtocolWriter; +import lightcontainer.protocol.StandardizedDefinitions; + +import static lightcontainer.protocol.StandardizedDefinitions.FFE_ERASE_FILE; public class EraseFileRule extends ProtocolWriter { - //"^ERASEFILE ([A-Za-z0-9]{50,200})\r\n$" - private static final String PATTERN = "^ERASEFILE ([A-Za-z0-9.]{50,200})\r\n$"; + //"^ERASEFILE ([A-Za-z0-9.]{50,200})\r\n$" + private static final String PATTERN = FFE_ERASE_FILE; public static String NAME = "ERASEFILE"; diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index 84b0f15..f8ee259 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -1,16 +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":[]}]} \ No newline at end of file