stylish add

Author: ttehasi

README.md

@@ -5,13 +5,13 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/88675eaf4e4ca1e04a88/maintainability)](https://codeclimate.com/github/ttehasi/python-project-50/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/88675eaf4e4ca1e04a88/test_coverage)](https://codeclimate.com/github/ttehasi/python-project-50/test_coverage)
 
-## Asciinema JSON file:
+## Asciinema JSON file (default usage):
 
 [![asciicast](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9.svg)](https://asciinema.org/a/djCfDR2K0qTnGeiqy4hVWhLO9)
 
 [![asciicast](https://asciinema.org/a/mkiLw1Llc4brT2wrSHaMW7H4T.svg)](https://asciinema.org/a/mkiLw1Llc4brT2wrSHaMW7H4T)
 
-## Asciinema YAML file:
+## Asciinema YAML file (default usage):
 
 [![asciicast](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU.svg)](https://asciinema.org/a/H918cvPLQohe9DMY2NDxLKcaU)
 

gendiff/gen_diff.py

@@ -1,5 +1,6 @@
 import json
 
+from gendiff.gen_diff_stylish import gen_diff_stylish
 from gendiff.pars_yaml import open_ymlf
 
 
@@ -8,57 +9,37 @@ def open_f(path_to_file) -> dict:
         return json.load(file)
 
 
-def stringify(value, lvl=1):
-    if isinstance(value, dict):
-        result = '{\n'
-        for el, val in value.items():
-            result += f'{'    ' * lvl}{el}: '
-            result += stringify(val, lvl + 1) + '\n'
-        result += '    ' * (lvl - 1) + '}'
-    else:
-        if value is True:
-            result = 'true'
-        elif value is None:
-            result = 'null'
-        elif value is False:
-            result = 'false'
-        else:
-            result = str(value)
-    return result
-
-
-def generate_diff(file1, file2, lvl=1, format_name='stylish'):
-    if isinstance(file1, str) and isinstance(file2, str):
-        if str(file1)[-5:] == '.json' and str(file2)[-5:] == '.json':
-            file1 = open_f(file1)
-            file2 = open_f(file2)
-        else:
-            file1 = open_ymlf(file1)
-            file2 = open_ymlf(file2)
-    result = ''
+def difference(file1, file2):
+    result = {}
     if isinstance(file1, dict) and isinstance(file2, dict):
-        result += '{\n'
         keys1 = sorted(list(file1.keys()))
         keys2 = sorted(list(file2.keys()))
         keys12 = sorted(set(keys1 + keys2))
         for i in keys12:
             if i in keys1 and i in keys2:
                 if isinstance(file1[i], dict) and isinstance(file2[i], dict):
-                    result += f'{'    ' * lvl}{i}: '
-                    result += generate_diff(file1[i], file2[i], lvl + 1) + '\n'
+                    result[i] = ('nested', generate_diff(file1[i], file2[i]))
                 else:
                     if file1[i] == file2[i]:
-                        result += f'{'    ' * lvl}{i}: {file1[i]}' + '\n'
+                        result[i] = ('unchanged', file1[i])
                     else:
-                        result += (f'{'    ' * (lvl - 1) + '  - '}{i}: '
-                                   f'{stringify(file1[i], lvl=lvl + 1)}') + '\n'
-                        result += (f'{'    ' * (lvl - 1) + '  + '}{i}: '
-                                   f'{stringify(file2[i], lvl=lvl + 1)}') + '\n'
+                        result[i] = ('changed', file1[i], file2[i])
             if (i in keys1) and (i not in keys2):
-                result += (f'{'    ' * (lvl - 1) + '  - '}{i}: '
-                           f'{stringify(file1[i], lvl=lvl + 1)}') + '\n'
+                result[i] = ('removed', file1[i])
             if (i not in keys1) and (i in keys2):
-                result += (f'{'    ' * (lvl - 1) + '  + '}{i}: '
-                           f'{stringify(file2[i], lvl=lvl + 1)}') + '\n'
-        result += '    ' * (lvl - 1) + '}'
+                result[i] = ('added', file2[i])
     return result
+
+
+def generate_diff(file1, file2, format_name='stylish'):
+    if isinstance(file1, str) and isinstance(file2, str):
+        if str(file1)[-5:] == '.json' and str(file2)[-5:] == '.json':
+            file1 = open_f(file1)
+            file2 = open_f(file2)
+        else:
+            file1 = open_ymlf(file1)
+            file2 = open_ymlf(file2)
+    diff = difference(file1, file2)
+    match format_name:
+        case 'stylish':
+             return gen_diff_stylish(diff)

gendiff/gen_diff_stylish.py

@@ -0,0 +1,44 @@
+def stringify(value, lvl=1):
+    if isinstance(value, dict):
+        result = '{\n'
+        for el, val in value.items():
+            result += f'{'    ' * lvl}{el}: '
+            result += stringify(val, lvl + 1) + '\n'
+        result += '    ' * (lvl - 1) + '}'
+    else:
+        if value is True:
+            result = 'true'
+        elif value is None:
+            result = 'null'
+        elif value is False:
+            result = 'false'
+        else:
+            result = str(value)
+    return result
+
+
+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 += (f'{'    ' * lvl}{el}:'
+                            f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
+                case 'added':
+                    res += (f'{'    ' * (lvl - 1) + '  + '}{el}:'
+                            f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
+                case 'removed':
+                    res += (f'{'    ' * (lvl - 1) + '  - '}{el}:'
+                            f' {stringify(val[1], lvl=lvl + 1)}') + '\n'
+                case 'changed':
+                    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) + '}'
+    return res