From cb8aa8d7d614544e30218bfeea3f9bfccd098ea3 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 16 Apr 2013 07:32:04 +0000 Subject: [PATCH] * make -non-strict option more self-explanatory --- source/net/sourceforge/filebot/cli/ArgumentBean.java | 2 +- source/net/sourceforge/filebot/cli/CmdlineOperations.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/net/sourceforge/filebot/cli/ArgumentBean.java b/source/net/sourceforge/filebot/cli/ArgumentBean.java index 37a4b180..f5f30b56 100644 --- a/source/net/sourceforge/filebot/cli/ArgumentBean.java +++ b/source/net/sourceforge/filebot/cli/ArgumentBean.java @@ -41,7 +41,7 @@ public class ArgumentBean { @Option(name = "--format", usage = "Episode/Movie naming scheme", metaVar = "expression") public String format; - @Option(name = "-non-strict", usage = "Use less strict matching") + @Option(name = "-non-strict", usage = "Enable advanced matching and more aggressive guess work") public boolean nonStrict = false; @Option(name = "-get-subtitles", usage = "Fetch subtitles", metaVar = "fileset") diff --git a/source/net/sourceforge/filebot/cli/CmdlineOperations.java b/source/net/sourceforge/filebot/cli/CmdlineOperations.java index f82f5eaf..3fe8f1c8 100644 --- a/source/net/sourceforge/filebot/cli/CmdlineOperations.java +++ b/source/net/sourceforge/filebot/cli/CmdlineOperations.java @@ -885,7 +885,11 @@ public class CmdlineOperations implements CmdlineInterface { return new ArrayList(searchResults); } - throw new Exception("Unable to auto-select search result: " + searchResults); + if (strict) { + throw new Exception("Multiple options: Force auto-select requires non-strict matching: " + searchResults); + } else { + throw new Exception("Unable to auto-select search result: " + searchResults); + } } // return first and only value