fix: yield unique vgroups while keeping sort order
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from lektor.context import get_ctx
|
||||
from typing import TYPE_CHECKING, Set, List, Union, Iterable, Iterator
|
||||
from typing import TYPE_CHECKING, Set, Dict, Union, Iterable, Iterator
|
||||
import weakref
|
||||
from .util import split_strip
|
||||
if TYPE_CHECKING:
|
||||
@@ -68,7 +68,9 @@ class VGroups:
|
||||
GroupByRef.of(builder).make_once(keys) # ensure did cluster before use
|
||||
# find groups
|
||||
proc_list = [record]
|
||||
done_list = [] # type: List[GroupBySource]
|
||||
# Note: An ordered Set would be more approptiate but there is none.
|
||||
# So lets use the insert order of dict (guaranteed since Python 3.7)
|
||||
done_list = {} # type: Dict[GroupBySource, None]
|
||||
while proc_list:
|
||||
page = proc_list.pop(0)
|
||||
if recursive and hasattr(page, 'children'):
|
||||
@@ -80,7 +82,7 @@ class VGroups:
|
||||
continue
|
||||
if keys and vobj().config.key not in keys:
|
||||
continue
|
||||
done_list.append(vobj())
|
||||
done_list[vobj()] = None # we only need the keys()
|
||||
|
||||
# manage config dependencies
|
||||
deps = set() # type: Set[str]
|
||||
|
||||
Reference in New Issue
Block a user