X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmooshare.py;h=34a4bec3a0d1fb91208acce4684a4078188b847d;hb=a81bbebf44b6f405fcb3959b3fc2d2dc03b3bb59;hp=f1875add5ff0626750827276935d861c25e4d7e3;hpb=95c29381eb8994370ee3924427ecc344ec891f63;p=youtube-dl diff --git a/youtube_dl/extractor/mooshare.py b/youtube_dl/extractor/mooshare.py index f1875add5..34a4bec3a 100644 --- a/youtube_dl/extractor/mooshare.py +++ b/youtube_dl/extractor/mooshare.py @@ -14,7 +14,7 @@ from ..utils import ( class MooshareIE(InfoExtractor): IE_NAME = 'mooshare' IE_DESC = 'Mooshare.biz' - _VALID_URL = r'http://mooshare\.biz/(?P[\da-z]{12})' + _VALID_URL = r'http://(?:www\.)?mooshare\.biz/(?P[\da-z]{12})' _TESTS = [ { @@ -49,7 +49,7 @@ class MooshareIE(InfoExtractor): page = self._download_webpage(url, video_id, 'Downloading page') if re.search(r'>Video Not Found or Deleted<', page) is not None: - raise ExtractorError(u'Video %s does not exist' % video_id, expected=True) + raise ExtractorError('Video %s does not exist' % video_id, expected=True) hash_key = self._html_search_regex(r'', page, 'hash') title = self._html_search_regex(r'(?m)
\s*

Watch ([^<]+)

', page, 'title') @@ -111,4 +111,4 @@ class MooshareIE(InfoExtractor): 'thumbnail': thumbnail, 'duration': duration, 'formats': formats, - } \ No newline at end of file + }