[steam] Simplify

This commit is contained in:
Philipp Hagemeister 2014-04-19 19:55:53 +02:00
parent 3fa6b6e293
commit 7f9c31df88

View file

@ -10,7 +10,7 @@
class SteamIE(InfoExtractor): class SteamIE(InfoExtractor):
_VALID_URL = r"""http://store\.steampowered\.com/ _VALID_URL = r"""(?x)http://store\.steampowered\.com/
(agecheck/)? (agecheck/)?
(?P<urltype>video|app)/ #If the page is only for videos or for a game (?P<urltype>video|app)/ #If the page is only for videos or for a game
(?P<gameID>\d+)/? (?P<gameID>\d+)/?
@ -39,15 +39,12 @@ class SteamIE(InfoExtractor):
'playlist_index': 2, 'playlist_index': 2,
} }
} }
] ],
'params': {
'playlistend': 2,
}
} }
@classmethod
def suitable(cls, url):
"""Receives a URL and returns True if suitable for this IE."""
return re.match(cls._VALID_URL, url, re.VERBOSE) is not None
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)
gameID = m.group('gameID') gameID = m.group('gameID')
@ -64,26 +61,26 @@ def _real_extract(self, url):
game_title = self._html_search_regex(r'<h2 class="pageheader">(.*?)</h2>', game_title = self._html_search_regex(r'<h2 class="pageheader">(.*?)</h2>',
webpage, 'game title') webpage, 'game title')
urlRE = r"'movie_(?P<videoID>\d+)': \{\s*FILENAME: \"(?P<videoURL>[\w:/\.\?=]+)\"(,\s*MOVIE_NAME: \"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\}," mweb = re.finditer(
mweb = re.finditer(urlRE, webpage) r"'movie_(?P<videoID>\d+)': \{\s*FILENAME: \"(?P<videoURL>[\w:/\.\?=]+)\"(,\s*MOVIE_NAME: \"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\},",
namesRE = r'<span class="title">(?P<videoName>.+?)</span>' webpage)
titles = re.finditer(namesRE, webpage) titles = re.finditer(
thumbsRE = r'<img class="movie_thumb" src="(?P<thumbnail>.+?)">' r'<span class="title">(?P<videoName>.+?)</span>', webpage)
thumbs = re.finditer(thumbsRE, webpage) thumbs = re.finditer(
r'<img class="movie_thumb" src="(?P<thumbnail>.+?)">', webpage)
videos = [] videos = []
for vid,vtitle,thumb in zip(mweb,titles,thumbs): for vid, vtitle, thumb in zip(mweb, titles, thumbs):
video_id = vid.group('videoID') video_id = vid.group('videoID')
title = vtitle.group('videoName') title = vtitle.group('videoName')
video_url = vid.group('videoURL') video_url = vid.group('videoURL')
video_thumb = thumb.group('thumbnail') video_thumb = thumb.group('thumbnail')
if not video_url: if not video_url:
raise ExtractorError('Cannot find video url for %s' % video_id) raise ExtractorError('Cannot find video url for %s' % video_id)
info = { videos.append({
'id':video_id, 'id': video_id,
'url':video_url, 'url': video_url,
'ext': 'flv', 'ext': 'flv',
'title': unescapeHTML(title), 'title': unescapeHTML(title),
'thumbnail': video_thumb 'thumbnail': video_thumb
} })
videos.append(info)
return self.playlist_result(videos, gameID, game_title) return self.playlist_result(videos, gameID, game_title)