X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fabcnews.py;h=f770fe901369e85d3df881cf651313f540544b03;hb=685e87b61f785b096745cda5ea64ea0b950f56d1;hp=e18be2497f4d934b67bf8dcbedf7787762adb8bf;hpb=bc22df29c49523e41abb84eb09232784b2e07d34;p=youtube-dl

diff --git a/youtube_dl/extractor/abcnews.py b/youtube_dl/extractor/abcnews.py
index e18be2497..f770fe901 100644
--- a/youtube_dl/extractor/abcnews.py
+++ b/youtube_dl/extractor/abcnews.py
@@ -7,16 +7,21 @@ import time
 
 from .amp import AMPIE
 from .common import InfoExtractor
+from .youtube import YoutubeIE
 from ..compat import compat_urlparse
 
 
 class AbcNewsVideoIE(AMPIE):
     IE_NAME = 'abcnews:video'
     _VALID_URL = r'''(?x)
-        https?://abcnews\.go\.com/
-            (?:[^/]+/video/(?P<display_id>[0-9a-z-]+)-|
-               video/embed\?id=)
-       (?P<id>\d+)'''
+                    https?://
+                        abcnews\.go\.com/
+                        (?:
+                            [^/]+/video/(?P<display_id>[0-9a-z-]+)-|
+                            video/embed\?.*?\bid=
+                        )
+                        (?P<id>\d+)
+                    '''
 
     _TESTS = [{
         'url': 'http://abcnews.go.com/ThisWeek/video/week-exclusive-irans-foreign-minister-zarif-20411932',
@@ -35,15 +40,7 @@ class AbcNewsVideoIE(AMPIE):
         },
     }, {
         'url': 'http://abcnews.go.com/video/embed?id=46979033',
-        'md5': 'd19d160cfa8372fc197f406d4821dd9f',
-        'info_dict': {
-            'id': '46979033',
-            'ext': 'flv',
-            'title': 'Nikki Haley reacts to French election results',
-            'description': 'md5:df1b5ad1b8ad76c4d4e01d3c67d6b38e',
-            'duration': 274,
-            'thumbnail': r're:^https?://.*\.jpg$',
-        },
+        'only_matching': True,
     }, {
         'url': 'http://abcnews.go.com/2020/video/2020-husband-stands-teacher-jail-student-affairs-26119478',
         'only_matching': True,
@@ -112,9 +109,7 @@ class AbcNewsIE(InfoExtractor):
             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(
@@ -144,7 +139,7 @@ class AbcNewsIE(InfoExtractor):
         }
 
         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