github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build_duration_func() (#2533)

Browse Source 
for extractors with request_interval_min > 0
This commit is contained in:
Mike Fährmann
2022-04-27 20:28:14 +02:00
parent afde76269c
commit ca3a364db7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/util.py
View File

@@ -461,6 +461,8 @@ def compile_expression(expr, name="<expr>", globals=GLOBALS):
def build_duration_func(duration, min=0.0): def build_duration_func(duration, min=0.0):
if not duration: if not duration:
if min:
return lambda: min
return None return None
if isinstance(duration, str): if isinstance(duration, str):

8
test/test_util.py
View File

@@ -385,8 +385,6 @@ class TestOther(unittest.TestCase):
expr() expr()
def test_build_duration_func(self, f=util.build_duration_func): 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): def test_single(df, v):
for _ in range(10): for _ in range(10):
@@ -398,6 +396,12 @@ class TestOther(unittest.TestCase):
self.assertGreaterEqual(v, lower) self.assertGreaterEqual(v, lower)
self.assertLessEqual(v, upper) 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), 3)
test_single(f(3.0), 3.0) test_single(f(3.0), 3.0)
test_single(f("3"), 3) test_single(f("3"), 3)