From 41b431eb34988a8bc74308155a90f5a0552dae66 Mon Sep 17 00:00:00 2001 From: Roland Date: Tue, 12 Sep 2023 20:24:13 -0600 Subject: [PATCH] Download not in the config are deleted on import. --- wrolpi/downloader.py | 3 +++ wrolpi/files/lib.py | 1 - wrolpi/test/common.py | 4 +--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wrolpi/downloader.py b/wrolpi/downloader.py index 99aa50ac..d17cf4f4 100644 --- a/wrolpi/downloader.py +++ b/wrolpi/downloader.py @@ -1156,6 +1156,9 @@ async def import_downloads_config(session: Session): existing.status = download['status'] existing.sub_downloader = download['sub_downloader'] existing.settings = download.get('settings') or dict() + else: + logger.warning(f'Deleting Download {existing.url} because it is no longer in the config') + session.delete(existing) for download in downloads_by_url.values(): # These downloads are new, import them. diff --git a/wrolpi/files/lib.py b/wrolpi/files/lib.py index ad78a046..f324642a 100644 --- a/wrolpi/files/lib.py +++ b/wrolpi/files/lib.py @@ -2,7 +2,6 @@ import asyncio import datetime import functools import glob -import itertools import json import multiprocessing import os diff --git a/wrolpi/test/common.py b/wrolpi/test/common.py index 5856a615..7b330808 100644 --- a/wrolpi/test/common.py +++ b/wrolpi/test/common.py @@ -1,17 +1,15 @@ import os import pathlib import tempfile -import unittest from contextlib import contextmanager from functools import partialmethod -from http import HTTPStatus from itertools import zip_longest from typing import List import mock import pytest -from wrolpi.common import set_test_media_directory, get_media_directory +from wrolpi.common import get_media_directory from wrolpi.conftest import ROUTES_ATTACHED, test_db, test_client # noqa from wrolpi.db import postgres_engine