Download can find it's Downloader.

This commit is contained in:
Roland 2022-01-11 10:22:19 -07:00
parent ad9b970212
commit 0dbf8b704b
No known key found for this signature in database
GPG key ID: 9D6DBD3ACF11AB93
2 changed files with 31 additions and 8 deletions

View file

@ -50,6 +50,11 @@ class Download(ModelHelper, Base):
info_json = Column(JSONB)
downloader = Column(Text)
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.manager: DownloadManager = None
def __repr__(self):
if self.next_download or self.frequency:
return f'<Download id={self.id} status={self.status} url={repr(self.url)} ' \
@ -102,6 +107,12 @@ class Download(ModelHelper, Base):
if self.frequency:
self.increment_next_download()
def get_downloader(self):
if self.downloader:
return self.manager.get_downloader_by_name(self.downloader)
return self.manager.get_downloader(self.url)
class Downloader:
name = None
@ -258,6 +269,7 @@ class DownloadManager:
download = Download(url=url, status='new')
session.add(download)
session.flush()
download.manager = self
return download
def create_download(self, url: str, session, downloader: str = None, skip_download: bool = False,
@ -511,10 +523,7 @@ class DownloadManager:
"""
with get_db_session(commit=True) as session:
download = self.get_download(session, id_=download_id)
if not download.downloader:
downloader, _ = self.get_downloader(download.url)
else:
downloader = self.get_downloader_by_name(download.downloader)
downloader = download.get_downloader()
logger.warning(f'Killing download {download_id} in {downloader}')
if download.status == 'pending':
downloader.kill()
@ -529,10 +538,7 @@ class DownloadManager:
with get_db_session(commit=True) as session:
downloads = self.get_pending_downloads(session)
for download in downloads:
if not download.downloader:
downloader, _ = self.get_downloader(download.url)
else:
downloader = self.get_downloader_by_name(download.downloader)
downloader = download.get_downloader()
downloader.kill()
download.defer()
except Exception as e:

View file

@ -316,3 +316,20 @@ async def test_download_wrol_mode(test_session, test_download_manager):
test_download_manager.do_downloads_sync()
with pytest.raises(WROLModeEnabled):
await test_download_manager.do_downloads_sync()
def test_download_get_downloader(test_session, test_download_manager):
"""
A Download can find it's Downloader.
"""
permissive_downloader = PermissiveDownloader()
http_downloader = HTTPDownloader()
test_download_manager.register_downloader(permissive_downloader)
test_download_manager.register_downloader(http_downloader)
download1 = test_download_manager.create_download('https://example.com', test_session, skip_download=True)
assert download1.get_downloader() == permissive_downloader
download2 = test_download_manager.create_download('https://example.com', test_session, skip_download=True)
download2.downloader = 'bad downloader'
assert download2.get_downloader() is None