api

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_trash.py

@@ -12,7 +12,7 @@
 from tenacity.before_sleep import before_sleep_log
 from tenacity.wait import wait_exponential
 
-from ..trash._service import prune_trash
+from ..trash import trash_service
 
 _logger = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@
     before_sleep=before_sleep_log(_logger, logging.WARNING),
 )
 async def _run_task(app: web.Application):
-    if deleted := await prune_trash(app):
+    if deleted := await trash_service.delete_expired_trash(app):
         for name in deleted:
             _logger.info("Trash item %s expired and was deleted", f"{name}")
     else:

services/web/server/src/simcore_service_webserver/trash/_service.py

@@ -62,7 +62,7 @@ async def _empty_explicitly_trashed_projects(
                 )
 
 
-async def _empty_trashed_folders(
+async def _empty_explicitly_trashed_folders_and_content(
     app: web.Application, product_name: ProductName, user_id: UserID
 ):
     trashed_folders_ids = await folders_trash_service.list_explicitly_trashed_folders(
@@ -104,10 +104,10 @@ async def empty_trash_safe(
 ):
     await _empty_explicitly_trashed_projects(app, product_name, user_id)
 
-    await _empty_trashed_folders(app, product_name, user_id)
+    await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)
 
 
-async def prune_trash(app: web.Application) -> list[str]:
+async def delete_expired_trash(app: web.Application) -> list[str]:
     """Deletes expired items in the trash"""
     settings = get_plugin_settings(app)
 

services/web/server/src/simcore_service_webserver/trash/trash_service.py

@@ -0,0 +1,4 @@
+from ._service import delete_expired_trash
+
+__all__: tuple[str, ...] = ("delete_expired_trash",)
+# nopycln: file