Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[extractor/generic] Add support for xspf playlists

This commit is contained in:
Sergey M․ 2015-08-09 19:43:42 +06:00
parent 942acef594
commit 729accb482
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/extractor/generic.py
View File

@ -1198,6 +1198,8 @@ class GenericIE(InfoExtractor):
return self._extract_rss(url, video_id, doc) return self._extract_rss(url, video_id, doc)
elif re.match(r'^(?:{[^}]+})?smil$', doc.tag): elif re.match(r'^(?:{[^}]+})?smil$', doc.tag):
return self._parse_smil(doc, url, video_id) return self._parse_smil(doc, url, video_id)
elif doc.tag == '{http://xspf.org/ns/0/}playlist':
return self.playlist_result(self._parse_xspf(doc, video_id), video_id)
except compat_xml_parse_error: except compat_xml_parse_error:
pass pass
@ -1799,7 +1801,8 @@ class GenericIE(InfoExtractor):
# here's a fun little line of code for you: # here's a fun little line of code for you:
video_id = os.path.splitext(video_id)[0] video_id = os.path.splitext(video_id)[0]
if determine_ext(video_url) == 'smil': ext = determine_ext(video_url)
if ext == 'smil':
entries.append({ entries.append({
'id': video_id, 'id': video_id,
'formats': self._extract_smil_formats(video_url, video_id), 'formats': self._extract_smil_formats(video_url, video_id),
@ -1807,6 +1810,8 @@ class GenericIE(InfoExtractor):
'title': video_title, 'title': video_title,
'age_limit': age_limit, 'age_limit': age_limit,
}) })
elif ext == 'xspf':
return self.playlist_result(self._extract_xspf_playlist(video_url, video_id), video_id)
else: else:
entries.append({ entries.append({
'id': video_id, 'id': video_id,