Merge branch 'refs/heads/develop'

couchpotato/core/media/movie/providers/trailer/hdtrailers.py

@@ -21,6 +21,7 @@ class HDTrailers(TrailerProvider):
         'backup': 'http://www.hd-trailers.net/blog/',
     }
     providers = ['apple.ico', 'yahoo.ico', 'moviefone.ico', 'myspace.ico', 'favicon.ico']
+    only_tables_tags = SoupStrainer('table')
 
     def search(self, group):
 
@@ -67,8 +68,7 @@ class HDTrailers(TrailerProvider):
             return results
 
         try:
-            tables = SoupStrainer('div')
+            html = BeautifulSoup(data, 'html.parser', parse_only = self.only_tables_tags)
-            html = BeautifulSoup(data, parse_only = tables)
             result_table = html.find_all('h2', text = re.compile(movie_name))
 
             for h2 in result_table:
@@ -90,8 +90,7 @@ class HDTrailers(TrailerProvider):
 
         results = {'480p':[], '720p':[], '1080p':[]}
         try:
-            tables = SoupStrainer('table')
+            html = BeautifulSoup(data, 'html.parser', parse_only = self.only_tables_tags)
-            html = BeautifulSoup(data, parse_only = tables)
             result_table = html.find('table', attrs = {'class':'bottomTable'})
 
             for tr in result_table.find_all('tr'):

couchpotato/core/notifications/xbmc.py

@@ -8,7 +8,7 @@ from couchpotato.core.helpers.variable import splitString, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
 import requests
-from requests.packages.urllib3.exceptions import MaxRetryError
+from requests.packages.urllib3.exceptions import MaxRetryError, ConnectionError
 
 
 log = CPLog(__name__)
@@ -172,7 +172,7 @@ class XBMC(Notification):
                 # manually fake expected response array
                 return [{'result': 'Error'}]
 
-        except (MaxRetryError, requests.exceptions.Timeout):
+        except (MaxRetryError, requests.exceptions.Timeout, ConnectionError):
             log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off')
             return [{'result': 'Error'}]
         except:

couchpotato/core/plugins/renamer.py

@@ -136,7 +136,7 @@ class Renamer(Plugin):
         else:
             for item in no_process:
                 if isSubFolder(item, base_folder):
-                    log.error('To protect your data, the media libraries can\'t be inside of or the same as the "from" folder.')
+                    log.error('To protect your data, the media libraries can\'t be inside of or the same as the "from" folder. "%s" in "%s"', (item, base_folder))
                     return
 
         # Check to see if the no_process folders are inside the provided media_folder
@@ -168,7 +168,7 @@ class Renamer(Plugin):
         if media_folder:
             for item in no_process:
                 if isSubFolder(item, media_folder):
-                    log.error('To protect your data, the media libraries can\'t be inside of or the same as the provided media folder.')
+                    log.error('To protect your data, the media libraries can\'t be inside of or the same as the provided media folder. "%s" in "%s"', (item, media_folder))
                     return
 
         # Make sure a checkSnatched marked all downloads/seeds as such