mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
Fixing DownloadManager.kill
This commit is contained in:
parent
120ce7cd2c
commit
b63c8f132a
2 changed files with 10 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
|||
from collections import defaultdict
|
||||
from datetime import timedelta
|
||||
from typing import List, Dict, Union
|
||||
from typing import List, Dict, Union, Generator
|
||||
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
|
|
@ -97,7 +97,7 @@ def get_channel(source_id: str = None, link: str = None, url: str = None, return
|
|||
return channel
|
||||
|
||||
|
||||
def _spread_by_frequency(channels: List[Channel]):
|
||||
def _spread_by_frequency(channels: List[Channel]) -> Generator[Dict, None, None]:
|
||||
channels_by_frequency = defaultdict(lambda: [])
|
||||
for channel in channels:
|
||||
channels_by_frequency[channel.download_frequency].append(channel)
|
||||
|
|
@ -129,13 +129,10 @@ def spread_channel_downloads():
|
|||
url_next_download = _spread_by_frequency(channels)
|
||||
|
||||
for info in url_next_download:
|
||||
download = download_manager.get_download(session, url=info['url'])
|
||||
if not download:
|
||||
download = Download(url=info['url'])
|
||||
session.add(download)
|
||||
|
||||
download.frequency = info['frequency']
|
||||
download.next_download = info['next_download']
|
||||
url, frequency, next_download = info['url'], info['frequency'], info['next_download']
|
||||
download = download_manager.get_or_create_download(url, session)
|
||||
download.frequency = frequency
|
||||
download.next_download = next_download
|
||||
|
||||
|
||||
@run_after(save_channels_config)
|
||||
|
|
|
|||
|
|
@ -512,7 +512,10 @@ class DownloadManager:
|
|||
"""
|
||||
with get_db_session(commit=True) as session:
|
||||
download = self.get_download(session, id_=download_id)
|
||||
downloader = self.get_downloader(download.url)
|
||||
if not download.downloader:
|
||||
downloader, _ = self.get_downloader(download.url)
|
||||
else:
|
||||
downloader = self.get_downloader_by_name(download.downloader)
|
||||
logger.warning(f'Killing download {download_id} in {downloader}')
|
||||
if download.status == 'pending':
|
||||
downloader.kill()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue