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

Reverse Map [%s] to [%s]

Browse Source
This commit is contained in:
Reinhard Pointner 2019-06-10 14:33:07 +07:00
parent f0b4d65d27
commit b0734f74c4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/net/filebot/cli/CmdlineOperations.java
View File

@ -224,7 +224,7 @@ public class CmdlineOperations implements CmdlineInterface {
episodes = applyEpisodeExpressionMapper(episodes, mapper); episodes = applyEpisodeExpressionMapper(episodes, mapper);
for (List<File> filesPerType : mapByMediaExtension(filter(batch, VIDEO_FILES, SUBTITLE_FILES)).values()) { for (List<File> filesPerType : mapByMediaExtension(filter(batch, VIDEO_FILES, SUBTITLE_FILES)).values()) {
matches.addAll(matchEpisodes(filesPerType, episodes, strict)); matchEpisodes(filesPerType, episodes, strict).stream().map(this::unmap).forEach(matches::add);
} }
} }
} }
@ -254,6 +254,16 @@ public class CmdlineOperations implements CmdlineInterface {
return renameAll(formatMatches(matches, format, outputDir), renameAction, conflictAction, matches, exec); return renameAll(formatMatches(matches, format, outputDir), renameAction, conflictAction, matches, exec);
} }
private Match<File, ?> unmap(Match<File, ?> match) {
// add matches and unmap mapped episodes
if (match.getCandidate() instanceof MappedEpisode) {
MappedEpisode mapping = (MappedEpisode) match.getCandidate();
log.fine(format("Reverse Map [%s] to [%s]", mapping.getMapping(), mapping.getOriginal()));
return new Match<File, Episode>(match.getValue(), mapping.getOriginal());
}
return match;
}
private List<Match<File, Object>> matchEpisodes(Collection<File> files, Collection<Episode> episodes, boolean strict) throws Exception { private List<Match<File, Object>> matchEpisodes(Collection<File> files, Collection<Episode> episodes, boolean strict) throws Exception {
// always use strict fail-fast matcher // always use strict fail-fast matcher
EpisodeMatcher matcher = new EpisodeMatcher(files, episodes, strict); EpisodeMatcher matcher = new EpisodeMatcher(files, episodes, strict);