projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b7a8c1b
)
[extractor/generic] Add test for #11993 and more metadata for rtmp
author
Sergey M․
<dstftw@gmail.com>
Mon, 6 Feb 2017 16:31:58 +0000
(23:31 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 6 Feb 2017 16:31:58 +0000
(23:31 +0700)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 1fb0e0673753e8a061f1451fe6ae234f0c31433d..1c233f038143bbdcda4630dc31c02faa0428bd6c 100644
(file)
--- 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',
},
},
'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',
# 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
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]
# 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,
}
'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)
ext = determine_ext(video_url)
if ext == 'smil':
entry_info_dict['formats'] = self._extract_smil_formats(video_url, video_id)