diff --git a/rtv/mime_parsers.py b/rtv/mime_parsers.py index 43ef191..469f6ec 100644 --- a/rtv/mime_parsers.py +++ b/rtv/mime_parsers.py @@ -133,10 +133,12 @@ class ImgurMIMEParser(BaseMIMEParser): data = json.loads(r.text)['data'] if 'images' in data: # TODO: handle imgur albums with mixed content, i.e. jpeg and gifv - urls = ' '.join([d['link'] for d in data['images'] if not d['animated']]) - return urls, 'image/x-imgur-album' + links = ' '.join([d['link'] for d in data['images'] if not d['animated']]) + return links.replace('http://', 'https://'), 'image/x-imgur-album' else : - return (data['mp4'], 'video/mp4') if data['animated'] else (data['link'], data['type']) + link = data['mp4'] if data['animated'] else data['link'] + mime = 'video/mp4' if data['animated'] else data['type'] + return link.replace('http://', 'https://'), mime class InstagramMIMEParser(BaseMIMEParser): diff --git a/tests/test_mime_parsers.py b/tests/test_mime_parsers.py index f281215..d7a5d9a 100644 --- a/tests/test_mime_parsers.py +++ b/tests/test_mime_parsers.py @@ -41,12 +41,12 @@ URLS = OrderedDict([ 'https://i.imgur.com/yW0kbMi.jpg', 'image/jpeg')), ('imgur_2', ( - 'http://imgur.com/yjP1v4B', - 'https://i.imgur.com/yjP1v4Bh.jpg', - 'image/jpeg')), + 'http://imgur.com/gallery/yjP1v4B', + 'https://i.imgur.com/yjP1v4B.mp4', + 'video/mp4')), ('imgur_album', ( 'http://imgur.com/a/qx9t5', - 'http://i.imgur.com/uEt0YLI.jpg', + 'https://i.imgur.com/uEt0YLI.jpg', 'image/x-imgur-album')), ('instagram_image', ( 'https://www.instagram.com/p/BIxQ0vrBN2Y/?taken-by=kimchi_chic',