7th step

Author: ttehasi

gendiff/gen_diff.py

@@ -8,26 +8,56 @@ def open_f(path_to_file) -> dict:
         return json.load(file)
 
 
-def generate_diff(file1, file2):
-    if str(file1)[-5:] == '.json' and str(file2)[-5:] == '.json':
-        file1 = open_f(file1)
-        file2 = open_f(file2)
+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:
-        file1 = open_ymlf(file1)
-        file2 = open_ymlf(file2)
-    res = '''{
-'''
-    for i in sorted(list(file1)):
-        if i in sorted(list(file2)):
-            if file1[i] == file2[i]:
-                res += f'    {i}: {file1[i]}\n'
-            else:
-                res += f'''  - {i}: {file1[i]}
-  + {i}: {file2[i]}\n'''
+        if value is True:
+            result = 'true'
+        elif value is None:
+            result = 'null'
+        elif value is False:
+            result = 'false'
         else:
-            res += f'  - {i}: {file1[i]}\n'
-    for i in sorted(list(file2)):
-        if i not in sorted(list(file1)):
-            res += f'  + {i}: {file2[i]}\n'
-    res += '}'
-    return res
+            result = str(value)
+    return result
+
+
+def generate_diff(file1, file2, lvl=1):
+    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 = '{\n'
+    if isinstance(file1, dict) and isinstance(file2, dict):
+        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'
+                else:
+                    if file1[i] == file2[i]:
+                        result += f'{'    ' * lvl}{i}: {file1[i]}' + '\n'
+                    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'
+            if (i in keys1) and (i not in keys2):
+                result += (f'{'    ' * (lvl - 1) + '  - '}{i}: '
+                           f'{stringify(file1[i], lvl=lvl + 1)}') + '\n'
+            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) + '}'
+    return result

tests/test_data/file11.json

@@ -0,0 +1,26 @@
+{
+  "common": {
+    "setting1": "Value 1",
+    "setting2": 200,
+    "setting3": true,
+    "setting6": {
+      "key": "value",
+      "doge": {
+        "wow": ""
+      }
+    }
+  },
+  "group1": {
+    "baz": "bas",
+    "foo": "bar",
+    "nest": {
+      "key": "value"
+    }
+  },
+  "group2": {
+    "abc": 12345,
+    "deep": {
+      "id": 45
+    }
+  }
+}

tests/test_data/file11.yml

@@ -0,0 +1,17 @@
+common:
+  setting1: Value 1
+  setting2: 200
+  setting3: true
+  setting6:
+    key: value
+    doge:
+      wow: ''
+group1:
+  baz: bas
+  foo: bar
+  nest:
+    key: value
+group2:
+  abc: 12345
+  deep:
+    id: 45

tests/test_data/file22.json

@@ -0,0 +1,31 @@
+{
+  "common": {
+    "follow": false,
+    "setting1": "Value 1",
+    "setting3": null,
+    "setting4": "blah blah",
+    "setting5": {
+      "key5": "value5"
+    },
+    "setting6": {
+      "key": "value",
+      "ops": "vops",
+      "doge": {
+        "wow": "so much"
+      }
+    }
+  },
+  "group1": {
+    "foo": "bar",
+    "baz": "bars",
+    "nest": "str"
+  },
+  "group3": {
+    "deep": {
+      "id": {
+        "number": 45
+      }
+    },
+    "fee": 100500
+  }
+}

tests/test_data/file22.yml

@@ -0,0 +1,21 @@
+common:
+  follow: false
+  setting1: Value 1
+  setting3: null
+  setting4: blah blah
+  setting5:
+    key5: value5
+  setting6:
+    key: value
+    ops: vops
+    doge:
+      wow: so much
+group1:
+  foo: bar
+  baz: bars
+  nest: str
+group3:
+  deep:
+    id:
+      number: 45
+  fee: 100500

tests/test_data/result_file11_file22.txt

@@ -0,0 +1,44 @@
+{
+    common: {
+      + follow: False
+        setting1: Value 1
+      - setting2: 200
+      - setting3: True
+      + setting3: null
+      + setting4: blah blah
+      + setting5: {
+            key5: value5
+        }
+        setting6: {
+            doge: {
+              - wow:
+              + wow: so much
+            }
+            key: value
+          + ops: vops
+        }
+    }
+    group1: {
+      - baz: bas
+      + baz: bars
+        foo: bar
+      - nest: {
+            key: value
+        }
+      + nest: str
+    }
+  - group2: {
+        abc: 12345
+        deep: {
+            id: 45
+        }
+    }
+  + group3: {
+        deep: {
+            id: {
+                number: 45
+            }
+        }
+        fee: 100500
+    }
+}

tests/test_generate_diff.py

@@ -18,4 +18,4 @@ def test_generate_diff():
     yam_act = generate_diff(get_test_data_path('file1.yml'),
                            get_test_data_path('file2.yml'))
     assert actual == result
-    assert yam_act == result
+    assert yam_act == result

tests/test_generate_diff_recurs.py

@@ -0,0 +1,12 @@
+from gendiff.gen_diff import generate_diff
+from tests.test_generate_diff import get_test_data_path, read_file
+
+
+def test_generate_diff():
+    result = read_file('result_file11_file22.txt')
+    actual = generate_diff(get_test_data_path('file11.json'),
+                           get_test_data_path('file22.json'))
+    yam_act = generate_diff(get_test_data_path('file11.yml'),
+                           get_test_data_path('file22.yml'))
+    assert actual == result
+    assert yam_act == result