dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fivemin] Get the 'sid' from the embed page (fixes #2745) 

It allows to download some videos that failed.
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-04-15 16:18:37 +02:00
parent d7666dff82
commit 8f5c0218d8
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
youtube_dl/extractor/fivemin.py
View File

@ -5,6 +5,7 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
compat_str, compat_str,
compat_urllib_parse,
) )
@ -16,7 +17,8 @@ class FiveMinIE(InfoExtractor):
(?P<id>\d+) (?P<id>\d+)
''' '''
_TEST = { _TESTS = [
{
# From http://www.engadget.com/2013/11/15/ipad-mini-retina-display-review/ # From http://www.engadget.com/2013/11/15/ipad-mini-retina-display-review/
'url': 'http://pshared.5min.com/Scripts/PlayerSeed.js?sid=281&width=560&height=345&playList=518013791', 'url': 'http://pshared.5min.com/Scripts/PlayerSeed.js?sid=281&width=560&height=345&playList=518013791',
'md5': '4f7b0b79bf1a470e5004f7112385941d', 'md5': '4f7b0b79bf1a470e5004f7112385941d',
@ -25,7 +27,18 @@ class FiveMinIE(InfoExtractor):
'ext': 'mp4', 'ext': 'mp4',
'title': 'iPad Mini with Retina Display Review', 'title': 'iPad Mini with Retina Display Review',
}, },
} },
{
# From http://on.aol.com/video/how-to-make-a-next-level-fruit-salad-518086247
'url': '5min:518086247',
'md5': 'e539a9dd682c288ef5a498898009f69e',
'info_dict': {
'id': '518086247',
'ext': 'mp4',
'title': 'How to Make a Next-Level Fruit Salad',
},
},
]
@classmethod @classmethod
def _build_result(cls, video_id): def _build_result(cls, video_id):
@ -34,9 +47,19 @@ class FiveMinIE(InfoExtractor):
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_id = mobj.group('id') video_id = mobj.group('id')
embed_url = 'https://embed.5min.com/playerseed/?playList=%s' % video_id
embed_page = self._download_webpage(embed_url, video_id,
'Downloading embed page')
sid = self._search_regex(r'sid=(\d+)', embed_page, 'sid')
query = compat_urllib_parse.urlencode({
'func': 'GetResults',
'playlist': video_id,
'sid': sid,
'isPlayerSeed': 'true',
'url': embed_url,
})
info = self._download_json( info = self._download_json(
'https://syn.5min.com/handlers/SenseHandler.ashx?func=GetResults&' 'https://syn.5min.com/handlers/SenseHandler.ashx?' + query,
'playlist=%s&url=https' % video_id,
video_id)['binding'][0] video_id)['binding'][0]
second_id = compat_str(int(video_id[:-2]) + 1) second_id = compat_str(int(video_id[:-2]) + 1)