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

Require a set of distinct files 

# Fixes https://www.filebot.net/forums/viewtopic.php?f=6&t=5108
This commit is contained in:
Reinhard Pointner 2017-06-11 20:44:49 +08:00
parent 422b9e2417
commit 7bbfc3cfa7
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/net/filebot/Logging.java
View File

@ -13,6 +13,7 @@ import java.io.StringWriter;
import java.nio.channels.FileChannel;
import java.nio.file.StandardOpenOption;
import java.util.Objects;
import java.util.concurrent.ExecutionException;
import java.util.function.Supplier;
import java.util.logging.Formatter;
import java.util.logging.Handler;
@ -113,7 +114,7 @@ public final class Logging {
private static String getMessage(String m, Throwable t) {
// try to unravel stacked exceptions
if (t instanceof RuntimeException && t.getCause() != null) {
if (t.getCause() != null && (t instanceof RuntimeException || t instanceof ExecutionException)) {
return getMessage(m, t.getCause());
}

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

@ -15,7 +15,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutorService;
@ -44,17 +43,21 @@ class AutoDetectMatcher implements AutoCompleteMatcher {
// can't use parallel stream because default fork/join pool doesn't play well with the security manager
ExecutorService workerThreadPool = Executors.newFixedThreadPool(getPreferredThreadPoolSize());
try {
Map<Group, Future<List<Match<File, ?>>>> matches = groups.entrySet().stream().collect(toMap(Entry::getKey, it -> {
// match groups in parallel
List<Future<List<Match<File, ?>>>> matches = groups.entrySet().stream().filter(it -> {
return it.getKey().types().length == 1; // unambiguous group
}).map(it -> {
return workerThreadPool.submit(() -> match(it.getKey(), it.getValue(), strict, order, locale, autodetection, parent));
}));
}).collect(toList());
// collect results
return matches.entrySet().stream().flatMap(it -> {
return matches.stream().flatMap(it -> {
try {
return it.getValue().get().stream();
return it.get().stream();
} catch (Exception e) {
// CancellationException is expected
if (findCause(e, CancellationException.class) == null) {
log.log(Level.WARNING, "Failed group: " + it.getKey(), e);
log.log(Level.WARNING, e, cause("Failed to match group", e));
}
return Stream.empty();
}
@ -65,22 +68,18 @@ class AutoDetectMatcher implements AutoCompleteMatcher {
}
private List<Match<File, ?>> match(Group group, Collection<File> files, boolean strict, SortOrder order, Locale locale, boolean autodetection, Component parent) throws Exception {
if (group.types().length == 1) {
for (Type key : group.types()) {
switch (key) {
case Movie:
return movie.match(files, strict, order, locale, autodetection, parent);
case Series:
return episode.match(files, strict, order, locale, autodetection, parent);
case Anime:
return anime.match(files, strict, order, locale, autodetection, parent);
case Music:
return music.match(files, strict, order, locale, autodetection, parent);
}
for (Type key : group.types()) {
switch (key) {
case Movie:
return movie.match(files, strict, order, locale, autodetection, parent);
case Series:
return episode.match(files, strict, order, locale, autodetection, parent);
case Anime:
return anime.match(files, strict, order, locale, autodetection, parent);
case Music:
return music.match(files, strict, order, locale, autodetection, parent);
}
}
debug.info(format("Ignore group: %s", group));
return emptyList();
}