diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index 8cf78bcfd942475dc2af74e97874f873e6df8f49..ae385753280706c4e617e7c594dd2d09e275e5c0 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -1358,13 +1358,20 @@ def headURL(url, params=None, headers={}, timeout=30, session=None, json=False, except requests.exceptions.HTTPError, e: logger.log(u"HTTP error in headURL {0}. Error: {1}".format(url,e.errno), logger.WARNING) + pass except requests.exceptions.ConnectionError, e: logger.log(u"Connection error to {0}. Error: {1}".format(url,e.message), logger.WARNING) + pass except requests.exceptions.Timeout, e: logger.log(u"Connection timed out accessing {0}. Error: {1}".format(url,e.message), logger.WARNING) + pass + except requests.exceptions.ContentDecodingError: + logger.log(u"Content-Encoding was gzip, but content was not compressed", logger.WARNING) + pass except Exception as e: logger.log(u"Unknown exception in headURL {0}. Error: {1}".format(url,e.message), logger.WARNING) logger.log(traceback.format_exc(), logger.WARNING) + pass return False @@ -1408,6 +1415,9 @@ def getURL(url, post_data=None, params={}, headers={}, timeout=30, session=None, except requests.exceptions.Timeout, e: logger.log(u"Connection timed out accessing {0}. Error: {1}".format(url,e.message), logger.WARNING) return + except requests.exceptions.ContentDecodingError: + logger.log(u"Content-Encoding was gzip, but content was not compressed", logger.WARNING) + return except Exception as e: logger.log(u"Unknown exception in getURL {0}. Error: {1}".format(url,e.message), logger.WARNING) logger.log(traceback.format_exc(), logger.WARNING) diff --git a/sickbeard/subtitles.py b/sickbeard/subtitles.py index 8532b57b967adae3c7dbdeb7ad34806f17d5cc5c..afb63ff7b9cefbea39bf87000f3aa06057dbf866 100644 --- a/sickbeard/subtitles.py +++ b/sickbeard/subtitles.py @@ -89,6 +89,10 @@ def wantedLanguages(sqlLike = False): def subtitlesLanguages(video_path): """Return a list detected subtitles for the given video file""" resultList = [] + + if sickbeard.SUBTITLES_DIR and ek.ek(os.path.exists, sickbeard.SUBTITLES_DIR): + video_path = ek.ek(os.path.join, sickbeard.SUBTITLES_DIR, ek.ek(os.path.basename, video_path)) + languages = subliminal.video.scan_subtitle_languages(video_path) for language in languages: