From f1958535d2c663dfd052cafcf2e1d32be5da7742 Mon Sep 17 00:00:00 2001
From: Prinz23 <Prinz2311@gmail.com>
Date: Wed, 13 Dec 2017 01:50:00 +0000
Subject: [PATCH] Change improve usage of the optional regex library.

Limit possible regex errors to 20% of extra_info up to max 3 errors.
---
 CHANGES.md                                      | 1 +
 gui/slick/interfaces/default/config_search.tmpl | 4 ++++
 sickbeard/name_parser/parser.py                 | 9 +++++++--
 sickbeard/webserve.py                           | 6 ++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index d6662e80..cc242dca 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
 ### 0.13.6 (2017-12-13 01:50:00 UTC)
 
 * Change improve multi episode release search
+* Change improve usage of the optional regex library
 
 
 ### 0.13.5 (2017-12-11 21:45:00 UTC)
diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl
index 237fd4ba..81393717 100755
--- a/gui/slick/interfaces/default/config_search.tmpl
+++ b/gui/slick/interfaces/default/config_search.tmpl
@@ -58,8 +58,12 @@
 						</div>
 						<div id="content_download_propers">
 							<span class="component-desc">
+#if $getVar('using_regex', False)
+                                <p>Optional <a href="https://pypi.python.org/pypi/regex" target="_blank">regex python library</a> is being used</p>
+#else
                                 <p>Optional: to improve matching, install the OS dependent <a href="https://pypi.python.org/pypi/regex" target="_blank">regex python library</a></p>
                                 <p>at a command line, simply enter ... <code>python -m pip install regex</code></p>
+#end if
                             </span>
 							<div class="field-pair">
 								<label>
diff --git a/sickbeard/name_parser/parser.py b/sickbeard/name_parser/parser.py
index 62e5b552..1167c712 100644
--- a/sickbeard/name_parser/parser.py
+++ b/sickbeard/name_parser/parser.py
@@ -656,8 +656,13 @@ class ParseResult(object):
         if None is regex:
             return re.sub(ep_regex, '', e_i_n_n, flags=re.I)
 
-        return regex.sub(r'(%s){e<=%d}' % (
-            ep_regex, trunc(len(re.findall(r'\w', ep_regex)) / 5)), '', e_i_n_n, flags=regex.I | regex.B)
+        er = trunc(len(re.findall(r'\w', ep_regex)) / 5)
+        try:
+            me = trunc(len(e_i_n_n) / 5)
+            me = min(3, me)
+        except (StandardError, Exception):
+            me = 3
+        return regex.sub(r'(%s){e<=%d}' % (ep_regex, (er, me)[er > me]), '', e_i_n_n, flags=regex.I | regex.B)
 
     def get_extra_info_no_name(self):
         extra_info_no_name = self.extra_info
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 7e1c45b8..73b70ded 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -4976,6 +4976,12 @@ class ConfigSearch(Config):
                                      show.rls_require_words.strip()]
         t.using_rls_require_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False)
         t.propers_intervals = search_propers.ProperSearcher().search_intervals
+        t.using_regex = False
+        try:
+            from sickbeard.name_parser.parser import regex
+            t.using_regex = None is not regex
+        except (StandardError, Exception):
+            pass
         return t.respond()
 
     def saveSearch(self, use_nzbs=None, use_torrents=None, nzb_dir=None, sab_username=None, sab_password=None,