diff --git a/CHANGES.md b/CHANGES.md index 3854bf99..7f689ff5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,7 @@ * Update unidecode module 1.0.22 (81f938d) to 1.0.22 (578cdb9) * Change site services tester to fallback to http if error with SSL * Change try to use folder name when filename does not contain show name +* Change force redirects in TVMaze API to be https [develop changelog] diff --git a/sickbeard/indexermapper.py b/sickbeard/indexermapper.py index 4c838ae7..320b1f6a 100644 --- a/sickbeard/indexermapper.py +++ b/sickbeard/indexermapper.py @@ -96,9 +96,18 @@ class TraktDict(OrderedDict): (self[key], '%07d' % self[key])[key == INDEXER_IMDB]) +def tvmaze_record_hook(r, *args, **kwargs): + r.hook_called = True + if 301 == r.status_code and isinstance(r.headers.get('Location'), basestring) \ + and r.headers.get('Location').startswith('http://api.tvmaze'): + r.headers['Location'] = r.headers['Location'].replace('http://', 'https://') + return r + + def get_tvmaze_data(count=0, *args, **kwargs): res = None count += 1 + kwargs['hooks'] = {'response': tvmaze_record_hook} if 3 >= count: try: res = getURL(*args, **kwargs)