From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 6 Feb 2017 16:31:58 +0000 (+0700)
Subject: [extractor/generic] Add test for #11993 and more metadata for rtmp
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=5620f840f68ffb688131aaa3a40462110f9da468;p=youtube-dl.git

[extractor/generic] Add test for #11993 and more metadata for rtmp
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 1fb0e0673..1c233f038 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -948,6 +948,19 @@ class GenericIE(InfoExtractor):
                 'title': 'Webinar: Using Discovery, The National Archives’ online catalogue',
             },
         },
+        # jwplayer rtmp
+        {
+            'url': 'http://www.suffolk.edu/sjc/',
+            'info_dict': {
+                'id': 'sjclive',
+                'ext': 'flv',
+                'title': 'Massachusetts Supreme Judicial Court Oral Arguments',
+                'uploader': 'www.suffolk.edu',
+            },
+            'params': {
+                'skip_download': True,
+            }
+        },
         # rtl.nl embed
         {
             'url': 'http://www.rtlnieuws.nl/nieuws/buitenland/aanslagen-kopenhagen',
@@ -2587,10 +2600,6 @@ class GenericIE(InfoExtractor):
                 entries.append(self.url_result(video_url, 'Youtube'))
                 continue
 
-            if RtmpIE.suitable(video_url):
-                entries.append(self.url_result(video_url, RtmpIE.ie_key()))
-                continue
-
             # here's a fun little line of code for you:
             video_id = os.path.splitext(video_id)[0]
 
@@ -2601,6 +2610,15 @@ class GenericIE(InfoExtractor):
                 'age_limit': age_limit,
             }
 
+            if RtmpIE.suitable(video_url):
+                entry_info_dict.update({
+                    '_type': 'url_transparent',
+                    'ie_key': RtmpIE.ie_key(),
+                    'url': video_url,
+                })
+                entries.append(entry_info_dict)
+                continue
+
             ext = determine_ext(video_url)
             if ext == 'smil':
                 entry_info_dict['formats'] = self._extract_smil_formats(video_url, video_id)