nortega/vaccalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow as many whitespace as the user wants.

Browse Source
This commit is contained in:
Nicolás A. Ortega Froysa
2026-03-03 08:08:48 +01:00
parent b9072fc8e8
commit 9f7ae95436
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/themusicinnoise/vaccalc/PointEngine.java
View File

@@ -23,9 +23,9 @@ public class PointEngine {
DATE, DATE,
} }
static final Pattern DOW_PATTERN = Pattern.compile("dow=(sun|mon|tue|wed|thu|fri|sat) (\\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) (\\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}) (\\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 RuleType type;
private DayOfWeek dow; private DayOfWeek dow;
@@ -77,7 +77,7 @@ public class PointEngine {
} }
public void importPointsFile(File pointsFile) { 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))) { try (BufferedReader br = new BufferedReader(new FileReader(pointsFile))) {
String line; String line;