X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcctv.py;h=c76f361c684e96e992f5fea9f9ffbcd5a114a6ad;hb=HEAD;hp=c3d163cdedcdc2c32cff456a95d6050ca18a308d;hpb=ce7ccb1caa1c6122329779adfe5993dfd47c4021;p=youtube-dl

diff --git a/youtube_dl/extractor/cctv.py b/youtube_dl/extractor/cctv.py
index c3d163cde..c76f361c6 100644
--- a/youtube_dl/extractor/cctv.py
+++ b/youtube_dl/extractor/cctv.py
@@ -14,8 +14,9 @@ from ..utils import (
 
 class CCTVIE(InfoExtractor):
     IE_DESC = '央视网'
-    _VALID_URL = r'https?://(?:[^/]+)\.(?:cntv|cctv)\.(?:com|cn)/(?:[^/]+/)*?(?P<id>[^/?#&]+?)(?:/index)?\.s?html'
+    _VALID_URL = r'https?://(?:(?:[^/]+)\.(?:cntv|cctv)\.(?:com|cn)|(?:www\.)?ncpa-classic\.com)/(?:[^/]+/)*?(?P<id>[^/?#&]+?)(?:/index)?(?:\.s?html|[?#&]|$)'
     _TESTS = [{
+        # fo.addVariable("videoCenterId","id")
         'url': 'http://sports.cntv.cn/2016/02/12/ARTIaBRxv4rTT1yWf1frW2wi160212.shtml',
         'md5': 'd61ec00a493e09da810bf406a078f691',
         'info_dict': {
@@ -29,6 +30,7 @@ class CCTVIE(InfoExtractor):
             'upload_date': '20160212',
         },
     }, {
+        # var guid = "id"
         'url': 'http://tv.cctv.com/2016/02/05/VIDEUS7apq3lKrHG9Dncm03B160205.shtml',
         'info_dict': {
             'id': 'efc5d49e5b3b4ab2b34f3a502b73d3ae',
@@ -44,6 +46,7 @@ class CCTVIE(InfoExtractor):
             'skip_download': True,
         },
     }, {
+        # changePlayer('id')
         'url': 'http://english.cntv.cn/special/four_comprehensives/index.shtml',
         'info_dict': {
             'id': '4bb9bb4db7a6471ba85fdeda5af0381e',
@@ -59,6 +62,7 @@ class CCTVIE(InfoExtractor):
             'skip_download': True,
         },
     }, {
+        # loadvideo('id')
         'url': 'http://cctv.cntv.cn/lm/tvseries_russian/yilugesanghua/index.shtml',
         'info_dict': {
             'id': 'b15f009ff45c43968b9af583fc2e04b2',
@@ -73,6 +77,37 @@ class CCTVIE(InfoExtractor):
         'params': {
             'skip_download': True,
         },
+    }, {
+        # var initMyAray = 'id'
+        'url': 'http://www.ncpa-classic.com/2013/05/22/VIDE1369219508996867.shtml',
+        'info_dict': {
+            'id': 'a194cfa7f18c426b823d876668325946',
+            'ext': 'mp4',
+            'title': '小泽征尔音乐塾 音乐梦想无国界',
+            'duration': 2173,
+            'timestamp': 1369248264,
+            'upload_date': '20130522',
+        },
+        'params': {
+            'skip_download': True,
+        },
+    }, {
+        # var ids = ["id"]
+        'url': 'http://www.ncpa-classic.com/clt/more/416/index.shtml',
+        'info_dict': {
+            'id': 'a8606119a4884588a79d81c02abecc16',
+            'ext': 'mp3',
+            'title': '来自维也纳的新年贺礼',
+            'description': 'md5:f13764ae8dd484e84dd4b39d5bcba2a7',
+            'duration': 1578,
+            'uploader': 'djy',
+            'timestamp': 1482942419,
+            'upload_date': '20161228',
+        },
+        'params': {
+            'skip_download': True,
+        },
+        'expected_warnings': ['Failed to download m3u8 information'],
     }, {
         'url': 'http://ent.cntv.cn/2016/01/18/ARTIjprSSJH8DryTVr5Bx8Wb160118.shtml',
         'only_matching': True,
@@ -87,7 +122,7 @@ class CCTVIE(InfoExtractor):
         'only_matching': True,
     }, {
         'url': 'http://tv.cntv.cn/video/C39296/95cfac44cabd3ddc4a9438780a4e5c44',
-        'only_matching': True
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -97,9 +132,11 @@ class CCTVIE(InfoExtractor):
         video_id = self._search_regex(
             [r'var\s+guid\s*=\s*["\']([\da-fA-F]+)',
              r'videoCenterId["\']\s*,\s*["\']([\da-fA-F]+)',
-             r'"changePlayer\s*\(\s*["\']([\da-fA-F]+)',
-             r'"load[Vv]ideo\s*\(\s*["\']([\da-fA-F]+)'],
-            webpage, 'video id', default=video_id)
+             r'changePlayer\s*\(\s*["\']([\da-fA-F]+)',
+             r'load[Vv]ideo\s*\(\s*["\']([\da-fA-F]+)',
+             r'var\s+initMyAray\s*=\s*["\']([\da-fA-F]+)',
+             r'var\s+ids\s*=\s*\[["\']([\da-fA-F]+)'],
+            webpage, 'video id')
 
         data = self._download_json(
             'http://vdn.apps.cntv.cn/api/getHttpVideoInfo.do', video_id,
@@ -138,7 +175,8 @@ class CCTVIE(InfoExtractor):
         self._sort_formats(formats)
 
         uploader = data.get('editer_name')
-        description = self._html_search_meta('description', webpage)
+        description = self._html_search_meta(
+            'description', webpage, default=None)
         timestamp = unified_timestamp(data.get('f_pgmtime'))
         duration = float_or_none(try_get(video, lambda x: x['totalLength']))