From 3f6487b6219bb532a6b3c0eef21015869b83321e Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 30 Jul 2013 17:54:10 +0000 Subject: [PATCH] * improved subtitle auto-detection --- source/net/sourceforge/filebot/media/MediaDetection.java | 2 +- source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java index 3aea038a..55e8e3bf 100644 --- a/source/net/sourceforge/filebot/media/MediaDetection.java +++ b/source/net/sourceforge/filebot/media/MediaDetection.java @@ -590,7 +590,7 @@ public class MediaDetection { } - private static SimilarityMetric getMovieMatchMetric() { + public static SimilarityMetric getMovieMatchMetric() { return new MetricAvg(new SequenceMatchSimilarity(), new NameSimilarityMetric(), new SequenceMatchSimilarity(0, true), new NumericSimilarityMetric() { private Pattern year = Pattern.compile("\\b\\d{4}\\b"); diff --git a/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java b/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java index 930de9ff..0d71d39c 100644 --- a/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java +++ b/source/net/sourceforge/filebot/subtitle/SubtitleUtilities.java @@ -61,7 +61,7 @@ public final class SubtitleUtilities { return f < 1 ? -1 : 1; } }; - SimilarityMetric sanity = new MetricCascade(absoluteSeasonEpisode, AirDate, new MetricAvg(NameSubstringSequence, Name)); + SimilarityMetric sanity = new MetricCascade(absoluteSeasonEpisode, AirDate, new MetricAvg(NameSubstringSequence, Name), getMovieMatchMetric()); // first match everything as best as possible, then filter possibly bad matches Matcher matcher = new Matcher(files, subtitles, false, metrics);