dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Instagram] Extract video dimensions

This commit is contained in:
Déstin Reed 2016-09-28 17:28:16 +02:00 committed by Sergey M․
parent de6babf922
commit 1609782258
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/instagram.py
View File

@ -84,7 +84,7 @@ class InstagramIE(InfoExtractor):
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
(video_url, description, thumbnail, timestamp, uploader, (video_url, description, thumbnail, timestamp, uploader,
uploader_id, like_count, comment_count) = [None] * 8 uploader_id, like_count, comment_count, height, width) = [None] * 10
shared_data = self._parse_json( shared_data = self._parse_json(
self._search_regex( self._search_regex(
@ -96,6 +96,8 @@ class InstagramIE(InfoExtractor):
shared_data, lambda x: x['entry_data']['PostPage'][0]['media'], dict) shared_data, lambda x: x['entry_data']['PostPage'][0]['media'], dict)
if media: if media:
video_url = media.get('video_url') video_url = media.get('video_url')
height = int_or_none(media.get('dimensions', {}).get('height'))
width = int_or_none(media.get('dimensions', {}).get('width'))
description = media.get('caption') description = media.get('caption')
thumbnail = media.get('display_src') thumbnail = media.get('display_src')
timestamp = int_or_none(media.get('date')) timestamp = int_or_none(media.get('date'))
@ -115,6 +117,12 @@ class InstagramIE(InfoExtractor):
if not video_url: if not video_url:
video_url = self._og_search_video_url(webpage, secure=False) video_url = self._og_search_video_url(webpage, secure=False)
formats = [{
'url': video_url,
'width': width,
'height': height,
}]
if not uploader_id: if not uploader_id:
uploader_id = self._search_regex( uploader_id = self._search_regex(
r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"', r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"',
@ -131,7 +139,7 @@ class InstagramIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'url': video_url, 'formats': formats,
'ext': 'mp4', 'ext': 'mp4',
'title': 'Video by %s' % uploader_id, 'title': 'Video by %s' % uploader_id,
'description': description, 'description': description,