heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove static check resolution in TOR mode

Browse Source
This commit is contained in:
Jesús 2021-08-03 17:17:59 -05:00
parent 382035d32f
commit 7dd3c4304d
No known key found for this signature in database
GPG Key ID: F6EE7BC59A315766
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube/watch.py
View File

@ -24,12 +24,9 @@ except FileNotFoundError:
decrypt_cache = {} decrypt_cache = {}
def get_video_sources(info, tor_bypass=False): def get_video_sources(info):
video_sources = [] video_sources = []
if (not settings.theater_mode) or (settings.route_tor == 2) or tor_bypass: max_resolution = settings.default_resolution
max_resolution = 480
else:
max_resolution = settings.default_resolution
for fmt in info['formats']: for fmt in info['formats']:
if not all(fmt[attr] for attr in ('quality', 'width', 'ext', 'url')): if not all(fmt[attr] for attr in ('quality', 'width', 'ext', 'url')):
continue continue
@ -315,7 +312,6 @@ def extract_info(video_id, use_invidious, playlist_id=None, index=None):
# check for 403. Unnecessary for tor video routing b/c ip address is same # check for 403. Unnecessary for tor video routing b/c ip address is same
info['invidious_used'] = False info['invidious_used'] = False
info['invidious_reload_button'] = False info['invidious_reload_button'] = False
info['tor_bypass_used'] = False
if (settings.route_tor == 1 if (settings.route_tor == 1
and info['formats'] and info['formats'][0]['url']): and info['formats'] and info['formats'][0]['url']):
try: try:
@ -329,7 +325,6 @@ def extract_info(video_id, use_invidious, playlist_id=None, index=None):
if response.status == 403: if response.status == 403:
print('Access denied (403) for video urls.') print('Access denied (403) for video urls.')
print('Routing video through Tor') print('Routing video through Tor')
info['tor_bypass_used'] = True
for fmt in info['formats']: for fmt in info['formats']:
fmt['url'] += '&use_tor=1' fmt['url'] += '&use_tor=1'
elif 300 <= response.status < 400: elif 300 <= response.status < 400:
@ -483,7 +478,7 @@ def get_watch_page(video_id=None):
'codecs': codecs_string, 'codecs': codecs_string,
}) })
video_sources = get_video_sources(info, tor_bypass=info['tor_bypass_used']) video_sources = get_video_sources(info)
video_height = yt_data_extract.deep_get(video_sources, 0, 'height', default=360) video_height = yt_data_extract.deep_get(video_sources, 0, 'height', default=360)
video_width = yt_data_extract.deep_get(video_sources, 0, 'width', default=640) video_width = yt_data_extract.deep_get(video_sources, 0, 'width', default=640)
# 1 second per pixel, or the actual video width # 1 second per pixel, or the actual video width