stylish format _name

Author: ttehasi

gendiff/gen_diff.py

@@ -18,7 +18,7 @@ def difference(file1, file2):
         for i in keys12:
             if i in keys1 and i in keys2:
                 if isinstance(file1[i], dict) and isinstance(file2[i], dict):
-                    result[i] = ('nested', generate_diff(file1[i], file2[i]))
+                    result[i] = ('nested', difference(file1[i], file2[i]))
                 else:
                     if file1[i] == file2[i]:
                         result[i] = ('unchanged', file1[i])
@@ -42,4 +42,4 @@ def generate_diff(file1, file2, format_name='stylish'):
     diff = difference(file1, file2)
     match format_name:
         case 'stylish':
-             return gen_diff_stylish(diff)
+            return gen_diff_stylish(diff)

gendiff/gen_diff_stylish.py

@@ -18,27 +18,48 @@ def stringify(value, lvl=1):
 
 
 def gen_diff_stylish(value, lvl=1):
-    res = ''
-    if isinstance(value, dict):
-        res += '{\n'
-        for el, val in value.items():
-            match val[0]:
-                case 'nested':
-                    res += f'{'    ' * lvl}{el}: '
-                    res += gen_diff_stylish(val[1], lvl + 1) + '\n'
-                case 'unchanged':
+    res = '{\n'
+    for el, val in value.items():
+        match val[0]:
+            case 'nested':
+                res += f'{'    ' * lvl}{el}: '
+                res += gen_diff_stylish(val[1], lvl + 1) + '\n'
+            case 'unchanged':
+                if val[1] == '':
+                    res += (f'{'    ' * lvl}{el}:'
+                            f'{stringify(val[1], lvl=lvl + 1)}') + '\n'
+                else:
                     res += (f'{'    ' * lvl}{el}:'
                             f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
-                case 'added':
+            case 'added':
+                if val[1] == '':
+                    res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
+                            f'{stringify(val[1], lvl=lvl + 1)}') + '\n'
+                else:
                     res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
                             f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
-                case 'removed':
+            case 'removed':
+                if val[1] == '':
+                    res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
+                            f'{stringify(val[1], lvl=lvl + 1)}') + '\n'
+                else:
                     res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
                             f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
-                case 'changed':
+            case 'changed':
+                if val[1] == '':
+                    res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
+                            f'{stringify(val[1], lvl=lvl + 1)}') + '\n'
+                    res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
+                            f' {stringify(val[2], lvl=lvl + 1)}') + '\n'
+                elif val[2] == '':
+                    res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
+                            f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
+                    res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
+                            f'{stringify(val[2], lvl=lvl + 1)}') + '\n'
+                else:
                     res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
                             f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
                     res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
                             f' {stringify(val[2], lvl=lvl + 1)}') + '\n'
-        res += '    ' * (lvl - 1) + '}'
+    res += '    ' * (lvl - 1) + '}'
     return res

ruff.toml

@@ -6,4 +6,4 @@ line-length = 80
 
 [lint]
 preview = true
-select = ["E", "F", "I", "C90"]
+select = ["E", "F", "I"]