moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-10 06:20:27 -04:00
Code Issues Releases Wiki Activity

* make sure that there cannot be SxE mismatches in Strict Mode

Browse Source
This commit is contained in:
Reinhard Pointner 2014-08-13 16:23:02 +00:00
parent 097e001111
commit 0b617b4381
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import net.filebot.media.MediaDetection;
import net.filebot.media.XattrMetaInfoProvider;
import net.filebot.similarity.CommonSequenceMatcher;
import net.filebot.similarity.EpisodeMatcher;
import net.filebot.similarity.EpisodeMetrics;
import net.filebot.similarity.Match;
import net.filebot.similarity.NameSimilarityMetric;
import net.filebot.similarity.SeriesNameMatcher;
@ -150,8 +151,7 @@ public class CmdlineOperations implements CmdlineInterface {
return renameAll(renameMap, renameAction, ConflictAction.forName(conflict), null);
}
public List<File> renameSeries(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, ExpressionFilter filter, Locale locale, boolean strict)
throws Exception {
public List<File> renameSeries(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, ExpressionFilter filter, Locale locale, boolean strict) throws Exception {
CLILogger.config(format("Rename episodes using [%s]", db.getName()));
// ignore sample files
@ -261,7 +261,19 @@ public class CmdlineOperations implements CmdlineInterface {
CLILogger.warning("No matching episode: " + failedMatch.getName());
}
return matches;
// in non-strict mode just pass back results as we got it from the matcher
if (!strict) {
return matches;
}
// in strict mode sanity check the result and only pass back good matches
List<Match<File, Object>> validMatches = new ArrayList<Match<File, Object>>();
for (Match<File, Object> it : matches) {
if (EpisodeMetrics.EpisodeIdentifier.getSimilarity(it.getValue(), it.getCandidate()) >= 1) {
validMatches.add(it);
}
}
return validMatches;
}
private Set<Episode> fetchEpisodeSet(final EpisodeListProvider db, final Collection<String> names, final SortOrder sortOrder, final Locale locale, final boolean strict) throws Exception {

6
source/net/filebot/ui/rename/EpisodeListMatcher.java
View File

@ -39,6 +39,7 @@ import net.filebot.Analytics;
import net.filebot.Settings;
import net.filebot.similarity.CommonSequenceMatcher;
import net.filebot.similarity.EpisodeMatcher;
import net.filebot.similarity.EpisodeMetrics;
import net.filebot.similarity.Match;
import net.filebot.ui.SelectDialog;
import net.filebot.web.Episode;
@ -319,7 +320,10 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
for (List<File> filesPerType : mapByMediaExtension(files).values()) {
EpisodeMatcher matcher = new EpisodeMatcher(filesPerType, episodes, strict);
for (Match<File, Object> it : matcher.match()) {
matches.add(new Match<File, Episode>(it.getValue(), ((Episode) it.getCandidate()).clone()));
// in strict mode sanity check the result and only pass back good matches
if (!strict || EpisodeMetrics.EpisodeIdentifier.getSimilarity(it.getValue(), it.getCandidate()) >= 1) {
matches.add(new Match<File, Episode>(it.getValue(), ((Episode) it.getCandidate()).clone()));
}
}
}
}