1
0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-24 17:06:58 +00:00

SteamIE returns a playlist

With the game name as title.
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-04-21 22:05:21 +02:00
parent e11eb11906
commit 9e1cf0c200

View File

@ -3655,11 +3655,13 @@ class SteamIE(InfoExtractor):
def _real_extract(self, url): def _real_extract(self, url):
m = re.match(self._VALID_URL, url, re.VERBOSE) m = re.match(self._VALID_URL, url, re.VERBOSE)
urlRE = r"'movie_(?P<videoID>\d+)': \{\s*FILENAME: \"(?P<videoURL>[\w:/\.\?=]+)\"(,\s*MOVIE_NAME: \"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\},"
gameID = m.group('gameID') gameID = m.group('gameID')
videourl = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970' % gameID videourl = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970' % gameID
self.report_age_confirmation() self.report_age_confirmation()
webpage = self._download_webpage(videourl, gameID) webpage = self._download_webpage(videourl, gameID)
game_title = re.search(r'<h2 class="pageheader">(?P<game_title>.*?)</h2>', webpage).group('game_title')
urlRE = r"'movie_(?P<videoID>\d+)': \{\s*FILENAME: \"(?P<videoURL>[\w:/\.\?=]+)\"(,\s*MOVIE_NAME: \"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\},"
mweb = re.finditer(urlRE, webpage) mweb = re.finditer(urlRE, webpage)
namesRE = r'<span class="title">(?P<videoName>.+?)</span>' namesRE = r'<span class="title">(?P<videoName>.+?)</span>'
titles = re.finditer(namesRE, webpage) titles = re.finditer(namesRE, webpage)
@ -3681,7 +3683,7 @@ class SteamIE(InfoExtractor):
'thumbnail': video_thumb 'thumbnail': video_thumb
} }
videos.append(info) videos.append(info)
return videos return [self.playlist_result(videos, gameID, game_title)]
class UstreamIE(InfoExtractor): class UstreamIE(InfoExtractor):
_VALID_URL = r'https?://www\.ustream\.tv/recorded/(?P<videoID>\d+)' _VALID_URL = r'https?://www\.ustream\.tv/recorded/(?P<videoID>\d+)'