New upstream version 2020.03.24

[youtubedl] / youtube_dl / extractor / teamcoco.py

diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py
index 73469cc5d1b6247cb44dc33aaa96805dfd1768a0..5793b711f6dc1103f7d33b41abb766eabfab1aea 100644 (file)
--- a/youtube_dl/extractor/teamcoco.py
+++ b/youtube_dl/extractor/teamcoco.py
@@ -16,7 +16,7 @@ from ..utils import (
 
 
 class TeamcocoIE(TurnerBaseIE):
 
 
 class TeamcocoIE(TurnerBaseIE):

-    _VALID_URL = r'https?://teamcoco\.com/(?P<id>([^/]+/)*[^/?#]+)'
+    _VALID_URL = r'https?://(?:\w+\.)?teamcoco\.com/(?P<id>([^/]+/)*[^/?#]+)'

     _TESTS = [
         {
             'url': 'http://teamcoco.com/video/mary-kay-remote',
     _TESTS = [
         {
             'url': 'http://teamcoco.com/video/mary-kay-remote',


@@ -79,50 +79,68 @@ class TeamcocoIE(TurnerBaseIE):
         }, {
             'url': 'http://teamcoco.com/israel/conan-hits-the-streets-beaches-of-tel-aviv',
             'only_matching': True,
         }, {
             'url': 'http://teamcoco.com/israel/conan-hits-the-streets-beaches-of-tel-aviv',
             'only_matching': True,

+        }, {
+            'url': 'https://conan25.teamcoco.com/video/ice-cube-kevin-hart-conan-share-lyft',
+            'only_matching': True,

         }
     ]
         }
     ]

+    _RECORD_TEMPL = '''id
+        title
+        teaser
+        publishOn
+        thumb {
+          preview
+        }
+        tags {
+          name
+        }
+        duration
+        turnerMediaId
+        turnerMediaAuthToken'''

 
     def _graphql_call(self, query_template, object_type, object_id):
         find_object = 'find' + object_type
         return self._download_json(
 
     def _graphql_call(self, query_template, object_type, object_id):
         find_object = 'find' + object_type
         return self._download_json(

-            'http://teamcoco.com/graphql/', object_id, data=json.dumps({
+            'https://teamcoco.com/graphql', object_id, data=json.dumps({

                 'query': query_template % (find_object, object_id)
                 'query': query_template % (find_object, object_id)

-            }))['data'][find_object]
+            }).encode(), headers={
+                'Content-Type': 'application/json',
+            })['data'][find_object]

 
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
         response = self._graphql_call('''{
 
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
         response = self._graphql_call('''{

-  %s(slug: "%s") {
+  %%s(slug: "%%s") {

     ... on RecordSlug {
       record {
     ... on RecordSlug {
       record {

+        %s
+      }
+    }
+    ... on PageSlug {
+      child {

         id
         id

-        title
-        teaser
-        publishOn
-        thumb {
-          preview
-        }
-        file {
-          url
-        }
-        tags {
-          name
-        }
-        duration
-        turnerMediaId
-        turnerMediaAuthToken

       }
     }
     ... on NotFoundSlug {
       status
     }
   }
       }
     }
     ... on NotFoundSlug {
       status
     }
   }

-}''', 'Slug', display_id)
+}''' % self._RECORD_TEMPL, 'Slug', display_id)

         if response.get('status'):
             raise ExtractorError('This video is no longer available.', expected=True)
 
         if response.get('status'):
             raise ExtractorError('This video is no longer available.', expected=True)
 

-        record = response['record']
+        child = response.get('child')
+        if child:
+            record = self._graphql_call('''{
+  %%s(id: "%%s") {
+    ... on Video {
+      %s
+    }
+  }
+}''' % self._RECORD_TEMPL, 'Record', child['id'])
+        else:
+            record = response['record']

         video_id = record['id']
 
         info = {
         video_id = record['id']
 
         info = {


@@ -145,20 +163,21 @@ class TeamcocoIE(TurnerBaseIE):
                 'accessTokenType': 'jws',
             }))
         else:
                 'accessTokenType': 'jws',
             }))
         else:

-            video_sources = self._graphql_call('''{
-  %s(id: "%s") {
-    src
-  }
-}''', 'RecordVideoSource', video_id) or {}
+            video_sources = self._download_json(
+                'https://teamcoco.com/_truman/d/' + video_id,
+                video_id)['meta']['src']
+            if isinstance(video_sources, dict):
+                video_sources = video_sources.values()

 
             formats = []
             get_quality = qualities(['low', 'sd', 'hd', 'uhd'])
 
             formats = []
             get_quality = qualities(['low', 'sd', 'hd', 'uhd'])

-            for format_id, src in video_sources.get('src', {}).items():
+            for src in video_sources:

                 if not isinstance(src, dict):
                     continue
                 src_url = src.get('src')
                 if not src_url:
                     continue
                 if not isinstance(src, dict):
                     continue
                 src_url = src.get('src')
                 if not src_url:
                     continue

+                format_id = src.get('label')

                 ext = determine_ext(src_url, mimetype2ext(src.get('type')))
                 if format_id == 'hls' or ext == 'm3u8':
                     # compat_urllib_parse.urljoin does not work here
                 ext = determine_ext(src_url, mimetype2ext(src.get('type')))
                 if format_id == 'hls' or ext == 'm3u8':
                     # compat_urllib_parse.urljoin does not work here


@@ -180,9 +199,6 @@ class TeamcocoIE(TurnerBaseIE):
                         'format_id': format_id,
                         'quality': get_quality(format_id),
                     })
                         'format_id': format_id,
                         'quality': get_quality(format_id),
                     })

-            if not formats:
-                formats = self._extract_m3u8_formats(
-                    record['file']['url'], video_id, 'mp4', fatal=False)

             self._sort_formats(formats)
             info['formats'] = formats
 
             self._sort_formats(formats)
             info['formats'] = formats