rt/wrolpi
1
0
Fork 0
mirror of https://github.com/lrnselfreliance/wrolpi.git synced 2026-10-25 18:40:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge 76105baf9b into c577cae9d8

Browse source
This commit is contained in:
lrnselfreliance 2026-10-25 16:35:59 -06:00 • committed by GitHub
commit 6b5c2295be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/archive/lib.py
View file

@ -1018,10 +1018,12 @@ def domain_download_links(session: Session) -> Dict[int, int]:
links = dict()
downloads = session.query(Download.id, Download.url, Download.downloader, Download.sub_downloader,
Download.settings) \
Download.destination, Download.settings) \
.filter(Download.frequency.isnot(None), Download.collection_id.is_(None))
for id_, url, downloader, sub_downloader, settings in downloads:
if destination := (settings or dict()).get('destination'):
for id_, url, downloader, sub_downloader, destination, settings in downloads:
# An old Download kept its destination in its settings.
destination = str(destination) if destination else (settings or dict()).get('destination')
if destination:
for collection_id, directory, prefix in directories:
if destination == directory or destination.startswith(prefix):
links[id_] = collection_id

24
modules/archive/test/test_lib.py
View file

@ -1277,6 +1277,30 @@ def test_link_domain_and_downloads(test_session, test_download_manager):
assert download4.collection_id is None # no frequency = no link
def test_link_domain_and_downloads_by_destination(test_session, test_directory, test_download_manager):
"""A Download whose destination column is in a domain's directory is linked to that domain (the destination was
moved out of the settings)."""
from wrolpi.downloader import Download
from modules.archive.lib import link_domain_and_downloads
collection = Collection(name='example.com', kind='domain', directory=test_directory / 'archive/example.com')
test_session.add(collection)
exact = Download(url='https://other.com/rss', downloader='rss', sub_downloader='archive', frequency=86400,
destination=test_directory / 'archive/example.com')
below = Download(url='https://other.com/rss2', downloader='rss', sub_downloader='archive', frequency=86400,
destination=test_directory / 'archive/example.com/2025/01')
similar = Download(url='https://other.com/rss3', downloader='rss', sub_downloader='archive', frequency=86400,
destination=test_directory / 'archive/example.com.au')
test_session.add_all([exact, below, similar])
test_session.commit()
link_domain_and_downloads(test_session)
assert exact.collection_id == collection.id
assert below.collection_id == collection.id
assert similar.collection_id is None
@skip_ci
@pytest.mark.asyncio
async def test_archive_download_uses_domain_collection_directory(async_client, test_session, test_directory, fake_now,