From 0a13ab88cb34c8a06271c4b9d48906aa6e30dfaa Mon Sep 17 00:00:00 2001 From: Lomanic Date: Sat, 6 Nov 2021 20:10:27 +0100 Subject: [PATCH] Stream responses on /vi and /ggpht endpoints The chunk_size=None parameter to iter_content lets us consume data as soon as it arrives https://docs.python-requests.org/en/master/api/#requests.Response.iter_content --- index.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.py b/index.py index ffc35c7..91cdcfd 100644 --- a/index.py +++ b/index.py @@ -123,17 +123,17 @@ class NewLeaf(object): @cherrypy.expose def vi(self, id, file): - with requests.get("https://i.ytimg.com/vi/{}/{}".format(id, file)) as r: + with requests.get("https://i.ytimg.com/vi/{}/{}".format(id, file), stream=True) as r: r.raise_for_status() cherrypy.response.headers["content-type"] = r.headers["content-type"] - return r # no idea if this is a good way to do it, but it definitely works! :D + return next(r.iter_content(chunk_size=None)) @cherrypy.expose def ggpht(self, *path): - with requests.get("https://yt3.ggpht.com/{}".format("/".join(path))) as r: + with requests.get("https://yt3.ggpht.com/{}".format("/".join(path)), stream=True) as r: r.raise_for_status() cherrypy.response.headers["content-type"] = r.headers["content-type"] - return r + return next(r.iter_content(chunk_size=None)) bind_port = getattr(configuration, "bind_port", 3000) bind_host = getattr(configuration, "bind_host", "0.0.0.0")