* revert folder-by-folder change because movies my very well be sorted into different CDn folders

This commit is contained in:
Reinhard Pointner 2013-12-23 05:33:24 +00:00
parent 56d1892e24
commit e6331f1116
1 changed files with 13 additions and 15 deletions

View File

@ -222,8 +222,7 @@ class MovieHashMatcher implements AutoCompleteMatcher {
List<Match<File, ?>> matches = new ArrayList<Match<File, ?>>(); List<Match<File, ?>> matches = new ArrayList<Match<File, ?>>();
for (Entry<Movie, SortedSet<File>> byMovie : filesByMovie.entrySet()) { for (Entry<Movie, SortedSet<File>> byMovie : filesByMovie.entrySet()) {
for (List<File> byFolder : mapByFolder(byMovie.getValue()).values()) { for (List<File> fileSet : mapByExtension(byMovie.getValue()).values()) {
for (List<File> fileSet : mapByExtension(byFolder).values()) {
// resolve movie parts // resolve movie parts
for (int i = 0; i < fileSet.size(); i++) { for (int i = 0; i < fileSet.size(); i++) {
Movie moviePart = byMovie.getKey(); Movie moviePart = byMovie.getKey();
@ -243,7 +242,6 @@ class MovieHashMatcher implements AutoCompleteMatcher {
} }
} }
} }
}
// restore original order // restore original order
sort(matches, new Comparator<Match<File, ?>>() { sort(matches, new Comparator<Match<File, ?>>() {