lunax/haruhi-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[screenwavemedia] fix info extraction (fixes #6270)

Browse source 
Closes #6330.
This commit is contained in:
remitamine 2015-07-22 12:34:42 +01:00 committed by Jaime Marquínez Ferrándiz
parent 55eae65b39
commit fa7a1cc5ef
1 changed files with 36 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
youtube_dl/extractor/screenwavemedia.py
View file

@ -1,12 +1,11 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
int_or_none, int_or_none,
unified_strdate, unified_strdate,
js_to_json,
) )
@ -22,59 +21,48 @@ class ScreenwaveMediaIE(InfoExtractor):
video_id = self._match_id(url) video_id = self._match_id(url)
playerdata = self._download_webpage( playerdata = self._download_webpage(
'http://player.screenwavemedia.com/play/player.php?id=%s' % video_id, 'http://player.screenwavemedia.com/player.php?id=%s' % video_id,
video_id, 'Downloading player webpage') video_id, 'Downloading player webpage')
vidtitle = self._search_regex( vidtitle = self._search_regex(
r'\'vidtitle\'\s*:\s*"([^"]+)"', playerdata, 'vidtitle').replace('\\/', '/') r'\'vidtitle\'\s*:\s*"([^"]+)"', playerdata, 'vidtitle').replace('\\/', '/')
vidurl = self._search_regex(
r'\'vidurl\'\s*:\s*"([^"]+)"', playerdata, 'vidurl').replace('\\/', '/')
videolist_url = None playerconfig = self._download_webpage(
'http://player.screenwavemedia.com/player.js',
video_id, 'Downloading playerconfig webpage')
mobj = re.search(r"'videoserver'\s*:\s*'(?P<videoserver>[^']+)'", playerdata) videoserver = self._search_regex(r"'videoserver'\s*:\s*'([^']+)", playerconfig, 'videoserver')
if mobj:
videoserver = mobj.group('videoserver') sources = self._parse_json(
mobj = re.search(r'\'vidid\'\s*:\s*"(?P<vidid>[^\']+)"', playerdata) js_to_json(
vidid = mobj.group('vidid') if mobj else video_id self._search_regex(
videolist_url = 'http://%s/vod/smil:%s.smil/jwplayer.smil' % (videoserver, vidid) r"sources\s*:\s*(\[[^\]]+?\])", playerconfig,
else: 'sources',
mobj = re.search(r"file\s*:\s*'(?P<smil>http.+?/jwplayer\.smil)'", playerdata) ).replace(
if mobj: "' + thisObj.options.videoserver + '",
videolist_url = mobj.group('smil') videoserver
).replace(
"' + playerVidId + '",
video_id
)
),
video_id
)
if videolist_url:
videolist = self._download_xml(videolist_url, video_id, 'Downloading videolist XML')
formats = [] formats = []
baseurl = vidurl[:vidurl.rfind('/') + 1] for source in sources:
for video in videolist.findall('.//video'): if source['type'] == 'hls':
src = video.get('src') formats.extend(self._extract_m3u8_formats(source['file'], video_id))
if not src: else:
continue format_label = source.get('label')
file_ = src.partition(':')[-1] height = int_or_none(self._search_regex(
width = int_or_none(video.get('width')) r'^(\d+)[pP]', format_label, 'height', default=None))
height = int_or_none(video.get('height')) formats.append({
bitrate = int_or_none(video.get('system-bitrate'), scale=1000) 'url': source['file'],
format = { 'format': format_label,
'url': baseurl + file_, 'ext': source.get('type'),
'format_id': src.rpartition('.')[0].rpartition('_')[-1],
}
if width or height:
format.update({
'tbr': bitrate,
'width': width,
'height': height, 'height': height,
}) })
else:
format.update({
'abr': bitrate,
'vcodec': 'none',
})
formats.append(format)
else:
formats = [{
'url': vidurl,
}]
self._sort_formats(formats) self._sort_formats(formats)
return { return {