projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7d02fae
)
[ellentv] Clean up and simplify
author
Sergey M․
<dstftw@gmail.com>
Sat, 3 Jan 2015 15:44:47 +0000
(21:44 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 3 Jan 2015 15:44:47 +0000
(21:44 +0600)
youtube_dl/extractor/ellentv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ellentv.py
b/youtube_dl/extractor/ellentv.py
index 097317842cc63fa4645976197d3c9a9392761d10..89fa9f7e4680a6f3ec1f50b08adf439c243d0c98 100644
(file)
--- a/
youtube_dl/extractor/ellentv.py
+++ b/
youtube_dl/extractor/ellentv.py
@@
-1,7
+1,6
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import re
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
@@
-12,7
+11,7
@@
from ..utils import (
class EllenTVIE(InfoExtractor):
class EllenTVIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?(ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
+ _VALID_URL = r'https?://(?:www\.)?(
?:
ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
_TESTS = [{
'url': 'http://www.ellentv.com/videos/0-7jqrsr18/',
'md5': 'e4af06f3bf0d5f471921a18db5764642',
_TESTS = [{
'url': 'http://www.ellentv.com/videos/0-7jqrsr18/',
'md5': 'e4af06f3bf0d5f471921a18db5764642',
@@
-23,8
+22,7
@@
class EllenTVIE(InfoExtractor):
'timestamp': 1406876400,
'upload_date': '20140801',
}
'timestamp': 1406876400,
'upload_date': '20140801',
}
- },
- {
+ }, {
'url': 'http://ellentube.com/videos/0-dvzmabd5/',
'md5': '98238118eaa2bbdf6ad7f708e3e4f4eb',
'info_dict': {
'url': 'http://ellentube.com/videos/0-dvzmabd5/',
'md5': '98238118eaa2bbdf6ad7f708e3e4f4eb',
'info_dict': {
@@
-37,16
+35,12
@@
class EllenTVIE(InfoExtractor):
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
timestamp = parse_iso8601(self._search_regex(
r'<span class="publish-date"><time datetime="([^"]+)">',
webpage, 'timestamp'))
webpage = self._download_webpage(url, video_id)
timestamp = parse_iso8601(self._search_regex(
r'<span class="publish-date"><time datetime="([^"]+)">',
webpage, 'timestamp'))
- print "\n"
- print timestamp
- print "\n"
return {
'id': video_id,
return {
'id': video_id,
@@
-69,8
+63,7
@@
class EllenTVClipsIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- playlist_id = mobj.group('id')
+ playlist_id = self._match_id(url)
webpage = self._download_webpage(url, playlist_id)
playlist = self._extract_playlist(webpage)
webpage = self._download_webpage(url, playlist_id)
playlist = self._extract_playlist(webpage)