projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "invalid escape sequences" error on Python 3.6
[youtube-dl]
/
youtube_dl
/
extractor
/
instagram.py
diff --git
a/youtube_dl/extractor/instagram.py
b/youtube_dl/extractor/instagram.py
index 5ebc30a1058f408db8a8a562258a016533579a09..98f408c18650cf8393869432a861a3486575b533 100644
(file)
--- a/
youtube_dl/extractor/instagram.py
+++ b/
youtube_dl/extractor/instagram.py
@@
-22,7
+22,7
@@
class InstagramIE(InfoExtractor):
'ext': 'mp4',
'title': 'Video by naomipq',
'description': 'md5:1f17f0ab29bd6fe2bfad705f58de3cb8',
'ext': 'mp4',
'title': 'Video by naomipq',
'description': 'md5:1f17f0ab29bd6fe2bfad705f58de3cb8',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'timestamp': 1371748545,
'upload_date': '20130620',
'uploader_id': 'naomipq',
'timestamp': 1371748545,
'upload_date': '20130620',
'uploader_id': 'naomipq',
@@
-38,7
+38,7
@@
class InstagramIE(InfoExtractor):
'id': 'BA-pQFBG8HZ',
'ext': 'mp4',
'title': 'Video by britneyspears',
'id': 'BA-pQFBG8HZ',
'ext': 'mp4',
'title': 'Video by britneyspears',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'timestamp': 1453760977,
'upload_date': '20160125',
'uploader_id': 'britneyspears',
'timestamp': 1453760977,
'upload_date': '20160125',
'uploader_id': 'britneyspears',
@@
-84,7
+84,7
@@
class InstagramIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
(video_url, description, thumbnail, timestamp, uploader,
webpage = self._download_webpage(url, video_id)
(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(
self._search_regex(
shared_data = self._parse_json(
self._search_regex(
@@
-96,6
+96,8
@@
class InstagramIE(InfoExtractor):
shared_data, lambda x: x['entry_data']['PostPage'][0]['media'], dict)
if media:
video_url = media.get('video_url')
shared_data, lambda x: x['entry_data']['PostPage'][0]['media'], dict)
if media:
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')
thumbnail = media.get('display_src')
timestamp = int_or_none(media.get('date'))
description = media.get('caption')
thumbnail = media.get('display_src')
timestamp = int_or_none(media.get('date'))
@@
-109,12
+111,18
@@
class InstagramIE(InfoExtractor):
'id': comment.get('id'),
'text': comment.get('text'),
'timestamp': int_or_none(comment.get('created_at')),
'id': comment.get('id'),
'text': comment.get('text'),
'timestamp': int_or_none(comment.get('created_at')),
- } for comment in media.get(
'comments', {}).get('nodes', [])
- if comment.get('text')]
+ } for comment in media.get(
+
'comments', {}).get('nodes', [])
if comment.get('text')]
if not video_url:
video_url = self._og_search_video_url(webpage, secure=False)
if not video_url:
video_url = self._og_search_video_url(webpage, secure=False)
+ formats = [{
+ 'url': video_url,
+ 'width': width,
+ 'height': height,
+ }]
+
if not uploader_id:
uploader_id = self._search_regex(
r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"',
if not uploader_id:
uploader_id = self._search_regex(
r'"owner"\s*:\s*{\s*"username"\s*:\s*"(.+?)"',
@@
-131,7
+139,7
@@
class InstagramIE(InfoExtractor):
return {
'id': video_id,
return {
'id': video_id,
- '
url': video_url
,
+ '
formats': formats
,
'ext': 'mp4',
'title': 'Video by %s' % uploader_id,
'description': description,
'ext': 'mp4',
'title': 'Video by %s' % uploader_id,
'description': description,
@@
-161,7
+169,7
@@
class InstagramUserIE(InfoExtractor):
'id': '614605558512799803_462752227',
'ext': 'mp4',
'title': '#Porsche Intelligent Performance.',
'id': '614605558512799803_462752227',
'ext': 'mp4',
'title': '#Porsche Intelligent Performance.',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'uploader': 'Porsche',
'uploader_id': 'porsche',
'timestamp': 1387486713,
'uploader': 'Porsche',
'uploader_id': 'porsche',
'timestamp': 1387486713,