diff options
Diffstat (limited to 'youtube_dl/extractor/sockshare.py')
| -rw-r--r-- | youtube_dl/extractor/sockshare.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/youtube_dl/extractor/sockshare.py b/youtube_dl/extractor/sockshare.py index dc9f80550..7d3c0e937 100644 --- a/youtube_dl/extractor/sockshare.py +++ b/youtube_dl/extractor/sockshare.py @@ -1,13 +1,16 @@ # coding: utf-8 from __future__ import unicode_literals -from ..utils import ( - ExtractorError, +import re + +from ..compat import ( compat_urllib_parse, compat_urllib_request, +) +from ..utils import ( determine_ext, + ExtractorError, ) -import re from .common import InfoExtractor @@ -27,9 +30,7 @@ class SockshareIE(InfoExtractor): } 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) @@ -61,7 +62,10 @@ class SockshareIE(InfoExtractor): 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"', webpage, 'thumbnail') |