projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[viki] Add proper paging and include clips
[youtube-dl]
/
youtube_dl
/
extractor
/
sockshare.py
diff --git
a/youtube_dl/extractor/sockshare.py
b/youtube_dl/extractor/sockshare.py
index dc9f8055013170a87a447ee6370f5cae4546174d..b5fa6f1da203c993873622a9ee80c923300eebb2 100644
(file)
--- a/
youtube_dl/extractor/sockshare.py
+++ b/
youtube_dl/extractor/sockshare.py
@@
-1,13
+1,16
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-from ..utils import (
- ExtractorError,
+import re
+
+from ..compat import (
compat_urllib_parse,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_request,
+)
+from ..utils import (
determine_ext,
determine_ext,
+ ExtractorError,
)
)
-import re
from .common import InfoExtractor
from .common import InfoExtractor
@@
-22,14
+25,11
@@
class SockshareIE(InfoExtractor):
'id': '437BE28B89D799D7',
'title': 'big_buck_bunny_720p_surround.avi',
'ext': 'avi',
'id': '437BE28B89D799D7',
'title': 'big_buck_bunny_720p_surround.avi',
'ext': 'avi',
- 'thumbnail': 're:^http://.*\.jpg$',
}
}
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)
url = 'http://sockshare.com/file/%s' % video_id
webpage = self._download_webpage(url, video_id)
url = 'http://sockshare.com/file/%s' % video_id
webpage = self._download_webpage(url, video_id)
@@
-44,7
+44,7
@@
class SockshareIE(InfoExtractor):
''', webpage, 'hash')
fields = {
''', webpage, 'hash')
fields = {
- "hash": confirm_hash,
+ "hash": confirm_hash
.encode('utf-8')
,
"confirm": "Continue as Free User"
}
"confirm": "Continue as Free User"
}
@@
-61,10
+61,13
@@
class SockshareIE(InfoExtractor):
r'<a href="([^"]*)".+class="download_file_link"',
webpage, 'file url')
video_url = "http://www.sockshare.com" + video_url
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')
+ title = self._html_search_regex((
+ r'<h1>(.+)<strong>',
+ r'var name = "([^"]+)";'),
+ webpage, 'title', default=None)
thumbnail = self._html_search_regex(
r'<img\s+src="([^"]*)".+?name="bg"',
thumbnail = self._html_search_regex(
r'<img\s+src="([^"]*)".+?name="bg"',
- webpage, 'thumbnail')
+ webpage, 'thumbnail'
, default=None
)
formats = [{
'format_id': 'sd',
formats = [{
'format_id': 'sd',