ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[refactor] make group_engines_in_tab more readable

This commit is contained in:
Martin Fischer 2022-01-04 13:39:06 +01:00
parent d01e8aa8cc
commit 3dd534e5c0
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
searx/webutils.py
View File

@ -6,12 +6,13 @@ import hmac
import re import re
import inspect import inspect
import itertools import itertools
from typing import Iterable, List, Tuple
from io import StringIO from io import StringIO
from codecs import getincrementalencoder from codecs import getincrementalencoder
from searx import logger, settings from searx import logger, settings
from searx.engines import OTHER_CATEGORY from searx.engines import Engine, OTHER_CATEGORY
VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$') VALID_LANGUAGE_CODE = re.compile(r'^[a-z]{2,3}(-[a-zA-Z]{2})?$')
@ -141,21 +142,21 @@ def is_flask_run_cmdline():
DEFAULT_GROUP_NAME = 'others' DEFAULT_GROUP_NAME = 'others'
def group_engines_in_tab(engines): def group_engines_in_tab(engines: Iterable[Engine]) -> List[Tuple[str, Iterable[Engine]]]:
def engine_sort_key(engine): """Groups an Iterable of engines by their first non tab category"""
return (engine.about.get('language', ''), engine.name)
def group_sort_key(group):
return (group[0] == DEFAULT_GROUP_NAME, group[0].lower())
def get_group(eng): def get_group(eng):
non_tab_categories = [c for c in eng.categories if c not in settings['categories_as_tabs'] + [OTHER_CATEGORY]] non_tab_categories = [c for c in eng.categories if c not in settings['categories_as_tabs'] + [OTHER_CATEGORY]]
return non_tab_categories[0] if len(non_tab_categories) > 0 else DEFAULT_GROUP_NAME return non_tab_categories[0] if len(non_tab_categories) > 0 else DEFAULT_GROUP_NAME
return [ groups = itertools.groupby(sorted(engines, key=get_group), get_group)
(groupname, sorted(engines, key=engine_sort_key))
for groupname, engines in sorted( def group_sort_key(group):
((name, list(engines)) for name, engines in itertools.groupby(sorted(engines, key=get_group), get_group)), return (group[0] == DEFAULT_GROUP_NAME, group[0].lower())
key=group_sort_key,
) sorted_groups = sorted(((name, list(engines)) for name, engines in groups), key=group_sort_key)
]
def engine_sort_key(engine):
return (engine.about.get('language', ''), engine.name)
return [(groupname, sorted(engines, key=engine_sort_key)) for groupname, engines in sorted_groups]