Skip to content

Commit

Permalink
[flickr] Extract uploader URL (Closes #9426)
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey M․ committed May 7, 2016
1 parent 3fd6332 commit cb1fa58
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion youtube_dl/extractor/flickr.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class FlickrIE(InfoExtractor):
'upload_date': '20110423',
'uploader_id': '10922353@N03',
'uploader': 'Forest Wander',
'uploader_url': 'https://www.flickr.com/photos/forestwander-nature-pictures/',
'comment_count': int,
'view_count': int,
'tags': list,
Expand Down Expand Up @@ -89,6 +90,9 @@ def _real_extract(self, url):
self._sort_formats(formats)

owner = video_info.get('owner', {})
uploader_id = owner.get('nsid')
uploader_path = owner.get('path_alias') or uploader_id
uploader_url = 'https://www.flickr.com/photos/%s/' % uploader_path if uploader_path else None

return {
'id': video_id,
Expand All @@ -97,8 +101,9 @@ def _real_extract(self, url):
'formats': formats,
'timestamp': int_or_none(video_info.get('dateuploaded')),
'duration': int_or_none(video_info.get('video', {}).get('duration')),
'uploader_id': owner.get('nsid'),
'uploader_id': uploader_id,
'uploader': owner.get('realname'),
'uploader_url': uploader_url,
'comment_count': int_or_none(video_info.get('comments', {}).get('_content')),
'view_count': int_or_none(video_info.get('views')),
'tags': [tag.get('_content') for tag in video_info.get('tags', {}).get('tag', [])],
Expand Down

0 comments on commit cb1fa58

Please sign in to comment.