projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[rtlnow] Simplify outdated test
[youtube-dl]
/
youtube_dl
/
extractor
/
empflix.py
diff --git
a/youtube_dl/extractor/empflix.py
b/youtube_dl/extractor/empflix.py
index eaeee5a51543eb1d2cc75f2922de6f5f4638bd2b..e6952588fbdfa08167935fc2b1c0381804328943 100644
(file)
--- a/
youtube_dl/extractor/empflix.py
+++ b/
youtube_dl/extractor/empflix.py
@@
-3,20
+3,18
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
-)
class EmpflixIE(InfoExtractor):
_VALID_URL = r'^https?://www\.empflix\.com/videos/.*?-(?P<id>[0-9]+)\.html'
_TEST = {
'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html',
class EmpflixIE(InfoExtractor):
_VALID_URL = r'^https?://www\.empflix\.com/videos/.*?-(?P<id>[0-9]+)\.html'
_TEST = {
'url': 'http://www.empflix.com/videos/Amateur-Finger-Fuck-33051.html',
- 'md5': '
5e5cc160f38ca9857f318eb97146e13e
',
+ 'md5': '
b1bc15b6412d33902d6e5952035fcabc
',
'info_dict': {
'id': '33051',
'info_dict': {
'id': '33051',
- 'ext': '
flv
',
+ 'ext': '
mp4
',
'title': 'Amateur Finger Fuck',
'title': 'Amateur Finger Fuck',
+ 'description': 'Amateur solo finger fucking.',
'age_limit': 18,
}
}
'age_limit': 18,
}
}
@@
-30,6
+28,8
@@
class EmpflixIE(InfoExtractor):
video_title = self._html_search_regex(
r'name="title" value="(?P<title>[^"]*)"', webpage, 'title')
video_title = self._html_search_regex(
r'name="title" value="(?P<title>[^"]*)"', webpage, 'title')
+ video_description = self._html_search_regex(
+ r'name="description" value="([^"]*)"', webpage, 'description', fatal=False)
cfg_url = self._html_search_regex(
r'flashvars\.config = escape\("([^"]+)"',
cfg_url = self._html_search_regex(
r'flashvars\.config = escape\("([^"]+)"',
@@
-37,12
+37,18
@@
class EmpflixIE(InfoExtractor):
cfg_xml = self._download_xml(
cfg_url, video_id, note='Downloading metadata')
cfg_xml = self._download_xml(
cfg_url, video_id, note='Downloading metadata')
- video_url = cfg_xml.find('videoLink').text
+
+ formats = [
+ {
+ 'url': item.find('videoLink').text,
+ 'format_id': item.find('res').text,
+ } for item in cfg_xml.findall('./quality/item')
+ ]
return {
'id': video_id,
return {
'id': video_id,
- 'url': video_url,
- 'ext': 'flv',
'title': video_title,
'title': video_title,
+ 'description': video_description,
+ 'formats': formats,
'age_limit': age_limit,
}
'age_limit': age_limit,
}