Update upstream source from tag 'upstream/2019.06.08'

[youtubedl] / youtube_dl / extractor / servingsys.py

diff --git a/youtube_dl/extractor/servingsys.py b/youtube_dl/extractor/servingsys.py
index 1dc551d5c7f274b717369952824050812c21fee3..c013d678f70f36f8589007cf1b6cc14d036cde21 100644 (file)
--- a/youtube_dl/extractor/servingsys.py
+++ b/youtube_dl/extractor/servingsys.py
@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import re
-

 from .common import InfoExtractor
 from ..utils import (
     int_or_none,
 from .common import InfoExtractor
 from ..utils import (
     int_or_none,


@@ -13,10 +11,15 @@ class ServingSysIE(InfoExtractor):
 
     _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?',
 
     _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?',

+        'info_dict': {
+            'id': '5349193',
+            'title': 'AdAPPter_Hyundai_demo',
+        },

         'playlist': [{
         'playlist': [{

-            'file': '29955898.flv',

             'md5': 'baed851342df6846eb8677a60a011a0f',
             'info_dict': {
             'md5': 'baed851342df6846eb8677a60a011a0f',
             'info_dict': {

+                'id': '29955898',
+                'ext': 'flv',

                 'title': 'AdAPPter_Hyundai_demo (1)',
                 'duration': 74,
                 'tbr': 1378,
                 'title': 'AdAPPter_Hyundai_demo (1)',
                 'duration': 74,
                 'tbr': 1378,


@@ -24,9 +27,10 @@ class ServingSysIE(InfoExtractor):
                 'height': 400,
             },
         }, {
                 'height': 400,
             },
         }, {

-            'file': '29907998.flv',

             'md5': '979b4da2655c4bc2d81aeb915a8c5014',
             'info_dict': {
             'md5': '979b4da2655c4bc2d81aeb915a8c5014',
             'info_dict': {

+                'id': '29907998',
+                'ext': 'flv',

                 'title': 'AdAPPter_Hyundai_demo (2)',
                 'duration': 34,
                 'width': 854,
                 'title': 'AdAPPter_Hyundai_demo (2)',
                 'duration': 34,
                 'width': 854,


@@ -37,14 +41,13 @@ class ServingSysIE(InfoExtractor):
         'params': {
             'playlistend': 2,
         },
         'params': {
             '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 = mobj.group('id')
-
+        pl_id = self._match_id(url)

         vast_doc = self._download_xml(url, pl_id)
         vast_doc = self._download_xml(url, pl_id)

+

         title = vast_doc.find('.//AdTitle').text
         media = vast_doc.find('.//MediaFile').text
         info_url = self._search_regex(r'&adData=([^&]+)&', media, 'info URL')
         title = vast_doc.find('.//AdTitle').text
         media = vast_doc.find('.//MediaFile').text
         info_url = self._search_regex(r'&adData=([^&]+)&', media, 'info URL')


@@ -67,5 +70,3 @@ class ServingSysIE(InfoExtractor):
             'title': title,
             'entries': entries,
         }
             'title': title,
             'entries': entries,
         }

-
- 
\ No newline at end of file