Imported Upstream version 2015.11.10

[youtubedl] / youtube_dl / extractor / clipsyndicate.py

diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dl/extractor/clipsyndicate.py
index c60089ad353274adaa380671cee9d4e3ce2e2718..8306d6fb7d0d4414cff36f7b381ca9c877820f58 100644 (file)
--- a/youtube_dl/extractor/clipsyndicate.py
+++ b/youtube_dl/extractor/clipsyndicate.py
@@ -1,41 +1,45 @@
-import re
+from __future__ import unicode_literals

 
 from .common import InfoExtractor
 from ..utils import (
     find_xpath_attr,
 
 from .common import InfoExtractor
 from ..utils import (
     find_xpath_attr,

-    fix_xml_all_ampersand,
+    fix_xml_ampersands

 )
 
 
 class ClipsyndicateIE(InfoExtractor):
 )
 
 
 class ClipsyndicateIE(InfoExtractor):

-    _VALID_URL = r'http://www\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
-
-    _TEST = {
-        u'url': u'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
-        u'md5': u'4d7d549451bad625e0ff3d7bd56d776c',
-        u'info_dict': {
-            u'id': u'4629301',
-            u'ext': u'mp4',
-            u'title': u'Brick Briscoe',
-            u'duration': 612,
+    _VALID_URL = r'http://(?:chic|www)\.clipsyndicate\.com/video/play(list/\d+)?/(?P<id>\d+)'
+
+    _TESTS = [{
+        'url': 'http://www.clipsyndicate.com/video/play/4629301/brick_briscoe',
+        'md5': '4d7d549451bad625e0ff3d7bd56d776c',
+        'info_dict': {
+            'id': '4629301',
+            'ext': 'mp4',
+            'title': 'Brick Briscoe',
+            'duration': 612,
+            'thumbnail': 're:^https?://.+\.jpg',

         },
         },

-    }
+    }, {
+        'url': 'http://chic.clipsyndicate.com/video/play/5844117/shark_attack',
+        'only_matching': True,
+    }]

 
     def _real_extract(self, url):
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)

         js_player = self._download_webpage(
             'http://eplayer.clipsyndicate.com/embed/player.js?va_id=%s' % video_id,
         js_player = self._download_webpage(
             'http://eplayer.clipsyndicate.com/embed/player.js?va_id=%s' % video_id,

-            video_id, u'Downlaoding player')
+            video_id, 'Downlaoding player')

         # it includes a required token
         # it includes a required token

-        flvars = self._search_regex(r'flvars: "(.*?)"', js_player, u'flvars')
+        flvars = self._search_regex(r'flvars: "(.*?)"', js_player, 'flvars')

 
         pdoc = self._download_xml(
             'http://eplayer.clipsyndicate.com/osmf/playlist?%s' % flvars,
 
         pdoc = self._download_xml(
             'http://eplayer.clipsyndicate.com/osmf/playlist?%s' % flvars,

-            video_id, u'Downloading video info',
-            transform_source=fix_xml_all_ampersand) 
+            video_id, 'Downloading video info',
+            transform_source=fix_xml_ampersands)

 
         track_doc = pdoc.find('trackList/track')
 
         track_doc = pdoc.find('trackList/track')

+

         def find_param(name):
             node = find_xpath_attr(track_doc, './/param', 'name', name)
             if node is not None:
         def find_param(name):
             node = find_xpath_attr(track_doc, './/param', 'name', name)
             if node is not None: