diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java b/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java index b7b5c7e0..5f579d22 100644 --- a/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java +++ b/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java @@ -60,6 +60,10 @@ public final class SubtitleUtilities { for (List byMediaFolder : mapByMediaFolder(fileSet).values()) { for (Entry> bySeries : mapBySeriesName(byMediaFolder, true, false, Locale.ENGLISH).entrySet()) { + // allow early abort + if (Thread.interrupted()) + throw new InterruptedException(); + // auto-detect query and search for subtitles Collection querySet = new TreeSet(String.CASE_INSENSITIVE_ORDER); List files = bySeries.getValue(); @@ -90,10 +94,9 @@ public final class SubtitleUtilities { Set subtitles = findSubtitles(service, querySet, languageName); - // dialog may have been cancelled by now - if (Thread.interrupted()) { + // allow early abort + if (Thread.interrupted()) throw new InterruptedException(); - } // files by possible subtitles matches for (File file : files) { @@ -105,7 +108,7 @@ public final class SubtitleUtilities { float minMatchSimilarity = strict ? 0.9f : 0.6f; // first match everything as best as possible, then filter possibly bad matches - for (Entry it : matchSubtitles(files, subtitles, strict).entrySet()) { + for (Entry it : matchSubtitles(files, subtitles, false).entrySet()) { if (sanity.getSimilarity(it.getKey(), it.getValue()) >= minMatchSimilarity) { subtitlesByFile.get(it.getKey()).add(it.getValue()); } diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt index c6e97967..3c9a2120 100644 --- a/website/data/release-groups.txt +++ b/website/data/release-groups.txt @@ -230,6 +230,7 @@ AVCDVD AVCHD AVENUE AVF +AVG AVS1080 AVS720 AW