projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ChangeLog] Actualize
[youtube-dl]
/
youtube_dl
/
extractor
/
abcnews.py
diff --git
a/youtube_dl/extractor/abcnews.py
b/youtube_dl/extractor/abcnews.py
index 74d54560ce338aed6c4d6b096f34e4494634ac0a..f770fe901369e85d3df881cf651313f540544b03 100644
(file)
--- a/
youtube_dl/extractor/abcnews.py
+++ b/
youtube_dl/extractor/abcnews.py
@@
-7,6
+7,7
@@
import time
from .amp import AMPIE
from .common import InfoExtractor
from .amp import AMPIE
from .common import InfoExtractor
+from .youtube import YoutubeIE
from ..compat import compat_urlparse
from ..compat import compat_urlparse
@@
-108,9
+109,7
@@
class AbcNewsIE(InfoExtractor):
r'window\.abcnvideo\.url\s*=\s*"([^"]+)"', webpage, 'video URL')
full_video_url = compat_urlparse.urljoin(url, video_url)
r'window\.abcnvideo\.url\s*=\s*"([^"]+)"', webpage, 'video URL')
full_video_url = compat_urlparse.urljoin(url, video_url)
- youtube_url = self._html_search_regex(
- r'<iframe[^>]+src="(https://www\.youtube\.com/embed/[^"]+)"',
- webpage, 'YouTube URL', default=None)
+ youtube_url = YoutubeIE._extract_url(webpage)
timestamp = None
date_str = self._html_search_regex(
timestamp = None
date_str = self._html_search_regex(
@@
-140,7
+139,7
@@
class AbcNewsIE(InfoExtractor):
}
if youtube_url:
}
if youtube_url:
- entries = [entry, self.url_result(youtube_url,
'Youtube'
)]
+ entries = [entry, self.url_result(youtube_url,
ie=YoutubeIE.ie_key()
)]
return self.playlist_result(entries)
return entry
return self.playlist_result(entries)
return entry