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

Make sure regex pattern is at beginning of the line.

Browse Source
This commit is contained in:
Nicolás A. Ortega Froysa
2026-03-23 13:52:14 +01:00
parent f86934472c
commit ef575cdbd2
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@ import java.util.regex.Pattern;
public class PointEngine { public class PointEngine {
private double defaultPoints; private double defaultPoints;
private static final Pattern DEFAULT_PATTERN = Pattern.compile("^default\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE);
static private class PointRule { static private class PointRule {
private enum RuleType { private enum RuleType {
@@ -26,9 +27,9 @@ public class PointEngine {
DATE, DATE,
} }
static final Pattern DOW_PATTERN = Pattern.compile("dow=(sun|mon|tue|wed|thu|fri|sat)\\s+(\\d+\\.\\d+)", Pattern.CASE_INSENSITIVE); private 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); private 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 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;
@@ -80,15 +81,13 @@ public class PointEngine {
} }
public void importPointsFile(File pointsFile) { public void importPointsFile(File pointsFile) {
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;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
if (line.isEmpty() || line.charAt(0) == '#') if (line.isEmpty() || line.charAt(0) == '#')
continue; continue;
Matcher defaultMatcher = defaultPattern.matcher(line); Matcher defaultMatcher = DEFAULT_PATTERN.matcher(line);
if (defaultMatcher.find()) { if (defaultMatcher.find()) {
defaultPoints = Double.parseDouble(defaultMatcher.group(1)); defaultPoints = Double.parseDouble(defaultMatcher.group(1));
} else { } else {