From: Yen Chi Hsuan Date: Tue, 1 Sep 2015 08:34:05 +0000 (+0800) Subject: [odnoklassniki] Fix extraction and extend _VALID_URL (closes #6726) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cdc8d0c37325e83da0c08ee4d97d81040e10be91;p=youtube-dl [odnoklassniki] Fix extraction and extend _VALID_URL (closes #6726) --- diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index 003d27de7..f552e6f7e 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -12,7 +12,7 @@ from ..utils import ( class OdnoklassnikiIE(InfoExtractor): - _VALID_URL = r'https?://(?:odnoklassniki|ok)\.ru/(?:video|web-api/video/moviePlayer)/(?P[\d-]+)' + _VALID_URL = r'https?://(?:www\.)?(?:odnoklassniki|ok)\.ru/(?:video|web-api/video/moviePlayer)/(?P[\d-]+)' _TESTS = [{ # metadata in JSON 'url': 'http://ok.ru/video/20079905452', @@ -46,6 +46,9 @@ class OdnoklassnikiIE(InfoExtractor): }, { 'url': 'http://ok.ru/web-api/video/moviePlayer/20079905452', 'only_matching': True, + }, { + 'url': 'http://www.ok.ru/video/20648036891', + 'only_matching': True, }] def _real_extract(self, url): @@ -56,7 +59,7 @@ class OdnoklassnikiIE(InfoExtractor): player = self._parse_json( unescapeHTML(self._search_regex( - r'data-attributes="([^"]+)"', webpage, 'player')), + r'data-options="([^"]+)"', webpage, 'player')), video_id) flashvars = player['flashvars']