w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[generic] Refactor

Browse source
This commit is contained in:
Yen Chi Hsuan 2015-11-21 16:08:54 +08:00
parent 6cc37c69e2
commit 28602e747c
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
youtube_dl/extractor/generic.py
View file

@ -1886,25 +1886,22 @@ 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]
ext = determine_ext(video_url) entry_info_dict = {
if ext == 'smil':
entries.append({
'id': video_id, 'id': video_id,
'formats': self._extract_smil_formats(video_url, video_id),
'uploader': video_uploader, 'uploader': video_uploader,
'title': video_title, 'title': video_title,
'age_limit': age_limit, 'age_limit': age_limit,
}) }
ext = determine_ext(video_url)
if ext == 'smil':
entry_info_dict['formats'] = self._extract_smil_formats(video_url, video_id)
elif ext == 'xspf': elif ext == 'xspf':
return self.playlist_result(self._extract_xspf_playlist(video_url, video_id), video_id) return self.playlist_result(self._extract_xspf_playlist(video_url, video_id), video_id)
else: else:
entries.append({ entry_info_dict['url'] = video_url
'id': video_id,
'url': video_url, entries.append(entry_info_dict)
'uploader': video_uploader,
'title': video_title,
'age_limit': age_limit,
})
if len(entries) == 1: if len(entries) == 1:
return entries[0] return entries[0]