From 93656c05fa5bb37f6743b1e77202328c940969d9 Mon Sep 17 00:00:00 2001 From: mac1202 <5730439+mac1202@users.noreply.github.com> Date: Mon, 24 Sep 2018 13:53:38 +0200 Subject: [PATCH 1/3] Update mime_parsers.py switch gfycat default format to mp4. --- rtv/mime_parsers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtv/mime_parsers.py b/rtv/mime_parsers.py index 8e27975..4542109 100644 --- a/rtv/mime_parsers.py +++ b/rtv/mime_parsers.py @@ -98,7 +98,7 @@ class VideoTagMIMEParser(BaseMIMEParser): class GfycatMIMEParser(BaseMIMEParser): """ Gfycat provides a primitive json api to generate image links. URLs can be - downloaded as either gif, webm, or mjpg. Webm was selected because it's + downloaded as either gif, mp4, webm, or mjpg. Mp4 was selected because it's fast and works with VLC. https://gfycat.com/api @@ -113,8 +113,8 @@ class GfycatMIMEParser(BaseMIMEParser): parts = url.replace('gifs/detail/', '').split('/') api_url = '/'.join(parts[:-1] + ['cajax', 'get'] + parts[-1:]) resp = requests.get(api_url) - image_url = resp.json()['gfyItem']['webmUrl'] - return image_url, 'video/webm' + image_url = resp.json()['gfyItem']['mp4mUrl'] + return image_url, 'video/mp4' class YoutubeMIMEParser(BaseMIMEParser): From 9add15cc9d258c4e90655dee4cce0dd278b0528e Mon Sep 17 00:00:00 2001 From: mac1202 <5730439+mac1202@users.noreply.github.com> Date: Tue, 25 Sep 2018 17:52:44 +0200 Subject: [PATCH 2/3] Update test_mime_parsers.py --- tests/test_mime_parsers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_mime_parsers.py b/tests/test_mime_parsers.py index 3d37298..6c67045 100644 --- a/tests/test_mime_parsers.py +++ b/tests/test_mime_parsers.py @@ -27,8 +27,8 @@ URLS = OrderedDict([ None)), ('gfycat', ( 'https://gfycat.com/DeliciousUnfortunateAdouri', - 'https://giant.gfycat.com/DeliciousUnfortunateAdouri.webm', - 'video/webm')), + 'https://giant.gfycat.com/DeliciousUnfortunateAdouri.mp4', + 'video/mp4')), ('youtube', ( 'https://www.youtube.com/watch?v=FjNdYp2gXRY', 'https://www.youtube.com/watch?v=FjNdYp2gXRY', From cbecd07e34295de97c606f50c662ee6824dc0f42 Mon Sep 17 00:00:00 2001 From: mac1202 <5730439+mac1202@users.noreply.github.com> Date: Tue, 25 Sep 2018 17:59:44 +0200 Subject: [PATCH 3/3] Update mime_parsers.py --- rtv/mime_parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtv/mime_parsers.py b/rtv/mime_parsers.py index 4542109..79a8bf2 100644 --- a/rtv/mime_parsers.py +++ b/rtv/mime_parsers.py @@ -113,7 +113,7 @@ class GfycatMIMEParser(BaseMIMEParser): parts = url.replace('gifs/detail/', '').split('/') api_url = '/'.join(parts[:-1] + ['cajax', 'get'] + parts[-1:]) resp = requests.get(api_url) - image_url = resp.json()['gfyItem']['mp4mUrl'] + image_url = resp.json()['gfyItem']['mp4Url'] return image_url, 'video/mp4'