R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug #14067 poc fix

Browse Source
This commit is contained in:
John D 2017-09-10 18:54:37 -07:00
parent 51aee72d16
commit c366e06b55
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
youtube_dl/extractor/steam.py
View File

@ -23,42 +23,30 @@ class SteamIE(InfoExtractor):
_AGECHECK_TEMPLATE = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970' _AGECHECK_TEMPLATE = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970'
_TESTS = [{ _TESTS = [{
'url': 'http://store.steampowered.com/video/105600/', 'url': 'http://store.steampowered.com/video/105600/',
'playlist': [ 'md5': '644c51b580f57db647da083be97c68c8',
{
'md5': 'f870007cee7065d7c76b88f0a45ecc07',
'info_dict': { 'info_dict': {
'id': '81300', 'id': '2040428',
'ext': 'flv', 'ext': 'flv',
'title': 'Terraria 1.1 Trailer', 'title': 'Terraria+1.3+Trailer',
'playlist_index': 1, 'playlist_index': 1,
}
}, },
{
'md5': '61aaf31a5c5c3041afb58fb83cbb5751',
'info_dict': {
'id': '80859',
'ext': 'flv',
'title': 'Terraria Trailer',
'playlist_index': 2,
}
}
],
'params': { 'params': {
'playlistend': 2, 'playlistend': 1,
} }
}, { }, {
'url': 'http://steamcommunity.com/sharedfiles/filedetails/?id=242472205', 'url': 'http://steamcommunity.com/sharedfiles/filedetails/?id=242472205',
'info_dict': { 'info_dict': {
'id': 'WB5DvDOOvAY', 'id': 'X8kpJBlzD2E',
'ext': 'mp4', 'ext': 'mp4',
'upload_date': '20140329', 'upload_date': '20140617',
'title': 'FRONTIERS - Final Greenlight Trailer', 'title': 'FRONTIERS - Trapping',
'description': 'md5:dc96a773669d0ca1b36c13c1f30250d9', 'description': 'md5:bf6f7f773def614054089e5769c12a6e',
'uploader': 'AAD Productions', 'uploader': 'AAD Productions',
'uploader_id': 'AtomicAgeDogGames', 'uploader_id': 'AtomicAgeDogGames',
} }
}] }]
def _real_extract(self, url): def _real_extract(self, url):
m = re.match(self._VALID_URL, url) m = re.match(self._VALID_URL, url)
fileID = m.group('fileID') fileID = m.group('fileID')
@ -77,6 +65,7 @@ class SteamIE(InfoExtractor):
webpage = self._download_webpage(videourl, playlist_id) webpage = self._download_webpage(videourl, playlist_id)
if fileID: if fileID:
playlist_title = self._html_search_regex( playlist_title = self._html_search_regex(
r'<div class="workshopItemTitle">(.+)</div>', webpage, 'title') r'<div class="workshopItemTitle">(.+)</div>', webpage, 'title')
mweb = re.finditer(r'''(?x) mweb = re.finditer(r'''(?x)
@ -90,22 +79,19 @@ class SteamIE(InfoExtractor):
} for vid in mweb] } for vid in mweb]
else: else:
playlist_title = self._html_search_regex( playlist_title = self._html_search_regex(
r'<h2 class="pageheader">(.*?)</h2>', webpage, 'game title') r'<div class="apphub_AppName">(.*?)</div>', webpage, 'game title')
mweb = re.finditer(r'''(?x) mweb = re.finditer(r'''(?x)
'movie_(?P<videoID>[0-9]+)':\s*\{\s* 'movie_(?P<videoID>[0-9]+)':\s*\{\s*
FILENAME:\s*"(?P<videoURL>[\w:/\.\?=]+)" FILENAME:\s*"(?P<videoURL>[\w:/\.\?=]+)"
(,\s*MOVIE_NAME:\s*\"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\}, (,\s*MOVIE_NAME:\s*\"(?P<videoName>[\w:/\.\?=\+-]+)\")?\s*\},
''', webpage) ''', webpage)
titles = re.finditer(
r'<span class="title">(?P<videoName>.+?)</span>', webpage)
thumbs = re.finditer( thumbs = re.finditer(
r'<img class="movie_thumb" src="(?P<thumbnail>.+?)">', webpage) r'<img class="movie_thumb" src="(?P<thumbnail>.+?)">', webpage)
videos = [] videos = []
for vid, vtitle, thumb in zip(mweb, titles, thumbs): for vid, thumb in zip(mweb, thumbs):
video_id = vid.group('videoID') video_id = vid.group('videoID')
title = vtitle.group('videoName') title = vid.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:
@ -114,7 +100,7 @@ class SteamIE(InfoExtractor):
'id': video_id, 'id': video_id,
'url': video_url, 'url': video_url,
'ext': 'flv', 'ext': 'flv',
'title': unescapeHTML(title), 'title': title,
'thumbnail': video_thumb 'thumbnail': video_thumb
}) })
if not videos: if not videos: