From 3bfbaa4c2265f9722d669849e13595a30bc879c4 Mon Sep 17 00:00:00 2001 From: Roland Date: Sat, 23 Jul 2022 16:12:28 -0600 Subject: [PATCH] Fixing bug where new downloads may not refresh without a next_download. --- modules/videos/channel/test/test_api.py | 2 +- wrolpi/downloader.py | 15 +++++++++++++-- wrolpi/version.py | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/videos/channel/test/test_api.py b/modules/videos/channel/test/test_api.py index e298f9be..b40c4a01 100644 --- a/modules/videos/channel/test/test_api.py +++ b/modules/videos/channel/test/test_api.py @@ -342,7 +342,6 @@ def test_channel_empty_url_doesnt_conflict(test_client, test_session, test_direc async def test_download_channel_no_refresh(test_session, download_channel, video_download_manager): """A Channel cannot be downloaded until it has been refreshed.""" d = download_channel.get_download() - d.next_download = video_download_manager.calculate_next_download(d) test_session.commit() def check_refreshed(expected: bool): @@ -359,6 +358,7 @@ async def test_download_channel_no_refresh(test_session, download_channel, video await video_download_manager.wait_for_all_downloads() check_refreshed(True) + assert d.next_download def test_channel_post_directory(test_session, test_client, test_directory): diff --git a/wrolpi/downloader.py b/wrolpi/downloader.py index 4cd1581b..63a6e7ce 100644 --- a/wrolpi/downloader.py +++ b/wrolpi/downloader.py @@ -551,8 +551,17 @@ class DownloadManager: """ if self.disabled.is_set(): return - self.renew_recurring_downloads() - self.delete_old_once_downloads() + + try: + self.renew_recurring_downloads() + except Exception as e: + logger.error(f'Unable to renew downloads!', exc_info=e) + + try: + self.delete_old_once_downloads() + except Exception as e: + logger.error(f'Unable to delete old downloads!', exc_info=e) + await self.queue_downloads() async def wait_for_all_downloads(self): @@ -641,6 +650,8 @@ class DownloadManager: recurring = self.get_recurring_downloads(session) renewed = False for download in recurring: + # A new download may not have a `next_download`, create it if necessary. + download.next_download = download.next_download or self.calculate_next_download(download, session=session) if download.next_download < now_: download.renew() renewed = True diff --git a/wrolpi/version.py b/wrolpi/version.py index 11320bab..5c560b52 100644 --- a/wrolpi/version.py +++ b/wrolpi/version.py @@ -1,4 +1,4 @@ -__version__ = '0.6.0-beta' +__version__ = '0.6.1-beta' import subprocess