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

fetch_url: move content decoding to before 429 check

Browse Source 
Content should be decoded before we try reading page to check for
429. Lucky that it worked at all before.
This commit is contained in:
James Taylor 2020-10-25 10:50:33 -07:00
parent c09fe63d9b
commit bcaec7b7d3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube/util.py
View File

@ -196,6 +196,9 @@ def fetch_url(url, headers=(), timeout=15, report_text=None, data=None,
read_finish = time.time()
cleanup_func(response) # release_connection for urllib3
content = decode_content(
content,
response.getheader('Content-Encoding', default='identity'))
if (response.status == 429
and content.startswith(b'<!DOCTYPE')
@ -210,7 +213,6 @@ def fetch_url(url, headers=(), timeout=15, report_text=None, data=None,
if report_text:
print(report_text, ' Latency:', round(response_time - start_time,3), ' Read time:', round(read_finish - response_time,3))
content = decode_content(content, response.getheader('Content-Encoding', default='identity'))
if settings.debugging_save_responses and debug_name is not None:
save_dir = os.path.join(settings.data_dir, 'debug')