joshua
/
youtube-dl
mirror of https://gitlab.com/dstftw/youtube-dl
1
1
Fork 1
Code Issues 4 Projects Releases Wiki Activity

[screenwavemedia] fix info extraction (fixes #6270) 

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

84
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')
mobj = re.search(r'\'vidid\'\s*:\s*"(?P<vidid>[^\']+)"', playerdata)
vidid = mobj.group('vidid') if mobj else video_id
videolist_url = 'http://%s/vod/smil:%s.smil/jwplayer.smil' % (videoserver, vidid)
else:
mobj = re.search(r"file\s*:\s*'(?P<smil>http.+?/jwplayer\.smil)'", playerdata)
if mobj:
videolist_url = mobj.group('smil')
if videolist_url: sources = self._parse_json(
videolist = self._download_xml(videolist_url, video_id, 'Downloading videolist XML') js_to_json(
formats = [] self._search_regex(
baseurl = vidurl[:vidurl.rfind('/') + 1] r"sources\s*:\s*(\[[^\]]+?\])", playerconfig,
for video in videolist.findall('.//video'): 'sources',
src = video.get('src') ).replace(
if not src: "' + thisObj.options.videoserver + '",
continue videoserver
file_ = src.partition(':')[-1] ).replace(
width = int_or_none(video.get('width')) "' + playerVidId + '",
height = int_or_none(video.get('height')) video_id
bitrate = int_or_none(video.get('system-bitrate'), scale=1000) )
format = { ),
'url': baseurl + file_, video_id
'format_id': src.rpartition('.')[0].rpartition('_')[-1], )
}
if width or height: formats = []
format.update({ for source in sources:
'tbr': bitrate, if source['type'] == 'hls':
'width': width, formats.extend(self._extract_m3u8_formats(source['file'], video_id))
'height': height, else:
}) format_label = source.get('label')
else: height = int_or_none(self._search_regex(
format.update({ r'^(\d+)[pP]', format_label, 'height', default=None))
'abr': bitrate, formats.append({
'vcodec': 'none', 'url': source['file'],
}) 'format': format_label,
formats.append(format) 'ext': source.get('type'),
else: 'height': height,
formats = [{ })
'url': vidurl,
}]
self._sort_formats(formats) self._sort_formats(formats)
return { return {