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

* handle linked non-media files in EpisodeListMatcher as well

Browse Source
This commit is contained in:
Reinhard Pointner 2012-02-15 13:52:53 +00:00
parent e89b7fbe5c
commit 0ec089538c
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/net/sourceforge/filebot/ui/rename/EpisodeListMatcher.java
View File

@ -22,6 +22,8 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -209,6 +211,32 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
matches.addAll(future.get()); matches.addAll(future.get());
} }
// handle derived files
List<Match<File, ?>> derivateMatches = new ArrayList<Match<File, ?>>();
SortedSet<File> derivateFiles = new TreeSet<File>(files);
derivateFiles.removeAll(mediaFiles);
for (File file : derivateFiles) {
for (Match<File, ?> match : matches) {
if (file.getParentFile().equals(match.getValue().getParentFile()) && isDerived(file, match.getValue())) {
derivateMatches.add(new Match<File, Object>(file, match.getCandidate()));
break;
}
}
}
// add matches from other files that are linked via filenames
matches.addAll(derivateMatches);
// restore original order
Collections.sort(matches, new Comparator<Match<File, ?>>() {
@Override
public int compare(Match<File, ?> o1, Match<File, ?> o2) {
return files.indexOf(o1.getValue()) - files.indexOf(o2.getValue());
}
});
// all background workers have finished // all background workers have finished
return matches; return matches;
} finally { } finally {
@ -265,15 +293,6 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
matches.addAll(matcher.match()); matches.addAll(matcher.match());
} }
// restore original order
Collections.sort(matches, new Comparator<Match<File, ?>>() {
@Override
public int compare(Match<File, ?> o1, Match<File, ?> o2) {
return files.indexOf(o1.getValue()) - files.indexOf(o2.getValue());
}
});
return matches; return matches;
} }
} }