Skip to content

Commit

Permalink
refactor format
Browse files Browse the repository at this point in the history
  • Loading branch information
prStudentka committed Jan 4, 2024
1 parent 939fae0 commit af16dec
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
14 changes: 7 additions & 7 deletions gendiff/difference.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
def make_value(key, value, meta='unchanged'):
def make_value(key, value, status='unchanged'):
return {
'name': key,
'value': value,
'meta': meta,
'meta': status,
'type': 'value'
}


def make_nest(key, children, meta='unchanged'):
def make_nest(key, children, status='unchanged'):
return {
'name': key,
'children': children,
'meta': meta,
'meta': status,
'type': 'nest'
}


def choose_fill(key, item, meta='unchanged'):
def choose_fill(key, item, status='unchanged'):
if type(item) is not dict:
return make_value(key, item, meta)
return make_value(key, item, status)
children = []
for key_item in item.keys():
children.append(choose_fill(key_item, item[key_item]))
return make_nest(key, children, meta)
return make_nest(key, children, status)


def differ(data1, data2):
Expand Down
8 changes: 6 additions & 2 deletions gendiff/formater/to_stylish.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def convert(elem):
return _DICT_CONVERT.get(str(elem), elem)


def format(diffs, lvl=1):
def get_stylish(diffs, lvl=1):
result = ['{']
indent = (lvl * _INDENT - 2) * _REPLACER

Expand All @@ -39,10 +39,14 @@ def walk(values):
result.append(value)
if is_nest(item):
if sign:
value = f'{deep}{format(item["children"], lvl + 1)}'
value = f'{deep}{get_stylish(item["children"], lvl + 1)}'
result.append(value)
else:
walk(item['children'])
walk(diffs)
result.append(f'{(_INDENT * (lvl - 1)) * _REPLACER}}}')
return '\n'.join(result)


def format(diff):
return get_stylish(diff)

0 comments on commit af16dec

Please sign in to comment.