Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

locate stream for streaming API by identifier

Browse source
This commit is contained in:
Victor Shyba 2022-09-01 17:00:16 -03:00
parent 6258651650
commit 63784622e9
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbry/extras/daemon/daemon.py
View file

@ -639,7 +639,7 @@ class Daemon(metaclass=JSONRPCServerType):
stream = await self.jsonrpc_get(uri) stream = await self.jsonrpc_get(uri)
if isinstance(stream, dict): if isinstance(stream, dict):
raise web.HTTPServerError(text=stream['error']) raise web.HTTPServerError(text=stream['error'])
raise web.HTTPFound(f"/stream/{stream.sd_hash}") raise web.HTTPFound(f"/stream/{stream.identifier}")
async def handle_stream_range_request(self, request: web.Request): async def handle_stream_range_request(self, request: web.Request):
try: try:
@ -658,12 +658,13 @@ class Daemon(metaclass=JSONRPCServerType):
log.debug("finished handling /stream range request") log.debug("finished handling /stream range request")
async def _handle_stream_range_request(self, request: web.Request): async def _handle_stream_range_request(self, request: web.Request):
sd_hash = request.path.split("/stream/")[1] identifier = request.path.split("/stream/")[1]
if not self.file_manager.started.is_set(): if not self.file_manager.started.is_set():
await self.file_manager.started.wait() await self.file_manager.started.wait()
if sd_hash not in self.file_manager.streams: stream = self.file_manager.get_filtered(identifier=identifier)
if not stream:
return web.HTTPNotFound() return web.HTTPNotFound()
return await self.file_manager.stream_partial_content(request, sd_hash) return await self.file_manager.stream_partial_content(request, identifier)
async def _process_rpc_call(self, data): async def _process_rpc_call(self, data):
args = data.get('params', {}) args = data.get('params', {})

6
lbry/file/file_manager.py
View file

@ -290,8 +290,10 @@ class FileManager:
) )
) )
async def stream_partial_content(self, request: Request, sd_hash: str): async def stream_partial_content(self, request: Request, identifier: str):
return await self.source_managers['stream'].stream_partial_content(request, sd_hash) for source_manager in self.source_managers.values():
if source_manager.get_filtered(identifier=identifier):
return await source_manager.stream_partial_content(request, identifier)
def get_filtered(self, *args, **kwargs) -> typing.List[ManagedDownloadSource]: def get_filtered(self, *args, **kwargs) -> typing.List[ManagedDownloadSource]:
""" """

1
lbry/file/source_manager.py
View file

@ -23,6 +23,7 @@ COMPARISON_OPERATORS = {
class SourceManager: class SourceManager:
filter_fields = { filter_fields = {
'identifier',
'rowid', 'rowid',
'status', 'status',
'file_name', 'file_name',