parent
							
								
									ea75382094
								
							
						
					
					
						commit
						612300a686
					
				
					 3 changed files with 0 additions and 232 deletions
				
			
		| 
						 | 
				
			
			@ -772,13 +772,6 @@ from .nova import (
 | 
			
		|||
    NovaEmbedIE,
 | 
			
		||||
    NovaIE,
 | 
			
		||||
)
 | 
			
		||||
from .novamov import (
 | 
			
		||||
    AuroraVidIE,
 | 
			
		||||
    CloudTimeIE,
 | 
			
		||||
    NowVideoIE,
 | 
			
		||||
    VideoWeedIE,
 | 
			
		||||
    WholeCloudIE,
 | 
			
		||||
)
 | 
			
		||||
from .nowness import (
 | 
			
		||||
    NownessIE,
 | 
			
		||||
    NownessPlaylistIE,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2583,19 +2583,6 @@ class GenericIE(InfoExtractor):
 | 
			
		|||
        if mobj is not None:
 | 
			
		||||
            return self.url_result(mobj.group(1), 'Mpora')
 | 
			
		||||
 | 
			
		||||
        # Look for embedded NovaMov-based player
 | 
			
		||||
        mobj = re.search(
 | 
			
		||||
            r'''(?x)<(?:pagespeed_)?iframe[^>]+?src=(["\'])
 | 
			
		||||
                    (?P<url>http://(?:(?:embed|www)\.)?
 | 
			
		||||
                        (?:novamov\.com|
 | 
			
		||||
                           nowvideo\.(?:ch|sx|eu|at|ag|co)|
 | 
			
		||||
                           videoweed\.(?:es|com)|
 | 
			
		||||
                           movshare\.(?:net|sx|ag)|
 | 
			
		||||
                           divxstage\.(?:eu|net|ch|co|at|ag))
 | 
			
		||||
                        /embed\.php.+?)\1''', webpage)
 | 
			
		||||
        if mobj is not None:
 | 
			
		||||
            return self.url_result(mobj.group('url'))
 | 
			
		||||
 | 
			
		||||
        # Look for embedded Facebook player
 | 
			
		||||
        facebook_urls = FacebookIE._extract_urls(webpage)
 | 
			
		||||
        if facebook_urls:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,212 +0,0 @@
 | 
			
		|||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
import re
 | 
			
		||||
 | 
			
		||||
from .common import InfoExtractor
 | 
			
		||||
from ..compat import compat_urlparse
 | 
			
		||||
from ..utils import (
 | 
			
		||||
    ExtractorError,
 | 
			
		||||
    NO_DEFAULT,
 | 
			
		||||
    sanitized_Request,
 | 
			
		||||
    urlencode_postdata,
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class NovaMovIE(InfoExtractor):
 | 
			
		||||
    IE_NAME = 'novamov'
 | 
			
		||||
    IE_DESC = 'NovaMov'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL_TEMPLATE = r'''(?x)
 | 
			
		||||
                            http://
 | 
			
		||||
                                (?:
 | 
			
		||||
                                    (?:www\.)?%(host)s/(?:file|video|mobile/\#/videos)/|
 | 
			
		||||
                                    (?:(?:embed|www)\.)%(host)s/embed(?:\.php|/)?\?(?:.*?&)?\bv=
 | 
			
		||||
                                )
 | 
			
		||||
                                (?P<id>[a-z\d]{13})
 | 
			
		||||
                            '''
 | 
			
		||||
    _VALID_URL = _VALID_URL_TEMPLATE % {'host': r'novamov\.com'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.novamov.com'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'This file no longer exists on our servers!</h2>'
 | 
			
		||||
    _FILEKEY_REGEX = r'flashvars\.filekey=(?P<filekey>"?[^"]+"?);'
 | 
			
		||||
    _TITLE_REGEX = r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>([^<]+)</h3>'
 | 
			
		||||
    _DESCRIPTION_REGEX = r'(?s)<div class="v_tab blockborder rounded5" id="v_tab1">\s*<h3>[^<]+</h3><p>([^<]+)</p>'
 | 
			
		||||
    _URL_TEMPLATE = 'http://%s/video/%s'
 | 
			
		||||
 | 
			
		||||
    _TEST = None
 | 
			
		||||
 | 
			
		||||
    def _check_existence(self, webpage, video_id):
 | 
			
		||||
        if re.search(self._FILE_DELETED_REGEX, webpage) is not None:
 | 
			
		||||
            raise ExtractorError('Video %s does not exist' % video_id, expected=True)
 | 
			
		||||
 | 
			
		||||
    def _real_extract(self, url):
 | 
			
		||||
        video_id = self._match_id(url)
 | 
			
		||||
 | 
			
		||||
        url = self._URL_TEMPLATE % (self._HOST, video_id)
 | 
			
		||||
 | 
			
		||||
        webpage = self._download_webpage(
 | 
			
		||||
            url, video_id, 'Downloading video page')
 | 
			
		||||
 | 
			
		||||
        self._check_existence(webpage, video_id)
 | 
			
		||||
 | 
			
		||||
        def extract_filekey(default=NO_DEFAULT):
 | 
			
		||||
            filekey = self._search_regex(
 | 
			
		||||
                self._FILEKEY_REGEX, webpage, 'filekey', default=default)
 | 
			
		||||
            if filekey is not default and (filekey[0] != '"' or filekey[-1] != '"'):
 | 
			
		||||
                return self._search_regex(
 | 
			
		||||
                    r'var\s+%s\s*=\s*"([^"]+)"' % re.escape(filekey), webpage, 'filekey', default=default)
 | 
			
		||||
            else:
 | 
			
		||||
                return filekey
 | 
			
		||||
 | 
			
		||||
        filekey = extract_filekey(default=None)
 | 
			
		||||
 | 
			
		||||
        if not filekey:
 | 
			
		||||
            fields = self._hidden_inputs(webpage)
 | 
			
		||||
            post_url = self._search_regex(
 | 
			
		||||
                r'<form[^>]+action=(["\'])(?P<url>.+?)\1', webpage,
 | 
			
		||||
                'post url', default=url, group='url')
 | 
			
		||||
            if not post_url.startswith('http'):
 | 
			
		||||
                post_url = compat_urlparse.urljoin(url, post_url)
 | 
			
		||||
            request = sanitized_Request(
 | 
			
		||||
                post_url, urlencode_postdata(fields))
 | 
			
		||||
            request.add_header('Content-Type', 'application/x-www-form-urlencoded')
 | 
			
		||||
            request.add_header('Referer', post_url)
 | 
			
		||||
            webpage = self._download_webpage(
 | 
			
		||||
                request, video_id, 'Downloading continue to the video page')
 | 
			
		||||
            self._check_existence(webpage, video_id)
 | 
			
		||||
 | 
			
		||||
        filekey = extract_filekey()
 | 
			
		||||
 | 
			
		||||
        title = self._html_search_regex(self._TITLE_REGEX, webpage, 'title')
 | 
			
		||||
        description = self._html_search_regex(self._DESCRIPTION_REGEX, webpage, 'description', default='', fatal=False)
 | 
			
		||||
 | 
			
		||||
        api_response = self._download_webpage(
 | 
			
		||||
            'http://%s/api/player.api.php?key=%s&file=%s' % (self._HOST, filekey, video_id), video_id,
 | 
			
		||||
            'Downloading video api response')
 | 
			
		||||
 | 
			
		||||
        response = compat_urlparse.parse_qs(api_response)
 | 
			
		||||
 | 
			
		||||
        if 'error_msg' in response:
 | 
			
		||||
            raise ExtractorError('%s returned error: %s' % (self.IE_NAME, response['error_msg'][0]), expected=True)
 | 
			
		||||
 | 
			
		||||
        video_url = response['url'][0]
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
            'id': video_id,
 | 
			
		||||
            'url': video_url,
 | 
			
		||||
            'title': title,
 | 
			
		||||
            'description': description
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class WholeCloudIE(NovaMovIE):
 | 
			
		||||
    IE_NAME = 'wholecloud'
 | 
			
		||||
    IE_DESC = 'WholeCloud'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': r'(?:wholecloud\.net|movshare\.(?:net|sx|ag))'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.wholecloud.net'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
 | 
			
		||||
    _TITLE_REGEX = r'<strong>Title:</strong> ([^<]+)</p>'
 | 
			
		||||
    _DESCRIPTION_REGEX = r'<strong>Description:</strong> ([^<]+)</p>'
 | 
			
		||||
 | 
			
		||||
    _TEST = {
 | 
			
		||||
        'url': 'http://www.wholecloud.net/video/559e28be54d96',
 | 
			
		||||
        'md5': 'abd31a2132947262c50429e1d16c1bfd',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': '559e28be54d96',
 | 
			
		||||
            'ext': 'flv',
 | 
			
		||||
            'title': 'dissapeared image',
 | 
			
		||||
            'description': 'optical illusion  dissapeared image  magic illusion',
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class NowVideoIE(NovaMovIE):
 | 
			
		||||
    IE_NAME = 'nowvideo'
 | 
			
		||||
    IE_DESC = 'NowVideo'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': r'nowvideo\.(?:to|ch|ec|sx|eu|at|ag|co|li)'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.nowvideo.to'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
 | 
			
		||||
    _TITLE_REGEX = r'<h4>([^<]+)</h4>'
 | 
			
		||||
    _DESCRIPTION_REGEX = r'</h4>\s*<p>([^<]+)</p>'
 | 
			
		||||
 | 
			
		||||
    _TEST = {
 | 
			
		||||
        'url': 'http://www.nowvideo.sx/video/f1d6fce9a968b',
 | 
			
		||||
        'md5': '12c82cad4f2084881d8bc60ee29df092',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': 'f1d6fce9a968b',
 | 
			
		||||
            'ext': 'flv',
 | 
			
		||||
            'title': 'youtubedl test video BaWjenozKc',
 | 
			
		||||
            'description': 'Description',
 | 
			
		||||
        },
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class VideoWeedIE(NovaMovIE):
 | 
			
		||||
    IE_NAME = 'videoweed'
 | 
			
		||||
    IE_DESC = 'VideoWeed'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': r'videoweed\.(?:es|com)'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.videoweed.es'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
 | 
			
		||||
    _TITLE_REGEX = r'<h1 class="text_shadow">([^<]+)</h1>'
 | 
			
		||||
    _URL_TEMPLATE = 'http://%s/file/%s'
 | 
			
		||||
 | 
			
		||||
    _TEST = {
 | 
			
		||||
        'url': 'http://www.videoweed.es/file/b42178afbea14',
 | 
			
		||||
        'md5': 'abd31a2132947262c50429e1d16c1bfd',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': 'b42178afbea14',
 | 
			
		||||
            'ext': 'flv',
 | 
			
		||||
            'title': 'optical illusion  dissapeared image magic illusion',
 | 
			
		||||
            'description': ''
 | 
			
		||||
        },
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class CloudTimeIE(NovaMovIE):
 | 
			
		||||
    IE_NAME = 'cloudtime'
 | 
			
		||||
    IE_DESC = 'CloudTime'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': r'cloudtime\.to'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.cloudtime.to'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'>This file no longer exists on our servers.<'
 | 
			
		||||
    _TITLE_REGEX = r'<div[^>]+class=["\']video_det["\'][^>]*>\s*<strong>([^<]+)</strong>'
 | 
			
		||||
 | 
			
		||||
    _TEST = None
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class AuroraVidIE(NovaMovIE):
 | 
			
		||||
    IE_NAME = 'auroravid'
 | 
			
		||||
    IE_DESC = 'AuroraVid'
 | 
			
		||||
 | 
			
		||||
    _VALID_URL = NovaMovIE._VALID_URL_TEMPLATE % {'host': r'auroravid\.to'}
 | 
			
		||||
 | 
			
		||||
    _HOST = 'www.auroravid.to'
 | 
			
		||||
 | 
			
		||||
    _FILE_DELETED_REGEX = r'This file no longer exists on our servers!<'
 | 
			
		||||
 | 
			
		||||
    _TESTS = [{
 | 
			
		||||
        'url': 'http://www.auroravid.to/video/4rurhn9x446jj',
 | 
			
		||||
        'md5': '7205f346a52bbeba427603ba10d4b935',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': '4rurhn9x446jj',
 | 
			
		||||
            'ext': 'flv',
 | 
			
		||||
            'title': 'search engine optimization',
 | 
			
		||||
            'description': 'search engine optimization is used to rank the web page in the google search engine'
 | 
			
		||||
        },
 | 
			
		||||
        'skip': '"Invalid token" errors abound (in web interface as well as youtube-dl, there is nothing we can do about it.)'
 | 
			
		||||
    }, {
 | 
			
		||||
        'url': 'http://www.auroravid.to/embed/?v=4rurhn9x446jj',
 | 
			
		||||
        'only_matching': True,
 | 
			
		||||
    }]
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue