Fix {sy} issues

This commit is contained in:
Reinhard Pointner 2016-08-10 19:11:23 +08:00
parent 4b25cd6983
commit d92b67396e
1 changed files with 2 additions and 2 deletions

View File

@ -712,12 +712,12 @@ public class MediaBindingBean {
@Define("sy")
public List<Integer> getSeasonYears() throws Exception {
return getEpisodeList().stream().filter(e -> getSeasonNumber().equals(e.getSeason()) && e.getAirdate() != null).map(e -> e.getAirdate().getYear()).sorted().distinct().collect(toList());
return getEpisodeList().stream().filter(e -> isRegular(e) && e.getSeason().equals(getSeasonNumber()) && e.getAirdate() != null).map(e -> e.getAirdate().getYear()).sorted().distinct().collect(toList());
}
@Define("sc")
public Integer getSeasonCount() throws Exception {
return getEpisodeList().stream().map(Episode::getSeason).filter(Objects::nonNull).max(Integer::compare).get();
return getEpisodeList().stream().filter(e -> isRegular(e) && e.getSeason() != null).map(Episode::getSeason).max(Integer::compare).get();
}
@Define("localize")