From 9f7ae954366e5e74c4710ccb8ff2e27cd39b7d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Ortega=20Froysa?= Date: Tue, 3 Mar 2026 08:08:48 +0100 Subject: [PATCH] Allow as many whitespace as the user wants. --- .../java/net/themusicinnoise/vaccalc/PointEngine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/themusicinnoise/vaccalc/PointEngine.java b/src/main/java/net/themusicinnoise/vaccalc/PointEngine.java index a77e0d8..a2c95e6 100644 --- a/src/main/java/net/themusicinnoise/vaccalc/PointEngine.java +++ b/src/main/java/net/themusicinnoise/vaccalc/PointEngine.java @@ -23,9 +23,9 @@ public class PointEngine { DATE, } - static final Pattern DOW_PATTERN = Pattern.compile("dow=(sun|mon|tue|wed|thu|fri|sat) (\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); - static final Pattern MONTH_PATTERN = Pattern.compile("m=(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec) (\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); - static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4}-\\d{2}-\\d{2}) (\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); + static final Pattern DOW_PATTERN = Pattern.compile("dow=(sun|mon|tue|wed|thu|fri|sat)\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); + static final Pattern MONTH_PATTERN = Pattern.compile("m=(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); + static final Pattern DATE_PATTERN = Pattern.compile("(\\d{4}-\\d{2}-\\d{2})\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); private RuleType type; private DayOfWeek dow; @@ -77,7 +77,7 @@ public class PointEngine { } public void importPointsFile(File pointsFile) { - Pattern defaultPattern = Pattern.compile("default (\\d+\\.\\d+)"); + Pattern defaultPattern = Pattern.compile("default\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); try (BufferedReader br = new BufferedReader(new FileReader(pointsFile))) { String line;