mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize DateMatcher

This commit is contained in:
Reinhard Pointner 2016-02-10 12:03:07 +00:00
parent ffa8b021e0
commit 331f51caf7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/net/filebot/similarity/DateMatcher.java
View File

@ -10,6 +10,7 @@ import java.time.Month;
import java.time.chrono.ChronoLocalDate; import java.time.chrono.ChronoLocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
import java.time.format.TextStyle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -57,12 +58,12 @@ public class DateMatcher {
protected DatePattern[] compile(List<String> dateFormat, Locale locale, DateFilter sanity) { protected DatePattern[] compile(List<String> dateFormat, Locale locale, DateFilter sanity) {
return dateFormat.stream().map(format -> { return dateFormat.stream().map(format -> {
String pattern = stream(format.split(DateFormatPattern.DELIMITER)).map(this::getPatternGroup).collect(joining("[^\\p{Alnum}]", "(?<!\\p{Alnum})", "(?!\\p{Alnum})")); String pattern = stream(format.split(DateFormatPattern.DELIMITER)).map(g -> getPatternGroup(g, locale)).collect(joining("[^\\p{Alnum}]", "(?<!\\p{Alnum})", "(?!\\p{Alnum})"));
return new DateFormatPattern(pattern, format, locale, sanity); return new DateFormatPattern(pattern, format, locale, sanity);
}).toArray(DateFormatPattern[]::new); }).toArray(DateFormatPattern[]::new);
} }
protected String getPatternGroup(String token) { protected String getPatternGroup(String token, Locale locale) {
switch (token) { switch (token) {
case "y": case "y":
return "(\\d{4})"; return "(\\d{4})";
@ -73,14 +74,18 @@ public class DateMatcher {
case "yyyyMMdd": case "yyyyMMdd":
return "(\\d{8})"; return "(\\d{8})";
case "MMMM": case "MMMM":
return "(January|February|March|April|May|June|July|August|September|October|November|December)"; return getMonthNamePatternGroup(TextStyle.FULL, locale);
case "MMM": case "MMM":
return "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"; return getMonthNamePatternGroup(TextStyle.SHORT, locale);
default: default:
throw new IllegalArgumentException(token); throw new IllegalArgumentException(token);
} }
} }
protected String getMonthNamePatternGroup(TextStyle style, Locale locale) {
return stream(Month.values()).map(m -> m.getDisplayName(style, locale)).map(Pattern::quote).collect(joining("|", "(", ")"));
}
public SimpleDate match(CharSequence seq) { public SimpleDate match(CharSequence seq) {
for (DatePattern pattern : patterns) { for (DatePattern pattern : patterns) {
SimpleDate match = pattern.match(seq); SimpleDate match = pattern.match(seq);