projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add extractor for daum.net (closes #1330)
[youtube-dl]
/
youtube_dl
/
extractor
/
xhamster.py
diff --git
a/youtube_dl/extractor/xhamster.py
b/youtube_dl/extractor/xhamster.py
index 0fd0775834fe607cfe08259bda3d78b74c73fe3a..88b8b6be09f7a8f892db8266b3e68df14e22bfe7 100644
(file)
--- a/
youtube_dl/extractor/xhamster.py
+++ b/
youtube_dl/extractor/xhamster.py
@@
-4,6
+4,7
@@
from .common import InfoExtractor
from ..utils import (
compat_urllib_parse,
unescapeHTML,
from ..utils import (
compat_urllib_parse,
unescapeHTML,
+ determine_ext,
ExtractorError,
)
ExtractorError,
)
@@
-36,7
+37,6
@@
class XHamsterIE(InfoExtractor):
video_url = compat_urllib_parse.unquote(mobj.group('file'))
else:
video_url = mobj.group('server')+'/key='+mobj.group('file')
video_url = compat_urllib_parse.unquote(mobj.group('file'))
else:
video_url = mobj.group('server')+'/key='+mobj.group('file')
- video_extension = video_url.split('.')[-1].split('?')[0]
video_title = self._html_search_regex(r'<title>(?P<title>.+?) - xHamster\.com</title>',
webpage, u'title')
video_title = self._html_search_regex(r'<title>(?P<title>.+?) - xHamster\.com</title>',
webpage, u'title')
@@
-64,7
+64,7
@@
class XHamsterIE(InfoExtractor):
return [{
'id': video_id,
'url': video_url,
return [{
'id': video_id,
'url': video_url,
- 'ext':
video_extension
,
+ 'ext':
determine_ext(video_url)
,
'title': video_title,
'description': video_description,
'upload_date': video_upload_date,
'title': video_title,
'description': video_description,
'upload_date': video_upload_date,