Skip to content

Commit 0327bed

Browse files
committed
worker: simplify response check
Pre-fetching this with .get() calls lets us skip some repetitive indexing.
1 parent f9cc2ea commit 0327bed

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

brozzler/worker.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -465,27 +465,23 @@ def _on_screenshot(screenshot_jpeg):
465465
)
466466

467467
def _on_response(chrome_msg):
468+
response = chrome_msg.get("params").get("response")
469+
mime_type = response.get("mimeType", "")
468470
if (
469-
"params" in chrome_msg
470-
and "response" in chrome_msg["params"]
471-
and "mimeType" in chrome_msg["params"]["response"]
472-
and chrome_msg["params"]["response"]
473-
.get("mimeType", "")
474-
.startswith("video/")
471+
mime_type.startswith("video/")
475472
# skip manifests of DASH segmented video -
476473
# see https://github.com/internetarchive/brozzler/pull/70
477-
and chrome_msg["params"]["response"]["mimeType"]
478-
!= "video/vnd.mpeg.dash.mpd"
479-
and chrome_msg["params"]["response"].get("status") in (200, 206)
474+
and mime_type != "video/vnd.mpeg.dash.mpd"
475+
and response.get("status") in (200, 206)
480476
):
481477
video = {
482478
"blame": "browser",
483-
"url": chrome_msg["params"]["response"].get("url"),
484-
"response_code": chrome_msg["params"]["response"]["status"],
485-
"content-type": chrome_msg["params"]["response"]["mimeType"],
479+
"url": response.get("url"),
480+
"response_code": response["status"],
481+
"content-type": mime_type,
486482
}
487483
response_headers = CaseInsensitiveDict(
488-
chrome_msg["params"]["response"]["headers"]
484+
response["headers"]
489485
)
490486
if "content-length" in response_headers:
491487
video["content-length"] = int(response_headers["content-length"])

0 commit comments

Comments
 (0)