projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6c6db72
)
[ivi] Simplify
author
dst
<dstftw@gmail.com>
Thu, 19 Dec 2013 03:53:38 +0000
(10:53 +0700)
committer
dst
<dstftw@gmail.com>
Thu, 19 Dec 2013 03:53:38 +0000
(10:53 +0700)
youtube_dl/extractor/ivi.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ivi.py
b/youtube_dl/extractor/ivi.py
index 10279478bacdf82169b62e7cfb3d518dcb4fe326..4bdf55f934aa63b005ff06e9b088b956f6806a02 100644
(file)
--- a/
youtube_dl/extractor/ivi.py
+++ b/
youtube_dl/extractor/ivi.py
@@
-13,7
+13,7
@@
from ..utils import (
class IviIE(InfoExtractor):
IE_DESC = u'ivi.ru'
IE_NAME = u'ivi'
class IviIE(InfoExtractor):
IE_DESC = u'ivi.ru'
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 = [
# Single movie
_TESTS = [
# Single movie
@@
-103,9
+103,7
@@
class IviIE(InfoExtractor):
previews.sort(key=lambda fmt: self._known_thumbnails.index(fmt['content_format']))
thumbnail = previews[-1][u'url'] if len(previews) > 0 else None
previews.sort(key=lambda fmt: self._known_thumbnails.index(fmt['content_format']))
thumbnail = previews[-1][u'url'] if len(previews) > 0 else None
- video_page_url = 'http://' + mobj.group('url')
- video_page = self._download_webpage(video_page_url, video_id, u'Downloading video page')
-
+ video_page = self._download_webpage(url, video_id, u'Downloading video page')
description = self._extract_description(video_page)
comment_count = self._extract_comment_count(video_page)
description = self._extract_description(video_page)
comment_count = self._extract_comment_count(video_page)