|
@@ -1886,25 +1886,22 @@ class GenericIE(InfoExtractor):
|
|
|
# here's a fun little line of code for you:
|
|
|
video_id = os.path.splitext(video_id)[0]
|
|
|
|
|
|
+ entry_info_dict = {
|
|
|
+ 'id': video_id,
|
|
|
+ 'uploader': video_uploader,
|
|
|
+ 'title': video_title,
|
|
|
+ 'age_limit': age_limit,
|
|
|
+ }
|
|
|
+
|
|
|
ext = determine_ext(video_url)
|
|
|
if ext == 'smil':
|
|
|
- entries.append({
|
|
|
- 'id': video_id,
|
|
|
- 'formats': self._extract_smil_formats(video_url, video_id),
|
|
|
- 'uploader': video_uploader,
|
|
|
- 'title': video_title,
|
|
|
- 'age_limit': age_limit,
|
|
|
- })
|
|
|
+ entry_info_dict['formats'] = self._extract_smil_formats(video_url, video_id)
|
|
|
elif ext == 'xspf':
|
|
|
return self.playlist_result(self._extract_xspf_playlist(video_url, video_id), video_id)
|
|
|
else:
|
|
|
- entries.append({
|
|
|
- 'id': video_id,
|
|
|
- 'url': video_url,
|
|
|
- 'uploader': video_uploader,
|
|
|
- 'title': video_title,
|
|
|
- 'age_limit': age_limit,
|
|
|
- })
|
|
|
+ entry_info_dict['url'] = video_url
|
|
|
+
|
|
|
+ entries.append(entry_info_dict)
|
|
|
|
|
|
if len(entries) == 1:
|
|
|
return entries[0]
|