Merge branch 'master' into develop

CHANGES.md

@@ -37,6 +37,12 @@
 * Change suppress output warnings from media process scripts
 
 
+### 0.15.7 (2018-04-06 13:30:00 UTC)
+
+* Change improve metadata handler during postprocessing when tvinfo source is down
+* Fix Torrentz2 filter spam
+
+
 ### 0.15.6 (2018-04-05 01:20:00 UTC)
 
 * Fix cf algorythm

lib/tvdb_api/tvdb_api.py

@@ -644,6 +644,8 @@ class Tvdb:
         try:
             src = self._load_url(url, params=params, language=language)
             return src
+        except tvdb_error:
+            raise sickbeard.indexer_error
         except (StandardError, Exception):
             return []
 

sickbeard/providers/torrentz2.py

@@ -90,7 +90,7 @@ class Torrentz2Provider(generic.TorrentProvider):
                 search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string
 
                 search_url = self.urls['search' + ('', 'v')[self.confirmed]] % (
-                    'tv%s' % ('+' + quote_plus(search_string), '')['Cache' == mode])
+                    quote_plus('%s -Torrent9 -nextorrent -XXX' % (search_string, 'x264')['Cache' == mode]))
 
                 html = self.get_url(search_url)
                 if self.should_skip():