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

* added support for additional date patterns like "25 July 2014" or "8 Sep 2015"

This commit is contained in:
Reinhard Pointner 2015-10-12 18:34:30 +00:00
parent 8e1f837fd0
commit b657599a6c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ public class DateMatcher {
private final DatePattern[] patterns; private final DatePattern[] patterns;
public DateMatcher() { public DateMatcher() {
patterns = new DatePattern[4]; patterns = new DatePattern[6];
// match yyyy-mm-dd patterns like 2010-10-24, 2009/6/1, etc // match yyyy-mm-dd patterns like 2010-10-24, 2009/6/1, etc
patterns[0] = new NumericDatePattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](\\d{1,2})[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", new int[] { 1, 2, 3 }); patterns[0] = new NumericDatePattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](\\d{1,2})[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", new int[] { 1, 2, 3 });
@ -24,11 +24,17 @@ public class DateMatcher {
// match dd-mm-yyyy patterns like 1.1.2010, 01/06/2010, etc // match dd-mm-yyyy patterns like 1.1.2010, 01/06/2010, etc
patterns[1] = new NumericDatePattern("(?<!\\p{Alnum})(\\d{1,2})[^\\p{Alnum}](\\d{1,2})[^\\p{Alnum}](\\d{4})(?!\\p{Alnum})", new int[] { 3, 2, 1 }); patterns[1] = new NumericDatePattern("(?<!\\p{Alnum})(\\d{1,2})[^\\p{Alnum}](\\d{1,2})[^\\p{Alnum}](\\d{4})(?!\\p{Alnum})", new int[] { 3, 2, 1 });
// match yyyy.MMMMM.dd patterns like 2015.October.05 etc // match yyyy.MMMMM.dd patterns like 2015.October.05
patterns[2] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](?i:January|February|March|April|May|June|July|August|September|October|November|December)[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", "yyyy MMMMM dd"); patterns[2] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](?i:January|February|March|April|May|June|July|August|September|October|November|December)[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", "yyyy MMMMM dd");
// match yyyy.MMM.dd patterns like 2015.Oct.06 etc // match yyyy.MMM.dd patterns like 2015.Oct.06
patterns[3] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](?i:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", "yyyy MMM dd"); patterns[3] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{4})[^\\p{Alnum}](?i:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^\\p{Alnum}](\\d{1,2})(?!\\p{Alnum})", "yyyy MMM dd");
// match dd.MMMMM.yyyy patterns like 25 July 2014
patterns[4] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{1,2})[^\\p{Alnum}](?i:January|February|March|April|May|June|July|August|September|October|November|December)[^\\p{Alnum}](\\d{4})(?!\\p{Alnum})", "dd MMMMM yyyy");
// match dd.MMM.yyyy patterns like 8 Sep 2015
patterns[5] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{1,2})[^\\p{Alnum}](?i:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[^\\p{Alnum}](\\d{4})(?!\\p{Alnum})", "dd MMM yyyy");
} }
public DateMatcher(DatePattern... patterns) { public DateMatcher(DatePattern... patterns) {