[cloudy] Add support for videoraj.ch

This commit is contained in:
Sergey M․ 2014-09-14 05:17:21 +07:00
parent 5dbf3b5c60
commit 98676c08a1
1 changed files with 27 additions and 13 deletions

View File

@ -13,13 +13,16 @@ from ..utils import (
class CloudyIE(InfoExtractor): class CloudyIE(InfoExtractor):
_IE_DESC = 'cloudy.ec and videoraj.ch'
_VALID_URL = r'''(?x) _VALID_URL = r'''(?x)
https?://(?:www\.)?cloudy\.ec/ https?://(?:www\.)?(?P<host>cloudy\.ec|videoraj\.ch)/
(?:v/|embed\.php\?id=) (?:v/|embed\.php\?id=)
(?P<id>[A-Za-z0-9]+) (?P<id>[A-Za-z0-9]+)
''' '''
_API_URL = 'http://www.cloudy.ec/api/player.api.php?%s' _EMBED_URL = 'http://www.%s/embed.php?id=%s'
_TEST = { _API_URL = 'http://www.%s/api/player.api.php?%s'
_TESTS = [
{
'url': 'https://www.cloudy.ec/v/af511e2527aac', 'url': 'https://www.cloudy.ec/v/af511e2527aac',
'md5': '5cb253ace826a42f35b4740539bedf07', 'md5': '5cb253ace826a42f35b4740539bedf07',
'info_dict': { 'info_dict': {
@ -27,21 +30,32 @@ class CloudyIE(InfoExtractor):
'ext': 'flv', 'ext': 'flv',
'title': 'Funny Cats and Animals Compilation june 2013', 'title': 'Funny Cats and Animals Compilation june 2013',
} }
},
{
'url': 'http://www.videoraj.ch/v/47f399fd8bb60',
'md5': '7d0f8799d91efd4eda26587421c3c3b0',
'info_dict': {
'id': '47f399fd8bb60',
'ext': 'flv',
'title': 'Burning a New iPhone 5 with Gasoline - Will it Survive?',
} }
}
]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
video_host = mobj.group('host')
video_id = mobj.group('id') video_id = mobj.group('id')
url = 'http://www.cloudy.ec/embed.php?id=%s' % video_id url = self._EMBED_URL % (video_host, video_id)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
file_key = self._search_regex( file_key = self._search_regex(
r'filekey\s*=\s*"([^"]+)"', webpage, 'file_key') r'filekey\s*=\s*"([^"]+)"', webpage, 'file_key')
data_url = self._API_URL % compat_urllib_parse.urlencode({ data_url = self._API_URL % (video_host, compat_urllib_parse.urlencode({
'file': video_id, 'file': video_id,
'key': file_key, 'key': file_key,
}) }))
player_data = self._download_webpage( player_data = self._download_webpage(
data_url, video_id, 'Downloading player data') data_url, video_id, 'Downloading player data')
data = compat_parse_qs(player_data) data = compat_parse_qs(player_data)