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

make 'enumerate_reversed()' work with generators (#2795)

Browse Source
This commit is contained in:
Mike Fährmann
2022-08-01 14:08:44 +02:00
parent 033faf67ec
commit dd3a6a9fd1
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gallery_dl/util.py
View File

@@ -161,13 +161,16 @@ def delete_items(obj, keys):
def enumerate_reversed(iterable, start=0, length=None):
"""Enumerate 'iterable' and return its elements in reverse order"""
start -= 1
if length is None:
length = len(iterable)
return zip(
range(length - start, start, -1),
reversed(iterable),
)
try:
iterable = zip(range(start-1+length, start-1, -1), reversed(iterable))
except TypeError:
iterable = list(zip(range(start, start+length), iterable))
iterable.reverse()
return iterable
def number_to_string(value, numbers=(int, float)):

35
test/test_util.py
View File

@@ -541,6 +541,41 @@ class TestOther(unittest.TestCase):
r = util.filter_dict(d)
self.assertEqual(r, {"foo": 123})
def test_enumerate_reversed(self):
seq = [11, 22, 33]
result = [(3, 33), (2, 22), (1, 11)]
def gen():
for i in seq:
yield i
def gen_2():
yield from seq
def assertEqual(it1, it2):
ae = self.assertEqual
for i1, i2 in zip(it1, it2, strict=True):
ae(i1, i2)
assertEqual(
util.enumerate_reversed(seq), [(2, 33), (1, 22), (0, 11)])
assertEqual(
util.enumerate_reversed(seq, 1), result)
assertEqual(
util.enumerate_reversed(seq, 2), [(4, 33), (3, 22), (2, 11)])
assertEqual(
util.enumerate_reversed(gen(), 0, len(seq)),
[(2, 33), (1, 22), (0, 11)])
assertEqual(
util.enumerate_reversed(gen(), 1, len(seq)), result)
assertEqual(
util.enumerate_reversed(gen_2(), 1, len(seq)), result)
assertEqual(
util.enumerate_reversed(gen_2(), 2, len(seq)),
[(4, 33), (3, 22), (2, 11)])
def test_number_to_string(self, f=util.number_to_string):
self.assertEqual(f(1) , "1")
self.assertEqual(f(1.0) , "1.0")