From e93987c5c090e2741b2f1d1227e307eec9e9ce95 Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 7 Jan 2022 14:13:48 -0700 Subject: [PATCH] Unifying fetcher to use same session. --- wrolpi/downloader.py | 8 ++++++++ wrolpi/root_api.py | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/wrolpi/downloader.py b/wrolpi/downloader.py index 4e335c9a..0ca8eab1 100644 --- a/wrolpi/downloader.py +++ b/wrolpi/downloader.py @@ -535,6 +535,14 @@ class DownloadManager: """ return list(filter(lambda i: i.listable, self.instances)) + @optional_session + def get_fe_downloads(self, session: Session = None): + data = dict( + recurring_downloads=self.get_recurring_downloads(session=session), + once_downloads=self.get_once_downloads(session=session, limit=100), + ) + return data + # The global DownloadManager. This should be used everywhere! download_manager = DownloadManager() diff --git a/wrolpi/root_api.py b/wrolpi/root_api.py index 817c57e4..a439dea1 100644 --- a/wrolpi/root_api.py +++ b/wrolpi/root_api.py @@ -193,10 +193,7 @@ async def post_download(request: Request, data: dict): summary='Get all Downloads that need to be processed.', ) async def get_downloads(request: Request): - data = dict( - recurring_downloads=download_manager.get_recurring_downloads(), - once_downloads=download_manager.get_once_downloads(limit=100), - ) + data = download_manager.get_fe_downloads() return json_response(data)