Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2024-12-22 01:12:59 +08:00
Code Issues Releases Wiki Activity

UstreamIE: get thumbnail and uploader name

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-05-18 11:54:18 +02:00
parent 7bdb17d4d5
commit 340fa21198
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/tests.json
View File

@ -152,7 +152,8 @@
"file": "20274954.flv", "file": "20274954.flv",
"md5": "088f151799e8f572f84eb62f17d73e5c", "md5": "088f151799e8f572f84eb62f17d73e5c",
"info_dict": { "info_dict": {
"title": "Young Americans for Liberty February 7, 2012 2:28 AM" "title": "Young Americans for Liberty February 7, 2012 2:28 AM",
"uploader": "Young Americans for Liberty"
} }
}, },
{ {

20
youtube_dl/InfoExtractors.py
View File

@ -3301,18 +3301,26 @@ class UstreamIE(InfoExtractor):
video_id = m.group('videoID') video_id = m.group('videoID')
video_url = u'http://tcdn.ustream.tv/video/%s' % video_id video_url = u'http://tcdn.ustream.tv/video/%s' % video_id
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
m = re.search(r'data-title="(?P<title>.+)"',webpage) self.report_extraction(video_id)
title = m.group('title') try:
m = re.search(r'<a class="state" data-content-type="channel" data-content-id="(?P<uploader>\d+)"',webpage) m = re.search(r'data-title="(?P<title>.+)"',webpage)
uploader = m.group('uploader') title = m.group('title')
m = re.search(r'data-content-type="channel".*?>(?P<uploader>.*?)</a>',
webpage, re.DOTALL)
uploader = unescapeHTML(m.group('uploader').strip())
m = re.search(r'<link rel="image_src" href="(?P<thumb>.*?)"', webpage)
thumb = m.group('thumb')
except AttributeError:
raise ExtractorError(u'Unable to extract info')
info = { info = {
'id':video_id, 'id':video_id,
'url':video_url, 'url':video_url,
'ext': 'flv', 'ext': 'flv',
'title': title, 'title': title,
'uploader': uploader 'uploader': uploader,
'thumbnail': thumb,
} }
return [info] return info
class WorldStarHipHopIE(InfoExtractor): class WorldStarHipHopIE(InfoExtractor):
_VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)' _VALID_URL = r'https?://(?:www|m)\.worldstar(?:candy|hiphop)\.com/videos/video\.php\?v=(?P<id>.*)'