From 91e38a2966e264a55209f6b8445c01a39ac69631 Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 12 Jan 2024 22:14:18 -0800 Subject: [PATCH] no download_strategy --- src/ytdl_sub/downloaders/url/validators.py | 12 +++--------- tests/unit/config/test_preset.py | 3 --- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/ytdl_sub/downloaders/url/validators.py b/src/ytdl_sub/downloaders/url/validators.py index 631ee979..071d716b 100644 --- a/src/ytdl_sub/downloaders/url/validators.py +++ b/src/ytdl_sub/downloaders/url/validators.py @@ -276,17 +276,11 @@ class MultiUrlValidator(OptionsValidator): def __init__(self, name, value): super().__init__(name, value) - # Copy since we're popping things - value_copy = copy.deepcopy(value) - if isinstance(value, dict): - # Pop old required field in case it's still there - value_copy.pop("download_strategy", None) - # Deal with old multi-url download strategy - if isinstance(value, dict) and "urls" in value_copy: - self._urls = UrlListValidator(name=name, value=value_copy["urls"]) + if isinstance(value, dict) and "urls" in value: + self._urls = UrlListValidator(name=name, value=value["urls"]) else: - self._urls = UrlListValidator(name=name, value=value_copy) + self._urls = UrlListValidator(name=name, value=value) @property def urls(self) -> UrlListValidator: diff --git a/tests/unit/config/test_preset.py b/tests/unit/config/test_preset.py index 8afedd35..de651ada 100644 --- a/tests/unit/config/test_preset.py +++ b/tests/unit/config/test_preset.py @@ -17,9 +17,6 @@ class TestPreset: "youtube.com/watch?v=123abc", # single string ["youtube.com/watch?v=123abc", "youtube.com/watch?v=123xyz"], # list of strings [{"url": "youtube.com/watch?v=123abc"}, "youtube.com/watch?v=123abc"], # dict and str - # OLD download_strategy format - {"download_strategy": "url", "url": "youtube.com/watch?v=123abc"}, - {"download_strategy": "multi-url", "urls": [{"url": "youtube.com/watch?v=123abc"}]}, ], ) def test_bare_minimum_preset(self, config_file, output_options, download_value):