alihan/textual-serve
1
0
Fork 0
mirror of https://github.com/Textualize/textual-serve.git synced 2025-10-17 02:50:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handling downloads cancelled on the browser

Browse Source
This commit is contained in:
Darren Burns
2024-08-28 13:05:13 +01:00
parent afbc2397d5
commit e4ec2a5f82
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/textual_serve/app_service.py
View File

@@ -187,6 +187,10 @@ class AppService:
async def stop(self) -> None:
"""Stop the process and wait for it to complete."""
if self._task is not None:
await self._download_manager.cancel_app_downloads(
app_service_id=self.app_service_id
)
await self.send_meta({"type": "quit"})
await self._task
self._task = None

22
src/textual_serve/download_manager.py
View File

@@ -116,7 +116,8 @@ class DownloadManager:
chunk = None
if not chunk:
# Empty chunk - the app process has finished sending the file.
# Empty chunk - the app process has finished sending the file
# or the download has been cancelled.
incoming_chunks.task_done()
del self._active_downloads[delivery_key]
break
@@ -131,7 +132,14 @@ class DownloadManager:
delivery_key: The delivery key that the chunk was received for.
chunk: The chunk that was received.
"""
download = self._active_downloads[delivery_key]
download = self._active_downloads.get(delivery_key)
if not download:
# The download may have been cancelled - e.g. the websocket
# was closed before the download could complete.
log.debug("Chunk received for cancelled download %r", delivery_key)
return
if isinstance(chunk, str):
chunk = chunk.encode(download.encoding or "utf-8")
await download.incoming_chunks.put(chunk)
@@ -155,3 +163,13 @@ class DownloadManager:
delivery_key: The delivery key to get the metadata for.
"""
return self._active_downloads[delivery_key]
async def cancel_app_downloads(self, app_service_id: str) -> None:
"""Cancel all downloads for the given app service.
Args:
app_service_id: The app service ID to cancel downloads for.
"""
for download in self._active_downloads.values():
if download.app_service.app_service_id == app_service_id:
await download.incoming_chunks.put(None)