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

Clean up

Browse Source
This commit is contained in:
Reinhard Pointner 2016-02-28 10:47:20 +00:00
parent 812ac6393c
commit fd41e5518a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/net/filebot/web/EpisodeFormat.java
View File

@ -7,7 +7,7 @@ import java.text.FieldPosition;
import java.text.Format; import java.text.Format;
import java.text.ParseException; import java.text.ParseException;
import java.text.ParsePosition; import java.text.ParsePosition;
import java.util.List; import java.util.Collection;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeMap; import java.util.TreeMap;
@ -57,7 +57,7 @@ public class EpisodeFormat extends Format {
return sb; return sb;
} }
public String formatMultiEpisode(List<Episode> episodes) { public String formatMultiEpisode(Collection<Episode> episodes) {
Function<Episode, String> seriesName = it -> it.getSeriesName(); Function<Episode, String> seriesName = it -> it.getSeriesName();
Function<Episode, String> episodeNumber = it -> formatSxE(it); Function<Episode, String> episodeNumber = it -> formatSxE(it);
Function<Episode, String> episodeTitle = it -> removeTrailingBrackets(it.getTitle()); Function<Episode, String> episodeTitle = it -> removeTrailingBrackets(it.getTitle());
@ -97,19 +97,19 @@ public class EpisodeFormat extends Format {
return sb.toString(); return sb.toString();
} }
public String formatMultiTitle(List<Episode> episodes) { public String formatMultiTitle(Collection<Episode> episodes) {
return episodes.stream().map(it -> removeTrailingBrackets(it.getTitle())).distinct().collect(joining(" & ")); return episodes.stream().map(it -> removeTrailingBrackets(it.getTitle())).distinct().collect(joining(" & "));
} }
public String formatMultiRangeSxE(List<Episode> episodes) { public String formatMultiRangeSxE(Iterable<Episode> episodes) {
return formatMultiRangeNumbers(episodes, "%01dx", "%02d"); return formatMultiRangeNumbers(episodes, "%01dx", "%02d");
} }
public String formatMultiRangeS00E00(List<Episode> episodes) { public String formatMultiRangeS00E00(Iterable<Episode> episodes) {
return formatMultiRangeNumbers(episodes, "S%02d", "E%02d"); return formatMultiRangeNumbers(episodes, "S%02d", "E%02d");
} }
public String formatMultiRangeNumbers(List<Episode> episodes, String seasonFormat, String episodeFormat) { public String formatMultiRangeNumbers(Iterable<Episode> episodes, String seasonFormat, String episodeFormat) {
return getSeasonEpisodeNumbers(episodes).entrySet().stream().map(it -> { return getSeasonEpisodeNumbers(episodes).entrySet().stream().map(it -> {
String s = it.getKey() >= 0 ? String.format(seasonFormat, it.getKey()) : ""; String s = it.getKey() >= 0 ? String.format(seasonFormat, it.getKey()) : "";
return Stream.of(it.getValue().first(), it.getValue().last()).distinct().map(i -> String.format(episodeFormat, i)).collect(joining("-", s, "")); return Stream.of(it.getValue().first(), it.getValue().last()).distinct().map(i -> String.format(episodeFormat, i)).collect(joining("-", s, ""));