X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fivi.py;h=3d3c15024457e30d2002a3ee19e6eeab8a29ee4d;hb=7c5329e6f4152b48c5476b1b9b8ab931caa10331;hp=472d72b4c34fa3305b6b2808be1e45c6da25a60e;hpb=78be2eca7cb2806c3a51547da14968336febb57c;p=youtube-dl
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py
index 472d72b4c..3d3c15024 100644
--- a/youtube_dl/extractor/ivi.py
+++ b/youtube_dl/extractor/ivi.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
@@ -8,7 +8,7 @@ from .common import InfoExtractor
from ..utils import (
ExtractorError,
int_or_none,
- sanitized_Request,
+ qualities,
)
@@ -28,7 +28,7 @@ class IviIE(InfoExtractor):
'title': 'Ðван ÐаÑилÑÐµÐ²Ð¸Ñ Ð¼ÐµÐ½ÑÐµÑ Ð¿ÑоÑеÑÑиÑ',
'description': 'md5:b924063ea1677c8fe343d8a72ac2195f',
'duration': 5498,
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail': r're:^https?://.*\.jpg$',
},
'skip': 'Only works from Russia',
},
@@ -46,14 +46,30 @@ class IviIE(InfoExtractor):
'episode': 'Ðело ÐолÑдбеÑга (1 ÑаÑÑÑ)',
'episode_number': 1,
'duration': 2655,
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail': r're:^https?://.*\.jpg$',
+ },
+ 'skip': 'Only works from Russia',
+ },
+ {
+ # with MP4-HD720 format
+ 'url': 'http://www.ivi.ru/watch/146500',
+ 'md5': 'd63d35cdbfa1ea61a5eafec7cc523e1e',
+ 'info_dict': {
+ 'id': '146500',
+ 'ext': 'mp4',
+ 'title': 'ÐÑкла',
+ 'description': 'md5:ffca9372399976a2d260a407cc74cce6',
+ 'duration': 5599,
+ 'thumbnail': r're:^https?://.*\.jpg$',
},
'skip': 'Only works from Russia',
}
]
# Sorted by quality
- _KNOWN_FORMATS = ['MP4-low-mobile', 'MP4-mobile', 'FLV-lo', 'MP4-lo', 'FLV-hi', 'MP4-hi', 'MP4-SHQ']
+ _KNOWN_FORMATS = (
+ 'MP4-low-mobile', 'MP4-mobile', 'FLV-lo', 'MP4-lo', 'FLV-hi', 'MP4-hi',
+ 'MP4-SHQ', 'MP4-HD720', 'MP4-HD1080')
def _real_extract(self, url):
video_id = self._match_id(url)
@@ -69,10 +85,9 @@ class IviIE(InfoExtractor):
]
}
- request = sanitized_Request(
- 'http://api.digitalaccess.ru/api/json/', json.dumps(data))
video_json = self._download_json(
- request, video_id, 'Downloading video JSON')
+ 'http://api.digitalaccess.ru/api/json/', video_id,
+ 'Downloading video JSON', data=json.dumps(data))
if 'error' in video_json:
error = video_json['error']
@@ -84,11 +99,13 @@ class IviIE(InfoExtractor):
result = video_json['result']
+ quality = qualities(self._KNOWN_FORMATS)
+
formats = [{
'url': x['url'],
- 'format_id': x['content_format'],
- 'preference': self._KNOWN_FORMATS.index(x['content_format']),
- } for x in result['files'] if x['content_format'] in self._KNOWN_FORMATS]
+ 'format_id': x.get('content_format'),
+ 'quality': quality(x.get('content_format')),
+ } for x in result['files'] if x.get('url')]
self._sort_formats(formats)
@@ -115,7 +132,7 @@ class IviIE(InfoExtractor):
webpage, 'season number', default=None))
episode_number = int_or_none(self._search_regex(
- r']+itemprop="episode"[^>]*>\s*]+itemprop="episodeNumber"[^>]+content="(\d+)',
+ r'[^>]+itemprop="episode"[^>]*>\s*]+itemprop="episodeNumber"[^>]+content="(\d+)',
webpage, 'episode number', default=None))
description = self._og_search_description(webpage, default=None) or self._html_search_meta(