roypur/stream-api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add content-type to upstream

Browse Source
This commit is contained in:
Roy Olav Purser
2021-11-19 11:04:48 +01:00
parent 6fa6426f79
commit 8d10c54636
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/stream.py
View File

@@ -51,7 +51,11 @@ class ProxyElem():
data_list = [] data_list = []
for url in urls: for url in urls:
data = {} data = {}
if isinstance(url, str):
data["upstream"] = url data["upstream"] = url
elif isinstance(url, tuple):
data["upstream"] = url[0]
data["ctype"] = url[1]
data["proxy"] = self.proxy data["proxy"] = self.proxy
data["proxied"] = isinstance(self.proxy, str) data["proxied"] = isinstance(self.proxy, str)
data_list.append(data) data_list.append(data)
@@ -240,7 +244,7 @@ class MainHandler(tornado.web.RequestHandler):
provider_data = await stream_providers.get_seafile(handler.upstream, handler.proxy, logger) provider_data = await stream_providers.get_seafile(handler.upstream, handler.proxy, logger)
else: else:
provider_data = await stream_providers.get_any(handler.upstream, handler.proxy, logger) provider_data = await stream_providers.get_any(handler.upstream, handler.proxy, logger)
proxied = await handler.proxy.proxy_url([provider_data.upstream(), provider_data.thumbnail()]) proxied = await handler.proxy.proxy_url([(provider_data.upstream(), provider_data.proxy_ctype()), provider_data.thumbnail()])
video_info = {} video_info = {}
video_info["upstream"] = proxied[0] video_info["upstream"] = proxied[0]
video_info["poster"] = proxied[1] video_info["poster"] = proxied[1]