summary refs log tree commit diff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-05-07 20:15:40 +0600
committerSergey M․ <dstftw@gmail.com>2016-05-07 20:15:40 +0600
commitcb1fa5881315ed998a366f47511b7a4b4ea067b0 (patch)
tree85c356f9c075e18573f1d083f1b4c3758e6f7d29
parent3fd6332c056115e5de37b0789d907e9344c2ff5c (diff)
downloadyoutube-dl-cb1fa5881315ed998a366f47511b7a4b4ea067b0.tar.gz
youtube-dl-cb1fa5881315ed998a366f47511b7a4b4ea067b0.tar.xz
youtube-dl-cb1fa5881315ed998a366f47511b7a4b4ea067b0.zip
[flickr] Extract uploader URL (Closes #9426)
-rw-r--r--youtube_dl/extractor/flickr.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py
index 73ae3adee..a8e1bf42a 100644
--- 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',
+            'uploader_url': 'https://www.flickr.com/photos/forestwander-nature-pictures/',
             'comment_count': int,
             'view_count': int,
             'tags': list,
@@ -89,6 +90,9 @@ class FlickrIE(InfoExtractor):
             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,
@@ -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')),
-                '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', [])],