From ca3a364db799d15f4a0861916c2a2c73f15f0a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Wed, 27 Apr 2022 20:28:14 +0200 Subject: [PATCH] fix build_duration_func() (#2533) for extractors with request_interval_min > 0 --- gallery_dl/util.py | 2 ++ test/test_util.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gallery_dl/util.py b/gallery_dl/util.py index e8af358e..4bb220a0 100644 --- a/gallery_dl/util.py +++ b/gallery_dl/util.py @@ -461,6 +461,8 @@ def compile_expression(expr, name="", globals=GLOBALS): def build_duration_func(duration, min=0.0): if not duration: + if min: + return lambda: min return None if isinstance(duration, str): diff --git a/test/test_util.py b/test/test_util.py index 3cf3d683..c269c9e1 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -385,8 +385,6 @@ class TestOther(unittest.TestCase): expr() def test_build_duration_func(self, f=util.build_duration_func): - for v in (0, 0.0, "", None, (), []): - self.assertIsNone(f(v)) def test_single(df, v): for _ in range(10): @@ -398,6 +396,12 @@ class TestOther(unittest.TestCase): self.assertGreaterEqual(v, lower) self.assertLessEqual(v, upper) + for v in (0, 0.0, "", None, (), []): + self.assertIsNone(f(v)) + + for v in (0, 0.0, "", None, (), []): + test_single(f(v, 1.0), 1.0) + test_single(f(3), 3) test_single(f(3.0), 3.0) test_single(f("3"), 3)