mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-10-30 22:25:19 +00:00 
			
		
		
		
	[nhl] Modernize
This commit is contained in:
		| @@ -1,3 +1,5 @@ | ||||
| from __future__ import unicode_literals | ||||
|  | ||||
| import re | ||||
| import json | ||||
|  | ||||
| @@ -25,8 +27,8 @@ class NHLBaseInfoExtractor(InfoExtractor): | ||||
|             'path': initial_video_url.replace('.mp4', '_sd.mp4'), | ||||
|         }) | ||||
|         path_url = 'http://video.nhl.com/videocenter/servlets/encryptvideopath?' + data | ||||
|         path_doc = self._download_xml(path_url, video_id, | ||||
|             u'Downloading final video url') | ||||
|         path_doc = self._download_xml( | ||||
|             path_url, video_id, 'Downloading final video url') | ||||
|         video_url = path_doc.find('path').text | ||||
|  | ||||
|         join = compat_urlparse.urljoin | ||||
| @@ -43,17 +45,18 @@ class NHLBaseInfoExtractor(InfoExtractor): | ||||
|  | ||||
|  | ||||
| class NHLIE(NHLBaseInfoExtractor): | ||||
|     IE_NAME = u'nhl.com' | ||||
|     IE_NAME = 'nhl.com' | ||||
|     _VALID_URL = r'https?://video(?P<team>\.[^.]*)?\.nhl\.com/videocenter/console\?.*?(?<=[?&])id=(?P<id>\d+)' | ||||
|  | ||||
|     _TEST = { | ||||
|         u'url': u'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614', | ||||
|         u'file': u'453614.mp4', | ||||
|         u'info_dict': { | ||||
|             u'title': u'Quick clip: Weise 4-3 goal vs Flames', | ||||
|             u'description': u'Dale Weise scores his first of the season to put the Canucks up 4-3.', | ||||
|             u'duration': 18, | ||||
|             u'upload_date': u'20131006', | ||||
|         'url': 'http://video.canucks.nhl.com/videocenter/console?catid=6?id=453614', | ||||
|         'info_dict': { | ||||
|             'id': '453614', | ||||
|             'ext': 'mp4', | ||||
|             'title': 'Quick clip: Weise 4-3 goal vs Flames', | ||||
|             'description': 'Dale Weise scores his first of the season to put the Canucks up 4-3.', | ||||
|             'duration': 18, | ||||
|             'upload_date': '20131006', | ||||
|         }, | ||||
|     } | ||||
|  | ||||
| @@ -61,23 +64,23 @@ class NHLIE(NHLBaseInfoExtractor): | ||||
|         mobj = re.match(self._VALID_URL, url) | ||||
|         video_id = mobj.group('id') | ||||
|         json_url = 'http://video.nhl.com/videocenter/servlets/playlist?ids=%s&format=json' % video_id | ||||
|         info_json = self._download_webpage(json_url, video_id, | ||||
|             u'Downloading info json') | ||||
|         info_json = self._fix_json(info_json) | ||||
|         info = json.loads(info_json)[0] | ||||
|         return self._extract_video(info) | ||||
|         data = self._download_json( | ||||
|             json_url, video_id, transform_source=self._fix_json) | ||||
|         return self._extract_video(data[0]) | ||||
|  | ||||
|  | ||||
| class NHLVideocenterIE(NHLBaseInfoExtractor): | ||||
|     IE_NAME = u'nhl.com:videocenter' | ||||
|     IE_DESC = u'NHL videocenter category' | ||||
|     IE_NAME = 'nhl.com:videocenter' | ||||
|     IE_DESC = 'NHL videocenter category' | ||||
|     _VALID_URL = r'https?://video\.(?P<team>[^.]*)\.nhl\.com/videocenter/(console\?.*?catid=(?P<catid>[^&]+))?' | ||||
|  | ||||
|     @classmethod | ||||
|     def suitable(cls, url): | ||||
|         if NHLIE.suitable(url): | ||||
|             return False | ||||
|         return super(NHLVideocenterIE, cls).suitable(url) | ||||
|     _TEST = { | ||||
|         'url': 'http://video.canucks.nhl.com/videocenter/console?catid=999', | ||||
|         'info_dict': { | ||||
|             'id': '999', | ||||
|             'title': 'Highlights', | ||||
|         }, | ||||
|         'playlist_count': 12, | ||||
|     } | ||||
|  | ||||
|     def _real_extract(self, url): | ||||
|         mobj = re.match(self._VALID_URL, url) | ||||
| @@ -86,10 +89,10 @@ class NHLVideocenterIE(NHLBaseInfoExtractor): | ||||
|         cat_id = self._search_regex( | ||||
|             [r'var defaultCatId = "(.+?)";', | ||||
|              r'{statusIndex:0,index:0,.*?id:(.*?),'], | ||||
|             webpage, u'category id') | ||||
|             webpage, 'category id') | ||||
|         playlist_title = self._html_search_regex( | ||||
|             r'tab0"[^>]*?>(.*?)</td>', | ||||
|             webpage, u'playlist title', flags=re.DOTALL).lower().capitalize() | ||||
|             webpage, 'playlist title', flags=re.DOTALL).lower().capitalize() | ||||
|  | ||||
|         data = compat_urllib_parse.urlencode({ | ||||
|             'cid': cat_id, | ||||
| @@ -104,7 +107,7 @@ class NHLVideocenterIE(NHLBaseInfoExtractor): | ||||
|         response = self._fix_json(response) | ||||
|         if not response.strip(): | ||||
|             self._downloader.report_warning(u'Got an empty reponse, trying ' | ||||
|                                             u'adding the "newvideos" parameter') | ||||
|                                             'adding the "newvideos" parameter') | ||||
|             response = self._download_webpage(request_url + '&newvideos=true', | ||||
|                 playlist_title) | ||||
|             response = self._fix_json(response) | ||||
| @@ -114,5 +117,5 @@ class NHLVideocenterIE(NHLBaseInfoExtractor): | ||||
|             '_type': 'playlist', | ||||
|             'title': playlist_title, | ||||
|             'id': cat_id, | ||||
|             'entries': [self._extract_video(i) for i in videos], | ||||
|             'entries': [self._extract_video(v) for v in videos], | ||||
|         } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Philipp Hagemeister
					Philipp Hagemeister