X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/0cf0312991a54458a07e903da2e47e9f3c8855ae..03342304420e5daeb428ffdcc7bbd2bbfecfa61a:/youtube_dl/extractor/mooshare.py diff --git a/youtube_dl/extractor/mooshare.py b/youtube_dl/extractor/mooshare.py index 34a4bec..7cc7f05 100644 --- a/youtube_dl/extractor/mooshare.py +++ b/youtube_dl/extractor/mooshare.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals import re -import time from .common import InfoExtractor +from ..compat import compat_urllib_parse from ..utils import ( ExtractorError, - compat_urllib_request, - compat_urllib_parse, + sanitized_Request, ) @@ -43,9 +42,7 @@ class MooshareIE(InfoExtractor): ] def _real_extract(self, url): - mobj = re.match(self._VALID_URL, url) - video_id = mobj.group('id') - + video_id = self._match_id(url) page = self._download_webpage(url, video_id, 'Downloading page') if re.search(r'>Video Not Found or Deleted<', page) is not None: @@ -60,12 +57,11 @@ class MooshareIE(InfoExtractor): 'hash': hash_key, } - request = compat_urllib_request.Request( + request = sanitized_Request( 'http://mooshare.biz/%s' % video_id, compat_urllib_parse.urlencode(download_form)) request.add_header('Content-Type', 'application/x-www-form-urlencoded') - self.to_screen('%s: Waiting for timeout' % video_id) - time.sleep(5) + self._sleep(5, video_id) video_page = self._download_webpage(request, video_id, 'Downloading video page')