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

Fix illegal date issues (e.g. year out of bounds)

This commit is contained in:
Reinhard Pointner 2016-10-05 10:59:27 +08:00
parent 106fef7dd9
commit c66ef6e668
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,11 +5,9 @@ import static net.filebot.util.FileUtilities.*;
import java.io.File; import java.io.File;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.Month; import java.time.Month;
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.time.format.TextStyle;
import java.time.temporal.ChronoField;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -24,7 +22,7 @@ import one.util.streamex.StreamEx;
public class DateMatcher { public class DateMatcher {
public static final DateFilter DEFAULT_SANITY = new DateFilter(LocalDate.of(1930, Month.JANUARY, 1), LocalDate.of(2050, Month.JANUARY, 1)); public static final DateFilter DEFAULT_SANITY = new DateFilter(1930, 2050);
private final DatePattern[] patterns; private final DatePattern[] patterns;
@ -196,23 +194,30 @@ public class DateMatcher {
} }
public static class DateFilter implements Predicate<ChronoLocalDate> { public static class DateFilter implements Predicate<LocalDate> {
public final ChronoLocalDate min; public final LocalDate min;
public final ChronoLocalDate max; public final LocalDate max;
private final int minYear; private final int minYear;
private final int maxYear; private final int maxYear;
public DateFilter(ChronoLocalDate min, ChronoLocalDate max) { public DateFilter(LocalDate min, LocalDate max) {
this.min = min; this.min = min;
this.max = max; this.max = max;
this.minYear = min.get(ChronoField.YEAR); this.minYear = min.getYear();
this.maxYear = max.get(ChronoField.YEAR); this.maxYear = max.getYear();
}
public DateFilter(int minYear, int maxYear) {
this.min = LocalDate.of(minYear, Month.JANUARY, 1);
this.max = LocalDate.of(maxYear, Month.JANUARY, 1);
this.minYear = minYear;
this.maxYear = maxYear;
} }
@Override @Override
public boolean test(ChronoLocalDate date) { public boolean test(LocalDate date) {
return date.isAfter(min) && date.isBefore(max); return date.isAfter(min) && date.isBefore(max);
} }