Upgrade yt_dlp and download script
This commit is contained in:
@@ -2,14 +2,15 @@ import re
|
||||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
extract_attributes,
|
||||
ExtractorError,
|
||||
extract_attributes,
|
||||
get_element_by_class,
|
||||
str_or_none,
|
||||
)
|
||||
|
||||
|
||||
class SteamIE(InfoExtractor):
|
||||
_VALID_URL = r"""(?x)
|
||||
_VALID_URL = r'''(?x)
|
||||
https?://(?:store\.steampowered|steamcommunity)\.com/
|
||||
(?:agecheck/)?
|
||||
(?P<urltype>video|app)/ #If the page is only for videos or for a game
|
||||
@@ -17,7 +18,7 @@ class SteamIE(InfoExtractor):
|
||||
(?P<videoID>\d*)(?P<extra>\??) # For urltype == video we sometimes get the videoID
|
||||
|
|
||||
https?://(?:www\.)?steamcommunity\.com/sharedfiles/filedetails/\?id=(?P<fileID>[0-9]+)
|
||||
"""
|
||||
'''
|
||||
_VIDEO_PAGE_TEMPLATE = 'http://store.steampowered.com/video/%s/'
|
||||
_AGECHECK_TEMPLATE = 'http://store.steampowered.com/agecheck/video/%s/?snr=1_agecheck_agecheck__age-gate&ageDay=1&ageMonth=January&ageYear=1970'
|
||||
_TESTS = [{
|
||||
@@ -30,8 +31,7 @@ class SteamIE(InfoExtractor):
|
||||
'ext': 'mp4',
|
||||
'title': 'Terraria video 256785003',
|
||||
'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
|
||||
'n_entries': 2,
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
'md5': '6a294ee0c4b1f47f5bb76a65e31e3592',
|
||||
@@ -39,11 +39,9 @@ class SteamIE(InfoExtractor):
|
||||
'id': '2040428',
|
||||
'ext': 'mp4',
|
||||
'title': 'Terraria video 2040428',
|
||||
'playlist_index': 2,
|
||||
'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
|
||||
'n_entries': 2,
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
],
|
||||
'info_dict': {
|
||||
'id': '105600',
|
||||
@@ -51,27 +49,25 @@ class SteamIE(InfoExtractor):
|
||||
},
|
||||
'params': {
|
||||
'playlistend': 2,
|
||||
}
|
||||
},
|
||||
}, {
|
||||
'url': 'https://store.steampowered.com/app/271590/Grand_Theft_Auto_V/',
|
||||
'info_dict': {
|
||||
'id': '256757115',
|
||||
'title': 'Grand Theft Auto V video 256757115',
|
||||
'ext': 'mp4',
|
||||
'thumbnail': r're:^https://cdn\.[^\.]+\.steamstatic\.com',
|
||||
'n_entries': 20,
|
||||
'id': '271590',
|
||||
'title': 'Grand Theft Auto V',
|
||||
},
|
||||
'playlist_count': 23,
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
m = self._match_valid_url(url)
|
||||
fileID = m.group('fileID')
|
||||
if fileID:
|
||||
file_id = m.group('fileID')
|
||||
if file_id:
|
||||
video_url = url
|
||||
playlist_id = fileID
|
||||
playlist_id = file_id
|
||||
else:
|
||||
gameID = m.group('gameID')
|
||||
playlist_id = gameID
|
||||
game_id = m.group('gameID')
|
||||
playlist_id = game_id
|
||||
video_url = self._VIDEO_PAGE_TEMPLATE % playlist_id
|
||||
|
||||
self._set_cookie('steampowered.com', 'wants_mature_content', '1')
|
||||
@@ -103,7 +99,7 @@ class SteamIE(InfoExtractor):
|
||||
entry['thumbnail'] = movie.get('data-poster')
|
||||
for quality in ('', '-hd'):
|
||||
for ext in ('webm', 'mp4'):
|
||||
video_url = movie.get('data-%s%s-source' % (ext, quality))
|
||||
video_url = movie.get(f'data-{ext}{quality}-source')
|
||||
if video_url:
|
||||
formats.append({
|
||||
'format_id': ext + quality,
|
||||
@@ -136,7 +132,7 @@ class SteamCommunityBroadcastIE(InfoExtractor):
|
||||
'id': '76561199073851486',
|
||||
'title': r're:Steam Community :: pepperm!nt :: Broadcast 2022-06-26 \d{2}:\d{2}',
|
||||
'ext': 'mp4',
|
||||
'uploader_id': 1113585758,
|
||||
'uploader_id': '1113585758',
|
||||
'uploader': 'pepperm!nt',
|
||||
'live_status': 'is_live',
|
||||
},
|
||||
@@ -169,6 +165,6 @@ class SteamCommunityBroadcastIE(InfoExtractor):
|
||||
'live_status': 'is_live',
|
||||
'view_count': json_data.get('num_view'),
|
||||
'uploader': uploader_json.get('persona_name'),
|
||||
'uploader_id': uploader_json.get('accountid'),
|
||||
'uploader_id': str_or_none(uploader_json.get('accountid')),
|
||||
'subtitles': subs,
|
||||
}
|
||||
|
Reference in New Issue
Block a user