-# encoding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import collections
import re
-import json
import sys
from .common import InfoExtractor
'title': 'ИгроМир 2016 — день 1',
'uploader': 'Игромания',
'duration': 5239,
+ 'view_count': int,
},
},
{
if youtube_url:
return self.url_result(youtube_url, 'Youtube')
- vimeo_url = VimeoIE._extract_vimeo_url(url, info_page)
+ vimeo_url = VimeoIE._extract_url(url, info_page)
if vimeo_url is not None:
return self.url_result(vimeo_url)
opts_url = 'http:' + opts_url
return self.url_result(opts_url)
- data_json = self._search_regex(r'var\s+vars\s*=\s*({.+?});', info_page, 'vars')
- data = json.loads(data_json)
+ # vars does not look to be served anymore since 24.10.2016
+ data = self._parse_json(
+ self._search_regex(
+ r'var\s+vars\s*=\s*({.+?});', info_page, 'vars', default='{}'),
+ video_id, fatal=False)
+
+ # <!json> is served instead
+ if not data:
+ data = self._parse_json(
+ self._search_regex(
+ r'<!json>\s*({.+?})\s*<!>', info_page, 'json'),
+ video_id)['player']['params'][0]
title = unescapeHTML(data['md_title'])
if data.get('live') == 2:
title = self._live_title(title)
- # Extract upload date
timestamp = unified_timestamp(self._html_search_regex(
- r'class=["\']mv_info_date[^>]*>([^<]+)(?:<|from)', info_page,
+ r'class=["\']mv_info_date[^>]+>([^<]+)(?:<|from)', info_page,
'upload date', fatal=False))
- view_count = str_to_int(self._html_search_regex(
- r'class="mv_views_count[^>]*>([\d,.]+)',
- info_page, 'view count', default=None))
+ view_count = str_to_int(self._search_regex(
+ r'class=["\']mv_views_count[^>]+>\s*([\d,.]+)',
+ info_page, 'view count', fatal=False))
formats = []
for format_id, format_url in data.items():