[PeerTube] Various fixes and improvements

youtube_dl/extractor/peertube.py

@@ -423,26 +423,27 @@ class PeerTubeIE(InfoExtractor):
                     (?P<id>%s)
                     ''' % (_INSTANCES_RE, _UUID_RE)
     _TESTS = [{
-        'url': 'https://peertube.cpy.re/videos/watch/2790feb0-8120-4e63-9af3-c943c69f5e6c',
-        'md5': '80f24ff364cc9d333529506a263e7feb',
+        'url': 'https://framatube.org/videos/watch/9c9de5e8-0a1e-484a-b099-e80766180a6d',
+        'md5': '9618b916a40563adfd9b04f3ec12e79b',
         'info_dict': {
-            'id': '2790feb0-8120-4e63-9af3-c943c69f5e6c',
+            'id': '9c9de5e8-0a1e-484a-b099-e80766180a6d',
             'ext': 'mp4',
-            'title': 'wow',
-            'description': 'wow such video, so gif',
+            'title': 'What is PeerTube?',
+            'description': '**[Want to help to translate this video?](https://weblate.framasoft.org/projects/what-is-peertube-video/)**\r\n\r\n**Take back the control of your videos! [#JoinPeertube](https://joinpeertube.org)**\r\n*A decentralized video hosting network, based on free/libre software!*\r\n\r\n**Animation Produced by:** [LILA](https://libreart.info) - [ZeMarmot Team](https://film.zemarmot.net)\r\n*Directed by* Aryeom\r\n*Assistant* Jehan\r\n**Licence**: [CC-By-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)\r\n\r\n**Sponsored by** [Framasoft](https://framasoft.org)\r\n\r\n**Music**: [Red Step Forward](http://play.dogmazic.net/song.php?song_id=52491) - CC-By Ken Bushima\r\n\r\n**Movie Clip**: [Caminades 3: Llamigos](http://www.caminandes.com/) CC-By Blender Institute\r\n\r\n**Video sources**: https://gitlab.gnome.org/Jehan/what-is-peertube/',
             'thumbnail': r're:https?://.*\.(?:jpg|png)',
-            'timestamp': 1519297480,
-            'upload_date': '20180222',
-            'uploader': 'Luclu7',
-            'uploader_id': '7fc42640-efdb-4505-a45d-a15b1a5496f1',
-            'uploder_url': 'https://peertube.nsa.ovh/accounts/luclu7',
-            'license': 'Unknown',
-            'duration': 3,
+            'timestamp': 1538391166,
+            'upload_date': '20181001',
+            'uploader': 'Framasoft',
+            'uploader_id': 'framasoft@framatube.org',
+            'uploader_url': 'https://framatube.org/accounts/framasoft',
+            'language': 'en',
+            'license': 'Attribution - Share Alike',
+            'duration': 113,
             'view_count': int,
             'like_count': int,
             'dislike_count': int,
-            'tags': list,
-            'categories': list,
+            'tags': ["framasoft", "peertube"],
+            'categories': ["Science & Technology"],
         }
     }, {
         'url': 'https://peertube.tamanoir.foucry.net/videos/watch/0b04f13d-1e18-4f1d-814e-4979aa7c9c44',
@@ -484,6 +485,23 @@ def _extract_urls(webpage, source_url):
                 entries = [peertube_url]
         return entries
 
+    def _get_subtitles(self, host, video_id):
+        video_captions = self._download_json(
+            'https://%s/api/v1/videos/%s/captions' % (host, video_id), video_id)
+
+        subtitles = {}
+        for entry in video_captions.get('data'):
+            captions_language = entry.get('language')
+            if captions_language is not None:
+                language_id = captions_language.get('id')
+                caption_path = entry.get('captionPath')
+                if language_id is not None and caption_path is not None:
+                    caption_url = 'https://%s%s' % (host, caption_path)
+                    subtitles[language_id] = [{
+                        'url': caption_url
+                    }]
+        return subtitles
+
     def _real_extract(self, url):
         mobj = re.match(self._VALID_URL, url)
         host = mobj.group('host') or mobj.group('host_2')
@@ -494,6 +512,9 @@ def _real_extract(self, url):
 
         title = video['name']
 
+        video_description = self._download_json(
+            'https://%s/api/v1/videos/%s/description' % (host, video_id), video_id, fatal=False)
+
         formats = []
         for file_ in video['files']:
             if not isinstance(file_, dict):
@@ -513,6 +534,8 @@ def _real_extract(self, url):
             formats.append(f)
         self._sort_formats(formats)
 
+        subtitles = self.extract_subtitles(host, video_id)
+
         def account_data(field):
             return try_get(video, lambda x: x['account'][field], compat_str)
 
@@ -528,12 +551,14 @@ def account_data(field):
         return {
             'id': video_id,
             'title': title,
-            'description': video.get('description'),
+            'description': video_description.get('description'),
             'thumbnail': urljoin(url, video.get('thumbnailPath')),
             'timestamp': unified_timestamp(video.get('publishedAt')),
             'uploader': account_data('displayName'),
-            'uploader_id': account_data('uuid'),
-            'uploder_url': account_data('url'),
+            'uploader_id': '%s@%s' % (account_data('name'), account_data('host')),
+            'uploader_url': account_data('url'),
+            'language': try_get(
+                video, lambda x: x['language']['id'], compat_str),
             'license': try_get(
                 video, lambda x: x['licence']['label'], compat_str),
             'duration': int_or_none(video.get('duration')),
@@ -544,4 +569,5 @@ def account_data(field):
             'tags': try_get(video, lambda x: x['tags'], list),
             'categories': categories,
             'formats': formats,
+            'subtitles': subtitles
         }