[servingsys] Modernize

This commit is contained in:
Philipp Hagemeister 2015-02-01 15:18:52 +01:00
parent 437cac8cc1
commit e332772531

View file

@ -1,7 +1,5 @@
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,
@ -13,10 +11,15 @@ class ServingSysIE(InfoExtractor):
_TEST = { _TEST = {
'url': 'http://bs.serving-sys.com/BurstingPipe/adServer.bs?cn=is&c=23&pl=VAST&pli=5349193&PluID=0&pos=7135&ord=[timestamp]&cim=1?', 'url': 'http://bs.serving-sys.com/BurstingPipe/adServer.bs?cn=is&c=23&pl=VAST&pli=5349193&PluID=0&pos=7135&ord=[timestamp]&cim=1?',
'info_dict': {
'id': '5349193',
'title': 'AdAPPter_Hyundai_demo',
},
'playlist': [{ 'playlist': [{
'file': '29955898.flv',
'md5': 'baed851342df6846eb8677a60a011a0f', 'md5': 'baed851342df6846eb8677a60a011a0f',
'info_dict': { 'info_dict': {
'id': '29955898',
'ext': 'flv',
'title': 'AdAPPter_Hyundai_demo (1)', 'title': 'AdAPPter_Hyundai_demo (1)',
'duration': 74, 'duration': 74,
'tbr': 1378, 'tbr': 1378,
@ -24,9 +27,10 @@ class ServingSysIE(InfoExtractor):
'height': 400, 'height': 400,
}, },
}, { }, {
'file': '29907998.flv',
'md5': '979b4da2655c4bc2d81aeb915a8c5014', 'md5': '979b4da2655c4bc2d81aeb915a8c5014',
'info_dict': { 'info_dict': {
'id': '29907998',
'ext': 'flv',
'title': 'AdAPPter_Hyundai_demo (2)', 'title': 'AdAPPter_Hyundai_demo (2)',
'duration': 34, 'duration': 34,
'width': 854, 'width': 854,
@ -37,14 +41,13 @@ class ServingSysIE(InfoExtractor):
'params': { 'params': {
'playlistend': 2, 'playlistend': 2,
}, },
'skip': 'Blocked in the US [sic]', '_skip': 'Blocked in the US [sic]',
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) pl_id = self._match_id(url)
pl_id = mobj.group('id')
vast_doc = self._download_xml(url, pl_id) vast_doc = self._download_xml(url, pl_id)
title = vast_doc.find('.//AdTitle').text title = vast_doc.find('.//AdTitle').text
media = vast_doc.find('.//MediaFile').text media = vast_doc.find('.//MediaFile').text
info_url = self._search_regex(r'&adData=([^&]+)&', media, 'info URL') info_url = self._search_regex(r'&adData=([^&]+)&', media, 'info URL')