diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-02-10 20:48:46 +0100 | 
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2014-02-10 20:48:46 +0100 | 
| commit | ebfe352b6203d05d4afb0f4a7e1a97ed1540dd8c (patch) | |
| tree | 1fc23173bacf62a49ffc1e515c5bd9a8f23ea8d1 | |
| parent | fde56d2f175dbb044e8b7fb7a16b6f10d63635fe (diff) | |
[breakcom] Modernize
| -rw-r--r-- | youtube_dl/extractor/breakcom.py | 29 | 
1 files changed, 15 insertions, 14 deletions
| diff --git a/youtube_dl/extractor/breakcom.py b/youtube_dl/extractor/breakcom.py index 53a898de3..8ec6dda49 100644 --- a/youtube_dl/extractor/breakcom.py +++ b/youtube_dl/extractor/breakcom.py @@ -1,18 +1,20 @@ +from __future__ import unicode_literals +  import re  import json  from .common import InfoExtractor -from ..utils import determine_ext  class BreakIE(InfoExtractor): -    _VALID_URL = r'(?:http://)?(?:www\.)?break\.com/video/([^/]+)' +    _VALID_URL = r'http://(?:www\.)?break\.com/video/([^/]+)'      _TEST = { -        u'url': u'http://www.break.com/video/when-girls-act-like-guys-2468056', -        u'file': u'2468056.mp4', -        u'md5': u'a3513fb1547fba4fb6cfac1bffc6c46b', -        u'info_dict': { -            u"title": u"When Girls Act Like D-Bags" +        'url': 'http://www.break.com/video/when-girls-act-like-guys-2468056', +        'md5': 'a3513fb1547fba4fb6cfac1bffc6c46b', +        'info_dict': { +            'id': '2468056', +            'ext': 'mp4', +            'title': 'When Girls Act Like D-Bags',          }      } @@ -22,17 +24,16 @@ class BreakIE(InfoExtractor):          embed_url = 'http://www.break.com/embed/%s' % video_id          webpage = self._download_webpage(embed_url, video_id)          info_json = self._search_regex(r'var embedVars = ({.*?});', webpage, -                                       u'info json', flags=re.DOTALL) +                                       'info json', flags=re.DOTALL)          info = json.loads(info_json)          video_url = info['videoUri']          m_youtube = re.search(r'(https?://www\.youtube\.com/watch\?v=.*)', video_url)          if m_youtube is not None:              return self.url_result(m_youtube.group(1), 'Youtube')          final_url = video_url + '?' + info['AuthToken'] -        return [{ -            'id':        video_id, -            'url':       final_url, -            'ext':       determine_ext(final_url), -            'title':     info['contentName'], +        return { +            'id': video_id, +            'url': final_url, +            'title': info['contentName'],              'thumbnail': info['thumbUri'], -        }] +        } | 
