summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:00:54 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-01 15:00:54 +0100
commit17d2712d9c58af788f234a2682d486f1d0a3ab78 (patch)
tree97f5b22a0c06d341bb4a6bfebb9bbf31fee8037a
parentfc09240e24c2455fa9373f77a13bf4649b90ca87 (diff)
downloadyoutube-dl-17d2712d9c58af788f234a2682d486f1d0a3ab78.tar.gz
youtube-dl-17d2712d9c58af788f234a2682d486f1d0a3ab78.tar.xz
youtube-dl-17d2712d9c58af788f234a2682d486f1d0a3ab78.zip
[teamcoco] Modernize and fix extraction
-rw-r--r--youtube_dl/extractor/teamcoco.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py
index 5fa67eb8d..18a823719 100644
--- a/youtube_dl/extractor/teamcoco.py
+++ b/youtube_dl/extractor/teamcoco.py
@@ -10,17 +10,19 @@ class TeamcocoIE(InfoExtractor):
     _TESTS = [
         {
             'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
-            'file': '80187.mp4',
             'md5': '3f7746aa0dc86de18df7539903d399ea',
             'info_dict': {
+                'id': '80187',
+                'ext': 'mp4',
                 'title': 'Conan Becomes A Mary Kay Beauty Consultant',
                 'description': 'Mary Kay is perhaps the most trusted name in female beauty, so of course Conan is a natural choice to sell their products.'
             }
         }, {
             'url': 'http://teamcoco.com/video/louis-ck-interview-george-w-bush',
-            'file': '19705.mp4',
             'md5': 'cde9ba0fa3506f5f017ce11ead928f9a',
             'info_dict': {
+                'id': '19705',
+                'ext': 'mp4',
                 "description": "Louis C.K. got starstruck by George W. Bush, so what? Part one.",
                 "title": "Louis C.K. Interview Pt. 1 11/3/11"
             }
@@ -36,7 +38,7 @@ class TeamcocoIE(InfoExtractor):
         video_id = mobj.group("video_id")
         if not video_id:
             video_id = self._html_search_regex(
-                r'data-node-id="(\d+?)"',
+                r'<div\s+class="player".*?data-id="(\d+?)"',
                 webpage, 'video id')
 
         data_url = 'http://teamcoco.com/cvp/2.0/%s.xml' % video_id