moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-01-11 22:08:01 -05:00
Code Issues Releases Wiki Activity

Refactor OriginalOrder

Browse Source
This commit is contained in:
Reinhard Pointner 2016-05-14 01:28:58 +08:00
parent 2eaac2eab8
commit b1d48fe590
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/net/filebot/ui/rename/AutoDetectMatcher.java
View File

@ -54,7 +54,7 @@ class AutoDetectMatcher implements AutoCompleteMatcher {
log.log(Level.WARNING, "Failed group: " + it.getKey(), e); log.log(Level.WARNING, "Failed group: " + it.getKey(), e);
return Stream.empty(); return Stream.empty();
} }
}).sorted(comparing(Match::getValue, new OriginalOrder<File>(files))).collect(toList()); }).sorted(comparing(Match::getValue, OriginalOrder.of(files))).collect(toList());
} finally { } finally {
workerThreadPool.shutdownNow(); workerThreadPool.shutdownNow();
} }

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

@ -137,7 +137,7 @@ class EpisodeListMatcher implements AutoCompleteMatcher {
matches.addAll(derivateMatches); matches.addAll(derivateMatches);
// restore original order // restore original order
matches.sort(comparing(Match::getValue, new OriginalOrder<File>(files))); matches.sort(comparing(Match::getValue, OriginalOrder.of(files)));
return matches; return matches;
} }

2
source/net/filebot/ui/rename/MovieMatcher.java
View File

@ -217,7 +217,7 @@ class MovieMatcher implements AutoCompleteMatcher {
}); });
// restore original order // restore original order
matches.sort(comparing(Match::getValue, new OriginalOrder<File>(files))); matches.sort(comparing(Match::getValue, OriginalOrder.of(files)));
return matches; return matches;
} }

4
source/net/filebot/ui/rename/OriginalOrder.java
View File

@ -7,6 +7,10 @@ import java.util.Map;
class OriginalOrder<T> implements Comparator<T> { class OriginalOrder<T> implements Comparator<T> {
public static <T> Comparator<T> of(Collection<T> values) {
return new OriginalOrder(values);
}
private Map<T, Integer> index; private Map<T, Integer> index;
public OriginalOrder(Collection<T> values) { public OriginalOrder(Collection<T> values) {