mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 10:27:07 -05:00 
			
		
		
		
	[dailymotion] remove dailymotion cloud extractor(closes #6794)
https://web.archive.org/web/20160312110217/https://www.dmcloud.net/
This commit is contained in:
		@@ -413,52 +413,3 @@ class DailymotionUserIE(DailymotionPlaylistIE):
 | 
			
		||||
            'title': full_user,
 | 
			
		||||
            'entries': self._extract_entries(user),
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class DailymotionCloudIE(DailymotionBaseInfoExtractor):
 | 
			
		||||
    _VALID_URL_PREFIX = r'https?://api\.dmcloud\.net/(?:player/)?embed/'
 | 
			
		||||
    _VALID_URL = r'%s[^/]+/(?P<id>[^/?]+)' % _VALID_URL_PREFIX
 | 
			
		||||
    _VALID_EMBED_URL = r'%s[^/]+/[^\'"]+' % _VALID_URL_PREFIX
 | 
			
		||||
 | 
			
		||||
    _TESTS = [{
 | 
			
		||||
        # From http://www.francetvinfo.fr/economie/entreprises/les-entreprises-familiales-le-secret-de-la-reussite_933271.html
 | 
			
		||||
        # Tested at FranceTvInfo_2
 | 
			
		||||
        'url': 'http://api.dmcloud.net/embed/4e7343f894a6f677b10006b4/556e03339473995ee145930c?auth=1464865870-0-jyhsm84b-ead4c701fb750cf9367bf4447167a3db&autoplay=1',
 | 
			
		||||
        'only_matching': True,
 | 
			
		||||
    }, {
 | 
			
		||||
        # http://www.francetvinfo.fr/societe/larguez-les-amarres-le-cobaturage-se-developpe_980101.html
 | 
			
		||||
        'url': 'http://api.dmcloud.net/player/embed/4e7343f894a6f677b10006b4/559545469473996d31429f06?auth=1467430263-0-90tglw2l-a3a4b64ed41efe48d7fccad85b8b8fda&autoplay=1',
 | 
			
		||||
        'only_matching': True,
 | 
			
		||||
    }]
 | 
			
		||||
 | 
			
		||||
    @classmethod
 | 
			
		||||
    def _extract_dmcloud_url(cls, webpage):
 | 
			
		||||
        mobj = re.search(r'<iframe[^>]+src=[\'"](%s)[\'"]' % cls._VALID_EMBED_URL, webpage)
 | 
			
		||||
        if mobj:
 | 
			
		||||
            return mobj.group(1)
 | 
			
		||||
 | 
			
		||||
        mobj = re.search(
 | 
			
		||||
            r'<input[^>]+id=[\'"]dmcloudUrlEmissionSelect[\'"][^>]+value=[\'"](%s)[\'"]' % cls._VALID_EMBED_URL,
 | 
			
		||||
            webpage)
 | 
			
		||||
        if mobj:
 | 
			
		||||
            return mobj.group(1)
 | 
			
		||||
 | 
			
		||||
    def _real_extract(self, url):
 | 
			
		||||
        video_id = self._match_id(url)
 | 
			
		||||
 | 
			
		||||
        webpage = self._download_webpage_no_ff(url, video_id)
 | 
			
		||||
 | 
			
		||||
        title = self._html_search_regex(r'<title>([^>]+)</title>', webpage, 'title')
 | 
			
		||||
 | 
			
		||||
        video_info = self._parse_json(self._search_regex(
 | 
			
		||||
            r'var\s+info\s*=\s*([^;]+);', webpage, 'video info'), video_id)
 | 
			
		||||
 | 
			
		||||
        # TODO: parse ios_url, which is in fact a manifest
 | 
			
		||||
        video_url = video_info['mp4_url']
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
            'id': video_id,
 | 
			
		||||
            'url': video_url,
 | 
			
		||||
            'title': title,
 | 
			
		||||
            'thumbnail': video_info.get('thumbnail_url'),
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -246,7 +246,6 @@ from .dailymotion import (
 | 
			
		||||
    DailymotionIE,
 | 
			
		||||
    DailymotionPlaylistIE,
 | 
			
		||||
    DailymotionUserIE,
 | 
			
		||||
    DailymotionCloudIE,
 | 
			
		||||
)
 | 
			
		||||
from .daisuki import (
 | 
			
		||||
    DaisukiMottoIE,
 | 
			
		||||
 
 | 
			
		||||
@@ -13,10 +13,7 @@ from ..utils import (
 | 
			
		||||
    parse_duration,
 | 
			
		||||
    determine_ext,
 | 
			
		||||
)
 | 
			
		||||
from .dailymotion import (
 | 
			
		||||
    DailymotionIE,
 | 
			
		||||
    DailymotionCloudIE,
 | 
			
		||||
)
 | 
			
		||||
from .dailymotion import DailymotionIE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class FranceTVBaseInfoExtractor(InfoExtractor):
 | 
			
		||||
@@ -290,10 +287,6 @@ class FranceTVInfoIE(FranceTVBaseInfoExtractor):
 | 
			
		||||
        page_title = mobj.group('title')
 | 
			
		||||
        webpage = self._download_webpage(url, page_title)
 | 
			
		||||
 | 
			
		||||
        dmcloud_url = DailymotionCloudIE._extract_dmcloud_url(webpage)
 | 
			
		||||
        if dmcloud_url:
 | 
			
		||||
            return self.url_result(dmcloud_url, DailymotionCloudIE.ie_key())
 | 
			
		||||
 | 
			
		||||
        dailymotion_urls = DailymotionIE._extract_urls(webpage)
 | 
			
		||||
        if dailymotion_urls:
 | 
			
		||||
            return self.playlist_result([
 | 
			
		||||
 
 | 
			
		||||
@@ -59,10 +59,7 @@ from .tnaflix import TNAFlixNetworkEmbedIE
 | 
			
		||||
from .drtuber import DrTuberIE
 | 
			
		||||
from .redtube import RedTubeIE
 | 
			
		||||
from .vimeo import VimeoIE
 | 
			
		||||
from .dailymotion import (
 | 
			
		||||
    DailymotionIE,
 | 
			
		||||
    DailymotionCloudIE,
 | 
			
		||||
)
 | 
			
		||||
from .dailymotion import DailymotionIE
 | 
			
		||||
from .dailymail import DailyMailIE
 | 
			
		||||
from .onionstudios import OnionStudiosIE
 | 
			
		||||
from .viewlift import ViewLiftEmbedIE
 | 
			
		||||
@@ -1472,23 +1469,6 @@ class GenericIE(InfoExtractor):
 | 
			
		||||
                'timestamp': 1432570283,
 | 
			
		||||
            },
 | 
			
		||||
        },
 | 
			
		||||
        # Dailymotion Cloud video
 | 
			
		||||
        {
 | 
			
		||||
            'url': 'http://replay.publicsenat.fr/vod/le-debat/florent-kolandjian,dominique-cena,axel-decourtye,laurence-abeille,bruno-parmentier/175910',
 | 
			
		||||
            'md5': 'dcaf23ad0c67a256f4278bce6e0bae38',
 | 
			
		||||
            'info_dict': {
 | 
			
		||||
                'id': 'x2uy8t3',
 | 
			
		||||
                'ext': 'mp4',
 | 
			
		||||
                'title': 'Sauvons les abeilles ! - Le débat',
 | 
			
		||||
                'description': 'md5:d9082128b1c5277987825d684939ca26',
 | 
			
		||||
                'thumbnail': r're:^https?://.*\.jpe?g$',
 | 
			
		||||
                'timestamp': 1434970506,
 | 
			
		||||
                'upload_date': '20150622',
 | 
			
		||||
                'uploader': 'Public Sénat',
 | 
			
		||||
                'uploader_id': 'xa9gza',
 | 
			
		||||
            },
 | 
			
		||||
            'skip': 'File not found.',
 | 
			
		||||
        },
 | 
			
		||||
        # OnionStudios embed
 | 
			
		||||
        {
 | 
			
		||||
            'url': 'http://www.clickhole.com/video/dont-understand-bitcoin-man-will-mumble-explanatio-2537',
 | 
			
		||||
@@ -2704,11 +2684,6 @@ class GenericIE(InfoExtractor):
 | 
			
		||||
        if senate_isvp_url:
 | 
			
		||||
            return self.url_result(senate_isvp_url, 'SenateISVP')
 | 
			
		||||
 | 
			
		||||
        # Look for Dailymotion Cloud videos
 | 
			
		||||
        dmcloud_url = DailymotionCloudIE._extract_dmcloud_url(webpage)
 | 
			
		||||
        if dmcloud_url:
 | 
			
		||||
            return self.url_result(dmcloud_url, 'DailymotionCloud')
 | 
			
		||||
 | 
			
		||||
        # Look for OnionStudios embeds
 | 
			
		||||
        onionstudios_url = OnionStudiosIE._extract_url(webpage)
 | 
			
		||||
        if onionstudios_url:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user