From 369aa6d406b16eb0a638285e50f6db7940ca4f28 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 26 Apr 2014 17:31:03 +0000 Subject: [PATCH] * fine-tuning for amc script --- source/net/filebot/cli/ScriptShellBaseClass.java | 6 +++++- source/net/filebot/similarity/SeasonEpisodeMatcher.java | 7 ++++++- website/data/series-mappings.txt | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/cli/ScriptShellBaseClass.java b/source/net/filebot/cli/ScriptShellBaseClass.java index 6a94ea29..b0712e87 100644 --- a/source/net/filebot/cli/ScriptShellBaseClass.java +++ b/source/net/filebot/cli/ScriptShellBaseClass.java @@ -194,7 +194,11 @@ public abstract class ScriptShellBaseClass extends Script { } public String detectSeriesName(Object files, boolean useSeriesIndex, boolean useAnimeIndex) throws Exception { - List names = MediaDetection.detectSeriesNames(FileUtilities.asFileList(files), useSeriesIndex, useAnimeIndex, Locale.ENGLISH); + List input = FileUtilities.asFileList(files); + if (input.isEmpty()) + return null; + + List names = MediaDetection.detectSeriesNames(input, useSeriesIndex, useAnimeIndex, Locale.ENGLISH); return names == null || names.isEmpty() ? null : names.get(0); } diff --git a/source/net/filebot/similarity/SeasonEpisodeMatcher.java b/source/net/filebot/similarity/SeasonEpisodeMatcher.java index b084a2c4..d89f1a1b 100644 --- a/source/net/filebot/similarity/SeasonEpisodeMatcher.java +++ b/source/net/filebot/similarity/SeasonEpisodeMatcher.java @@ -133,7 +133,7 @@ public class SeasonEpisodeMatcher { }; // (last-resort) match patterns like 101, 102 (and greedily just grab the first) - Num101_SUBSTRING = new SeasonEpisodePattern(STRICT_SANITY, "([1-9]{1})(\\d{2}).+") { + Num101_SUBSTRING = new SeasonEpisodePattern(STRICT_SANITY, "([1-9]{1})(\\d{2}).*") { @Override protected Collection process(MatchResult match) { @@ -341,6 +341,11 @@ public class SeasonEpisodeMatcher { return -1; } + + @Override + public String toString() { + return pattern.pattern(); + } } public static class SeasonEpisodeUnion implements SeasonEpisodeParser { diff --git a/website/data/series-mappings.txt b/website/data/series-mappings.txt index cfaf8e22..f1a36db4 100644 --- a/website/data/series-mappings.txt +++ b/website/data/series-mappings.txt @@ -1,3 +1,4 @@ +^episodes.(s\d{2}e\d{2}|\dx\d{2}) Episodes at.midnight @midnight BSG Battlestar Galactica Craig.Ferguson The Late Late Show with Craig Ferguson