1
1
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-06 21:17:11 +01:00

[ivi] Simplify

This commit is contained in:
dst 2013-12-19 10:53:38 +07:00
parent 6c6db72ed4
commit a51e37af62

View File

@ -13,7 +13,7 @@ from ..utils import (
class IviIE(InfoExtractor): class IviIE(InfoExtractor):
IE_DESC = u'ivi.ru' IE_DESC = u'ivi.ru'
IE_NAME = u'ivi' IE_NAME = u'ivi'
_VALID_URL = r'^https?://(?:www\.)?(?P<url>ivi\.ru/watch(?:/(?P<compilationid>[^/]+))?/(?P<videoid>\d+))' _VALID_URL = r'^https?://(?:www\.)?ivi\.ru/watch(?:/(?P<compilationid>[^/]+))?/(?P<videoid>\d+)'
_TESTS = [ _TESTS = [
# Single movie # Single movie
@ -103,9 +103,7 @@ class IviIE(InfoExtractor):
previews.sort(key=lambda fmt: self._known_thumbnails.index(fmt['content_format'])) previews.sort(key=lambda fmt: self._known_thumbnails.index(fmt['content_format']))
thumbnail = previews[-1][u'url'] if len(previews) > 0 else None thumbnail = previews[-1][u'url'] if len(previews) > 0 else None
video_page_url = 'http://' + mobj.group('url') video_page = self._download_webpage(url, video_id, u'Downloading video page')
video_page = self._download_webpage(video_page_url, video_id, u'Downloading video page')
description = self._extract_description(video_page) description = self._extract_description(video_page)
comment_count = self._extract_comment_count(video_page) comment_count = self._extract_comment_count(video_page)