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
/
sockshare.py
diff --git
a/youtube_dl/extractor/sockshare.py
b/youtube_dl/extractor/sockshare.py
index cbf2d7abefad8d6d594a33c6dcaa214031cd8d3e..dc9f8055013170a87a447ee6370f5cae4546174d 100644
(file)
--- a/
youtube_dl/extractor/sockshare.py
+++ b/
youtube_dl/extractor/sockshare.py
@@
-34,7
+34,7
@@
class SockshareIE(InfoExtractor):
webpage = self._download_webpage(url, video_id)
if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
webpage = self._download_webpage(url, video_id)
if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
- raise ExtractorError(
u
'Video %s does not exist' % video_id,
+ raise ExtractorError('Video %s does not exist' % video_id,
expected=True)
confirm_hash = self._html_search_regex(r'''(?x)<input\s+
expected=True)
confirm_hash = self._html_search_regex(r'''(?x)<input\s+
@@
-54,19
+54,22
@@
class SockshareIE(InfoExtractor):
req.add_header('Host', 'www.sockshare.com')
req.add_header('Content-type', 'application/x-www-form-urlencoded')
req.add_header('Host', 'www.sockshare.com')
req.add_header('Content-type', 'application/x-www-form-urlencoded')
- webpage = self._download_webpage(req, video_id, 'Downloading video page')
+ webpage = self._download_webpage(
+ req, video_id, 'Downloading video page')
- video_url = self._html_search_regex(r'<a href="([^"]*)".+class="download_file_link"', webpage, 'file url')
+ video_url = self._html_search_regex(
+ r'<a href="([^"]*)".+class="download_file_link"',
+ webpage, 'file url')
video_url = "http://www.sockshare.com" + video_url
title = self._html_search_regex(r'<h1>(.+)<strong>', webpage, 'title')
video_url = "http://www.sockshare.com" + video_url
title = self._html_search_regex(r'<h1>(.+)<strong>', webpage, 'title')
- thumbnail = self._html_search_regex(
r'<img\ssrc="([^"]*)".+name="bg"',
- webpage, 'thumbnail')
-
ext = determine_ext(title
)
+ thumbnail = self._html_search_regex(
+ r'<img\s+src="([^"]*)".+?name="bg"',
+
webpage, 'thumbnail'
)
formats = [{
'format_id': 'sd',
'url': video_url,
formats = [{
'format_id': 'sd',
'url': video_url,
- 'ext':
ext
,
+ 'ext':
determine_ext(title)
,
}]
return {
}]
return {