add: fourth step, add func compare files

Author: ZLOI27

gendiff/__init__.py

@@ -1,9 +1,9 @@
-from gendiff.cli import parse_args
-from gendiff.diff import compare_data_from_files, main, read_file_json
+from .cli import parse_args
+from .gendiff import generate_diff, main, read_file_json
 
 __all__ = [
     'parse_args',
-    'compare_data_from_files',
+    'generate_diff',
     'read_file_json',
     'main',
 ]

gendiff/diff.py

@@ -0,0 +1,73 @@
+import json
+
+from .cli import parse_args
+
+
+def main() -> None:
+    args = parse_args()
+    print(generate_diff(args.first_file, args.second_file))
+
+
+def read_file_json(path: str):
+    try:
+        with open(path, mode='r', encoding='utf-8') as file:
+            return json.load(file)
+    except Exception as error:
+        print("Can't read_file_json\n", error)
+        return None
+
+
+def get_list_of_dict_with_sign(data1, data2) -> list:
+    result = [
+        {'key': key, 'sign': ' ', 'value': value}
+        if (key in data2) and (value == data2[key])
+        else {'key': key, 'sign': '-', 'value': value}
+        for key, value in data1.items()
+    ]
+    result.extend([
+        {'key': key, 'sign': '+', 'value': value}
+        for key, value in data2.items()
+        if (key not in data1) or value != data1[key]
+    ])
+    return result
+
+
+def sort_list(items: list):
+    def sort_by_rule(item: dict) -> str:
+        if item['sign'] == '+':
+            sign = '-'
+        elif item['sign'] == '-':
+            sign = '+'
+        else:
+            sign = ' '
+        return str([item['key'], sign])
+    items.sort(key=sort_by_rule)
+    return items
+
+
+def make_str_from_list(items: list) -> str:
+    list_of_str = ['{']
+    for item in items:
+        sign = item['sign']
+
+        if isinstance(item['key'], str):
+            key = item['key']
+        else:
+            key = json.dumps(item['key'])
+
+        if isinstance(item['value'], str):
+            value = item['value']
+        else:
+            value = json.dumps(item['value'])
+
+        list_of_str.append(f"  {sign} {key}: {value}")
+    list_of_str.append('}')
+    return '\n'.join(list_of_str)
+
+
+def generate_diff(path1, path2) -> str:
+    data1 = read_file_json(path1)
+    data2 = read_file_json(path2)
+    result = sort_list(get_list_of_dict_with_sign(data1, data2))
+    result = make_str_from_list(result)
+    return result

gendiff/gendiff.py

@@ -1,4 +1,4 @@
-from gendiff.diff import main
+from ..gendiff import main
 
 if __name__ == '__main__':
     main()

gendiff/scripts/gendiff.py

@@ -13,7 +13,9 @@ dependencies = [
 
 [dependency-groups]
 dev = [
+    "hexlet-code",
     "pytest>=8.4.2",
+    "pytest-cov>=7.0.0",
     "ruff>=0.13.0",
 ]
 
@@ -27,3 +29,6 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = ["gendiff"]
 
+[tool.uv.sources]
+hexlet-code = { workspace = true }
+

pyproject.toml

@@ -0,0 +1,47 @@
+from gendiff.gendiff import generate_diff, read_file_json, sort_list
+
+path1 = '/home/zk/python-project-50/file1.json'
+data1 = {
+    "host": "hexlet.io",
+    "timeout": 50,
+    "proxy": "123.234.53.22",
+    "follow": False
+}
+
+path2 = '/home/zk/python-project-50/file2.json'
+data2 = {
+    "timeout": 20,
+    "verbose": True,
+    "host": "hexlet.io"
+}
+
+
+def test_read_file_json():
+    assert read_file_json(path1) == data1
+
+    assert read_file_json(path2) == data2
+
+
+def test_sort_list():
+    lst = [
+    {'key': 'qwe', 'sign': '+', 'value': 3},
+    {'key': 'abc', 'sign': ' ', 'value': 3},
+    {'key': 'qwe', 'sign': '-', 'value': 3},
+    ]
+    assert sort_list(lst) == [
+        {'key': 'abc', 'sign': ' ', 'value': 3},
+        {'key': 'qwe', 'sign': '-', 'value': 3},
+        {'key': 'qwe', 'sign': '+', 'value': 3},
+    ]
+
+
+def test_generate_diff():
+    right_str = ("{\n"
+    "  - follow: false\n"
+    "    host: hexlet.io\n"
+    "  - proxy: 123.234.53.22\n"
+    "  - timeout: 50\n"
+    "  + timeout: 20\n"
+    "  + verbose: true\n"
+    "}")
+    assert generate_diff(path1, path2) == right_str