hehesheng/TgToFileSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: requester bug

Browse Source
This commit is contained in:
hehesheng 2024-06-07 23:51:54 +08:00
parent 68478a0e45
commit 33d45cf2de
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/TgFileSystemClient.py
View File

@ -308,6 +308,7 @@ class TgFileSystemClient(object):
return res return res
async def _download_media_chunk(self, msg: types.Message, media_holder: MediaChunkHolder) -> None: async def _download_media_chunk(self, msg: types.Message, media_holder: MediaChunkHolder) -> None:
logger.info(f"start downloading new chunk:{media_holder=}")
try: try:
offset = media_holder.start + media_holder.length offset = media_holder.start + media_holder.length
target_size = media_holder.target_len - media_holder.length target_size = media_holder.target_len - media_holder.length
@ -321,9 +322,6 @@ class TgFileSystemClient(object):
else: else:
media_holder.append_chunk_mem(chunk) media_holder.append_chunk_mem(chunk)
if media_holder.is_completed(): if media_holder.is_completed():
if not media_holder.try_clear_waiter_and_requester():
logger.error("I think never run here.")
media_holder.set_done()
break break
if await media_holder.is_disconneted(): if await media_holder.is_disconneted():
raise asyncio.CancelledError("all requester canceled.") raise asyncio.CancelledError("all requester canceled.")
@ -334,8 +332,13 @@ class TgFileSystemClient(object):
logger.error( logger.error(
f"_download_media_chunk err:{err=},{offset=},{target_size=},{media_holder},\r\n{err=}\r\n{traceback.format_exc()}" f"_download_media_chunk err:{err=},{offset=},{target_size=},{media_holder},\r\n{err=}\r\n{traceback.format_exc()}"
) )
else:
if not media_holder.try_clear_waiter_and_requester():
logger.error("I think never run here.")
media_holder.set_done()
logger.debug(f"downloaded chunk:{offset=},{target_size=},{media_holder}")
finally: finally:
logger.debug(f"downloaded chunk:{time.time()}.{offset=},{target_size=},{media_holder}") pass
async def streaming_get_iter(self, msg: types.Message, start: int, end: int, req: Request): async def streaming_get_iter(self, msg: types.Message, start: int, end: int, req: Request):
try: try:

2
frontend/search.py
View File

@ -71,6 +71,8 @@ def loop():
st.session_state.page_index = st.session_state.page_index + 1 st.session_state.page_index = st.session_state.page_index + 1
st.session_state.force_skip = True st.session_state.force_skip = True
st.rerun() st.rerun()
st.session_state.page_index = st.number_input(
"page_index", key="page_index_input", min_value=1, max_value=100, value=st.session_state.page_index, format="%d", label_visibility="hidden")
def media_file_res_container(index: int, msg_ctx: str, file_name: str, file_size: int, url: str, src_link: str): def media_file_res_container(index: int, msg_ctx: str, file_name: str, file_size: int, url: str, src_link: str):
file_size_str = f"{file_size/1024/1024:.2f}MB" file_size_str = f"{file_size/1024/1024:.2f}MB"