Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-23 00:54:31 +01:00
Code Issues Releases Wiki Activity

Fixed issues #24503 #10687 and checked style with flake8

Browse Source
This commit is contained in:
Wang 2020-04-21 09:26:38 +08:00
parent b466ffb547
commit 5949ac43a8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
youtube_dl/extractor/abc.py
View File

@ -17,6 +17,7 @@ from ..utils import (
update_url_query, update_url_query,
) )
class ABCIE(InfoExtractor): class ABCIE(InfoExtractor):
IE_NAME = 'abc.net.au' IE_NAME = 'abc.net.au'
_VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)' _VALID_URL = r'https?://(?:www\.)?abc\.net\.au/news/(?:[^/]+/){1,2}(?P<id>\d+)'
@ -73,13 +74,12 @@ class ABCIE(InfoExtractor):
youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None) youtube_link = self._html_search_regex(r'(?s)a href="http://www.youtube.com/(.+?)"', webpage, 'youtube_link', None)
if youtube_link: if youtube_link:
youtube_link = "http://www.youtube.com/"+youtube_link youtube_link = "http://www.youtube.com/" + youtube_link
return self.url_result(youtube_link) return self.url_result(youtube_link)
if mobj is None: if mobj is None:
expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?<span>(.+?)</span>', webpage, 'expired', None) expired = self._html_search_regex(r'(?s)class="expired-(?:video|audio)".+?<span>(.+?)</span>', webpage, 'expired', None)
if expired: if expired:
raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True) raise ExtractorError('%s said: %s' % (self.IE_NAME, expired), expected=True)
raise ExtractorError('Unable to extract video urls') raise ExtractorError('Unable to extract video urls')
@ -90,7 +90,6 @@ class ABCIE(InfoExtractor):
if not isinstance(urls_info, list): if not isinstance(urls_info, list):
urls_info = [urls_info] urls_info = [urls_info]
if mobj.group('type') == 'YouTube': if mobj.group('type') == 'YouTube':
return self.playlist_result([ return self.playlist_result([
self.url_result(url_info['url']) for url_info in urls_info]) self.url_result(url_info['url']) for url_info in urls_info])

6
youtube_dl/extractor/espn.py
View File

@ -98,13 +98,13 @@ class ESPNIE(OnceIE):
}, { }, {
'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings', 'url': 'http://www.espn.com/espnw/video/26066627/arkansas-gibson-completes-hr-cycle-four-innings',
'only_matching': True, 'only_matching': True,
},{ }, {
'url': 'https://www.espn.co.uk/video/clip/_/id/25103188', 'url': 'https://www.espn.co.uk/video/clip/_/id/25103188',
'only_matching': True, 'only_matching': True,
},{ }, {
'url': 'https://www.espn.co.uk/video/clip/_/id/29069602', 'url': 'https://www.espn.co.uk/video/clip/_/id/29069602',
'only_matching': True, 'only_matching': True,
},{ }, {
'url': 'https://www.espn.co.uk/video/clip/_/id/19367162', 'url': 'https://www.espn.co.uk/video/clip/_/id/19367162',
'only_matching': True, 'only_matching': True,
}] }]