Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-20 03:48:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rm oddly merged try except block

Browse source
This commit is contained in:
Barbara Miller 2024-09-23 15:16:07 -07:00
parent 7de6483453
commit 3e9030a376
1 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

46
brozzler/ydl.py
View file

@ -184,31 +184,29 @@ def _build_youtube_dl(worker, destdir, site, page):
worker._proxy_for(site), worker._proxy_for(site),
url, url,
) )
try: with open(info_dict["filepath"], "rb") as f:
with open(info_dict["filepath"], "rb") as f: # include content-length header to avoid chunked
# include content-length header to avoid chunked # transfer, which warcprox currently rejects
# transfer, which warcprox currently rejects extra_headers = dict(site.extra_headers())
extra_headers = dict(site.extra_headers()) extra_headers["content-length"] = size
extra_headers["content-length"] = size request, response = worker._warcprox_write_record(
request, response = worker._warcprox_write_record( warcprox_address=worker._proxy_for(site),
warcprox_address=worker._proxy_for(site), url=url,
url=url, warc_type="resource",
warc_type="resource", content_type=mimetype,
content_type=mimetype, payload=f,
payload=f, extra_headers=extra_headers,
extra_headers=extra_headers,
)
# consulted by _remember_videos()
ydl.pushed_videos.append(
{
"url": url,
"response_code": response.code,
"content-type": mimetype,
"content-length": size,
}
) )
except:
traceback.print_exc() # consulted by _remember_videos()
ydl.pushed_videos.append(
{
"url": url,
"response_code": response.code,
"content-type": mimetype,
"content-length": size,
}
)
def maybe_heartbeat_site_last_claimed(*args, **kwargs): def maybe_heartbeat_site_last_claimed(*args, **kwargs):
# in case yt-dlp takes a long time, heartbeat site.last_claimed # in case yt-dlp takes a long time, heartbeat site.last_claimed