projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3fd6332
)
[flickr] Extract uploader URL (Closes #9426)
author
Sergey M․
<dstftw@gmail.com>
Sat, 7 May 2016 14:15:40 +0000
(20:15 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 7 May 2016 14:15:40 +0000
(20:15 +0600)
youtube_dl/extractor/flickr.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/flickr.py
b/youtube_dl/extractor/flickr.py
index 73ae3adee46205e74811822652269c77892114a8..a8e1bf42a433fd87f638e8b34ce5ab68464a9252 100644
(file)
--- a/
youtube_dl/extractor/flickr.py
+++ b/
youtube_dl/extractor/flickr.py
@@
-24,6
+24,7
@@
class FlickrIE(InfoExtractor):
'upload_date': '20110423',
'uploader_id': '10922353@N03',
'uploader': 'Forest Wander',
'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,
'comment_count': int,
'view_count': int,
'tags': list,
@@
-89,6
+90,9
@@
class FlickrIE(InfoExtractor):
self._sort_formats(formats)
owner = video_info.get('owner', {})
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,
return {
'id': video_id,
@@
-97,8
+101,9
@@
class FlickrIE(InfoExtractor):
'formats': formats,
'timestamp': int_or_none(video_info.get('dateuploaded')),
'duration': int_or_none(video_info.get('video', {}).get('duration')),
'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': 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', [])],
'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', [])],