Add yyyymmdd date pattern
@see https://www.filebot.net/forums/viewtopic.php?f=8&t=3409
This commit is contained in:
parent
856972e4da
commit
95ea4130ec
|
@ -16,7 +16,7 @@ public class DateMatcher {
|
||||||
private final DatePattern[] patterns;
|
private final DatePattern[] patterns;
|
||||||
|
|
||||||
public DateMatcher() {
|
public DateMatcher() {
|
||||||
patterns = new DatePattern[6];
|
patterns = new DatePattern[7];
|
||||||
|
|
||||||
// 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 });
|
||||||
|
@ -35,6 +35,9 @@ public class DateMatcher {
|
||||||
|
|
||||||
// match dd.MMM.yyyy patterns like 8 Sep 2015
|
// 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");
|
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");
|
||||||
|
|
||||||
|
// match yyyymmdd patterns like 20140408
|
||||||
|
patterns[6] = new DateFormatPattern("(?<!\\p{Alnum})(\\d{8})(?!\\p{Alnum})", "yyyymmdd");
|
||||||
}
|
}
|
||||||
|
|
||||||
public DateMatcher(DatePattern... patterns) {
|
public DateMatcher(DatePattern... patterns) {
|
||||||
|
|
|
@ -120,8 +120,7 @@ public class SimpleDate implements Serializable, Comparable<Object> {
|
||||||
date.setTime(formatter.parse(string));
|
date.setTime(formatter.parse(string));
|
||||||
return new SimpleDate(date.get(YEAR), date.get(MONTH) + 1, date.get(DAY_OF_MONTH)); // Calendar months start at 0
|
return new SimpleDate(date.get(YEAR), date.get(MONTH) + 1, date.get(DAY_OF_MONTH)); // Calendar months start at 0
|
||||||
} catch (ParseException e) {
|
} catch (ParseException e) {
|
||||||
// no result if date is invalid
|
// date is invalid
|
||||||
// Logger.getLogger(Date.class.getName()).log(Level.WARNING, e.getMessage());
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue