Merge changes from buster branch for the NMU while I was away.

[youtubedl] / youtube_dl / extractor / flickr.py

diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py
index 18f439df978b59e8d48454300498e1de337c3ad4..9f166efd4851fe0833de8a85bac07a97ce9f1722 100644 (file)
--- a/youtube_dl/extractor/flickr.py
+++ b/youtube_dl/extractor/flickr.py
@@ -1,7 +1,10 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from __future__ import unicode_literals
 
 from .common import InfoExtractor

-from ..compat import compat_urllib_parse
+from ..compat import (
+    compat_str,
+    compat_urllib_parse_urlencode,
+)

 from ..utils import (
     ExtractorError,
     int_or_none,
 from ..utils import (
     ExtractorError,
     int_or_none,


@@ -24,13 +27,28 @@ 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,

+            'license': 'Attribution-ShareAlike',

         }
     }
         }
     }

-

     _API_BASE_URL = 'https://api.flickr.com/services/rest?'
     _API_BASE_URL = 'https://api.flickr.com/services/rest?'

+    # https://help.yahoo.com/kb/flickr/SLN25525.html
+    _LICENSES = {
+        '0': 'All Rights Reserved',
+        '1': 'Attribution-NonCommercial-ShareAlike',
+        '2': 'Attribution-NonCommercial',
+        '3': 'Attribution-NonCommercial-NoDerivs',
+        '4': 'Attribution',
+        '5': 'Attribution-ShareAlike',
+        '6': 'Attribution-NoDerivs',
+        '7': 'No known copyright restrictions',
+        '8': 'United States government work',
+        '9': 'Public Domain Dedication (CC0)',
+        '10': 'Public Domain Work',
+    }

 
     def _call_api(self, method, video_id, api_key, note, secret=None):
         query = {
 
     def _call_api(self, method, video_id, api_key, note, secret=None):
         query = {


@@ -42,7 +60,7 @@ class FlickrIE(InfoExtractor):
         }
         if secret:
             query['secret'] = secret
         }
         if secret:
             query['secret'] = secret

-        data = self._download_json(self._API_BASE_URL + compat_urllib_parse.urlencode(query), video_id, note)
+        data = self._download_json(self._API_BASE_URL + compat_urllib_parse_urlencode(query), video_id, note)

         if data['stat'] != 'ok':
             raise ExtractorError(data['message'])
         return data
         if data['stat'] != 'ok':
             raise ExtractorError(data['message'])
         return data


@@ -66,7 +84,7 @@ class FlickrIE(InfoExtractor):
 
             formats = []
             for stream in streams['stream']:
 
             formats = []
             for stream in streams['stream']:

-                stream_type = str(stream.get('type'))
+                stream_type = compat_str(stream.get('type'))

                 formats.append({
                     'format_id': stream_type,
                     'url': stream['_content'],
                 formats.append({
                     'format_id': stream_type,
                     'url': stream['_content'],


@@ -75,6 +93,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,


@@ -83,11 +104,13 @@ 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')),
                 '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', [])]
+                'tags': [tag.get('_content') for tag in video_info.get('tags', {}).get('tag', [])],
+                'license': self._LICENSES.get(video_info.get('license')),

             }
         else:
             raise ExtractorError('not a video', expected=True)
             }
         else:
             raise ExtractorError('not a video', expected=True)