diff --git a/youtube_dl/extractor/movshare.py b/youtube_dl/extractor/movshare.py index 6101063f2..3ac83a008 100644 --- a/youtube_dl/extractor/movshare.py +++ b/youtube_dl/extractor/movshare.py @@ -11,10 +11,6 @@ class MovShareIE(NovaMovIE): _HOST = 'www.movshare.net' - _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<' - _TITLE_REGEX = r'Title: ([^<]+)
' - _DESCRIPTION_REGEX = r'Description: ([^<]+)' - _TEST = { 'url': 'http://www.movshare.net/video/559e28be54d96', 'md5': 'abd31a2132947262c50429e1d16c1bfd', diff --git a/youtube_dl/extractor/novamov.py b/youtube_dl/extractor/novamov.py index 6163e8855..01959632d 100644 --- a/youtube_dl/extractor/novamov.py +++ b/youtube_dl/extractor/novamov.py @@ -1,15 +1,9 @@ from __future__ import unicode_literals -import re - from .common import InfoExtractor -from ..compat import compat_urlparse from ..utils import ( ExtractorError, - NO_DEFAULT, - encode_dict, - sanitized_Request, - urlencode_postdata, + HEADRequest, ) @@ -22,11 +16,6 @@ class NovaMovIE(InfoExtractor): _HOST = 'www.novamov.com' - _FILE_DELETED_REGEX = r'This file no longer exists on our servers!' - _FILEKEY_REGEX = r'flashvars\.filekey="(?P([^<]+)
' - _TEST = { 'url': 'http://www.novamov.com/video/4rurhn9x446jj', 'md5': '7205f346a52bbeba427603ba10d4b935', @@ -42,53 +31,25 @@ class NovaMovIE(InfoExtractor): def _real_extract(self, url): video_id = self._match_id(url) - url = 'http://%s/video/%s' % (self._HOST, video_id) + video_data = self._download_json( + 'http://%s/mobile/ajax.php?videoId=%s' % (self._HOST, video_id), + video_id, 'Downloading video page') - webpage = self._download_webpage( - url, video_id, 'Downloading video page') + if video_data.get('error'): + raise ExtractorError( + '%s said: The video does not exist or has been deleted.' % self.IE_NAME, + expected=True) - if re.search(self._FILE_DELETED_REGEX, webpage) is not None: - raise ExtractorError('Video %s does not exist' % video_id, expected=True) + video_data = video_data['items'][0] - def extract_filekey(default=NO_DEFAULT): - return self._search_regex( - self._FILEKEY_REGEX, webpage, 'filekey', default=default) - - filekey = extract_filekey(default=None) - - if not filekey: - fields = self._hidden_inputs(webpage) - post_url = self._search_regex( - r'