projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2fe1b5b
)
[CSpan] Fix test cases CSpan_1 and CSpan_2
author
Yen Chi Hsuan
<yan12125@gmail.com>
Mon, 20 Apr 2015 19:30:54 +0000
(
03:30
+0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Mon, 20 Apr 2015 19:30:54 +0000
(
03:30
+0800)
youtube_dl/extractor/cspan.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cspan.py
b/youtube_dl/extractor/cspan.py
index 7377ac7b9a143c0587c5a715e0e89c99f1c5480b..6bebcc65c8f751c07b0557c280c20db51e711303 100644
(file)
--- a/
youtube_dl/extractor/cspan.py
+++ b/
youtube_dl/extractor/cspan.py
@@
-37,11
+37,14
@@
class CSpanIE(InfoExtractor):
}
}, {
'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall',
}
}, {
'url': 'http://www.c-span.org/video/?318608-1/gm-ignition-switch-recall',
+ 'md5': '446562a736c6bf97118e389433ed88d4',
'info_dict': {
'id': '342759',
'info_dict': {
'id': '342759',
+ 'ext': 'mp4',
'title': 'General Motors Ignition Switch Recall',
'title': 'General Motors Ignition Switch Recall',
+ 'duration': 14848,
+ 'description': 'md5:70c7c3b8fa63fa60d42772440596034c'
},
},
- 'playlist_duration_sum': 14855,
}, {
# Video from senate.gov
'url': 'http://www.c-span.org/video/?104517-1/immigration-reforms-needed-protect-skilled-american-workers',
}, {
# Video from senate.gov
'url': 'http://www.c-span.org/video/?104517-1/immigration-reforms-needed-protect-skilled-american-workers',
@@
-97,9
+100,14
@@
class CSpanIE(InfoExtractor):
'duration': int_or_none(f.get('length', {}).get('#text')),
} for partnum, f in enumerate(files)]
'duration': int_or_none(f.get('length', {}).get('#text')),
} for partnum, f in enumerate(files)]
- return {
- '_type': 'playlist',
- 'entries': entries,
- 'title': title,
- 'id': video_id,
- }
+ if len(entries) == 1:
+ entry = dict(entries[0])
+ entry['id'] = video_id
+ return entry
+ else:
+ return {
+ '_type': 'playlist',
+ 'entries': entries,
+ 'title': title,
+ 'id': video_id,
+ }