moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-22 07:48:52 -05:00
Code Issues Releases Wiki Activity

Fix XEM mapping selection issues

Browse Source
This commit is contained in:
Reinhard Pointner 2019-06-11 06:38:16 +07:00
parent c55b24f480
commit a020c3ff1f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/filebot/web/XEM.java
View File

@ -40,6 +40,10 @@ public enum XEM {
return this == AniDB ? 1 : s; return this == AniDB ? 1 : s;
} }
public String getSeriesName(Map<String, List<String>> n, Integer s) {
return this == AniDB ? n.get(Integer.toString(s)).get(0) : n.get("all").get(0);
}
protected final Resource<Set<Integer>> haveMap = Resource.lazy(this::getHaveMap); protected final Resource<Set<Integer>> haveMap = Resource.lazy(this::getHaveMap);
public Optional<Episode> map(Episode episode, XEM destination) throws Exception { public Optional<Episode> map(Episode episode, XEM destination) throws Exception {
@ -49,19 +53,19 @@ public enum XEM {
return Optional.empty(); return Optional.empty();
} }
Set<String> seriesNames = episode.getSeriesNames(); String seriesName = episode.getSeriesName();
Integer season = getSeason(episode.getSeason()); Integer season = getSeason(episode.getSeason());
Map<String, List<String>> names = getNames(seriesId); Map<String, List<String>> names = getNames(seriesId);
debug.finest(format("[XEM] %s", names)); debug.finest(format("[XEM] %s", names));
Integer mappedSeason = names.entrySet().stream().filter(it -> { Integer mappedSeason = names.entrySet().stream().filter(it -> {
return it.getValue().stream().anyMatch(seriesNames::contains); return it.getValue().stream().anyMatch(seriesName::equals);
}).map(it -> { }).map(it -> {
return matchInteger(it.getKey()); return matchInteger(it.getKey());
}).filter(Objects::nonNull).findFirst().orElse(season); }).filter(Objects::nonNull).findFirst().orElse(season);
String mappedSeriesName = names.get("all").get(0); String mappedSeriesName = destination.getSeriesName(names, mappedSeason);
Map<String, Map<String, Number>> mapping = episode.getEpisode() != null ? getSingle(seriesId, mappedSeason, episode.getEpisode()) : getSingle(seriesId, 0, episode.getSpecial()); Map<String, Map<String, Number>> mapping = episode.getEpisode() != null ? getSingle(seriesId, mappedSeason, episode.getEpisode()) : getSingle(seriesId, 0, episode.getSpecial());