self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-02-07 13:08:22 +02:00
Code Issues Releases Activity

added docstring to Logger. use generators.

Browse Source
This commit is contained in:
Alexander Graf 2021-02-22 20:35:23 +01:00
parent bde7a2b6c4
commit 0a9f732faa
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/mailu/models.py
View File

@ -83,7 +83,7 @@ class CommaSeparatedList(db.TypeDecorator):
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
""" split comma separated string to list """ """ split comma separated string to list """
return list(filter(bool, [item.strip() for item in value.split(',')])) if value else [] return list(filter(bool, (item.strip() for item in value.split(',')))) if value else []
python_type = list python_type = list

48
core/admin/mailu/schemas.py
View File

@ -76,6 +76,9 @@ class MyYamlLexer(YamlLexer):
yield typ, value yield typ, value
class Logger: class Logger:
""" helps with counting and colorizing
imported and exported data
"""
def __init__(self, want_color=None, can_color=False, debug=False, secrets=False): def __init__(self, want_color=None, can_color=False, debug=False, secrets=False):
@ -195,25 +198,26 @@ class Logger:
continue continue
before = target._dkim_key_on_disk before = target._dkim_key_on_disk
after = target._dkim_key after = target._dkim_key
if before != after: # "de-dupe" messages; this event is fired at every flush
# "de-dupe" messages; this event is fired at every flush if before == after or (target, before, after) in self._dedupe_dkim:
if not (target, before, after) in self._dedupe_dkim: continue
self._dedupe_dkim.add((target, before, after)) self._dedupe_dkim.add((target, before, after))
self._counter.update([('Modified', target.__table__.name)]) self._counter.update([('Modified', target.__table__.name)])
if self.verbose: if self.verbose:
if self.secrets: if self.secrets:
before = before.decode('ascii', 'ignore') before = before.decode('ascii', 'ignore')
after = after.decode('ascii', 'ignore') after = after.decode('ascii', 'ignore')
else: else:
before = HIDDEN if before else '' before = HIDDEN if before else ''
after = HIDDEN if after else '' after = HIDDEN if after else ''
self._log('Modified', target, f'{str(target)!r} dkim_key: {before!r} -> {after!r}') self._log('Modified', target, f'{str(target)!r} dkim_key: {before!r} -> {after!r}')
def track_serialize(self, obj, item, backref=None): def track_serialize(self, obj, item, backref=None):
""" callback method to track import """ """ callback method to track import """
# called for backref modification? # called for backref modification?
if backref is not None: if backref is not None:
self._log('Modified', item, '{target!r} {key}: {before!r} -> {after!r}'.format_map(backref)) self._log(
'Modified', item, '{target!r} {key}: {before!r} -> {after!r}'.format_map(backref))
return return
# show input data? # show input data?
if self.verbose < 2: if self.verbose < 2:
@ -263,7 +267,7 @@ class Logger:
if path: if path:
return res return res
maxlen = max([len(loc) for loc, msg in res]) maxlen = max(len(loc) for loc, msg in res)
res = [f' - {loc.ljust(maxlen)} : {msg}' for loc, msg in res] res = [f' - {loc.ljust(maxlen)} : {msg}' for loc, msg in res]
errors = f'{len(res)} error{["s",""][len(res)==1]}' errors = f'{len(res)} error{["s",""][len(res)==1]}'
res.insert(0, f'[ValidationError] {errors} occurred during input validation') res.insert(0, f'[ValidationError] {errors} occurred during input validation')
@ -279,7 +283,9 @@ class Logger:
if 'attr' in trace.tb_frame.f_locals: if 'attr' in trace.tb_frame.f_locals:
path.append(trace.tb_frame.f_locals['attr']) path.append(trace.tb_frame.f_locals['attr'])
elif trace.tb_frame.f_code.co_name == '_init_fields': elif trace.tb_frame.f_code.co_name == '_init_fields':
spec = ', '.join(['.'.join(path + [key]) for key in trace.tb_frame.f_locals['invalid_fields']]) spec = ', '.join(
'.'.join(path + [key])
for key in trace.tb_frame.f_locals['invalid_fields'])
return f'Invalid filter: {spec}' return f'Invalid filter: {spec}'
trace = trace.tb_next trace = trace.tb_next
return None return None
@ -494,7 +500,7 @@ class CommaSeparatedListField(fields.Raw):
except UnicodeDecodeError as exc: except UnicodeDecodeError as exc:
raise self.make_error("invalid_utf8") from exc raise self.make_error("invalid_utf8") from exc
else: else:
value = filter(None, [item.strip() for item in value.split(',')]) value = filter(bool, (item.strip() for item in value.split(',')))
return list(value) return list(value)
@ -539,7 +545,7 @@ class DkimKeyField(fields.String):
# convert list to str # convert list to str
if isinstance(value, list): if isinstance(value, list):
try: try:
value = ''.join([ensure_text_type(item) for item in value]).strip() value = ''.join(ensure_text_type(item) for item in value).strip()
except UnicodeDecodeError as exc: except UnicodeDecodeError as exc:
raise self.make_error("invalid_utf8") from exc raise self.make_error("invalid_utf8") from exc
@ -855,7 +861,7 @@ class BaseSchema(ma.SQLAlchemyAutoSchema, Storage):
) )
return (key, value.arg) return (key, value.arg)
return dict([set_default(key, value) for key, value in data.items()]) return dict(set_default(key, value) for key, value in data.items())
# convert items to "delete" and filter "prune" item # convert items to "delete" and filter "prune" item
items = [ items = [
@ -1059,11 +1065,11 @@ class BaseSchema(ma.SQLAlchemyAutoSchema, Storage):
# exclude or hide values # exclude or hide values
full = self.context.get('full') full = self.context.get('full')
return type(data)([ return type(data)(
(key, HIDDEN if key in self._hide_by_context else value) (key, HIDDEN if key in self._hide_by_context else value)
for key, value in data.items() for key, value in data.items()
if full or key not in self._exclude_by_value or value not in self._exclude_by_value[key] if full or key not in self._exclude_by_value or value not in self._exclude_by_value[key]
]) )
# this field is used to mark items for deletion # this field is used to mark items for deletion
mark_delete = fields.Boolean(data_key='__delete__', load_only=True) mark_delete = fields.Boolean(data_key='__delete__', load_only=True)