Изменена структура папок

Author: experiment0

gendiff/__init__.py

@@ -1,4 +1,4 @@
-from gendiff.controller import generate_diff
+from gendiff.gendiff import generate_diff
 
 __all__ = [
     "generate_diff",

gendiff/models/calc_diff.py gendiff/diffs_model.pygendiff/models/calc_diff.py renamed to gendiff/diffs_model.py

@@ -0,0 +1,31 @@
+from typing import Literal
+
+from gendiff.diffs_model import DiffsType
+from gendiff.formatters.json import format_to_json
+from gendiff.formatters.plain import format_to_plain
+from gendiff.formatters.stylish import format_to_stylish
+
+DiffViewType = Literal["stylish", "stylish_colored", "json", "plain"]
+
+
+def format_diffs(
+    diffs: DiffsType, 
+    view_type: DiffViewType = "stylish"
+) -> str:
+    match view_type:
+        case "stylish":
+            return format_to_stylish(diffs)
+        case "stylish_colored":
+            return format_to_stylish(diffs, is_colored=True)
+        case "json":
+            return format_to_json(diffs)
+        case "plain":
+            return format_to_plain(diffs)
+        case _:
+            raise ValueError("Unknown name for format output.")
+
+
+__all__ = [
+    "DiffViewType",
+    "format_diffs",
+]

gendiff/formatters/__init__.py

@@ -1,13 +1,13 @@
 import json
 
-from gendiff.models.calc_diff import DiffsType
+from gendiff.diffs_model import DiffsType
 
 INDENT_SYMBOL = " "
 INDENT_LENGTH = 4
 INDENT = INDENT_SYMBOL * INDENT_LENGTH
 
 
-def get_json_view(diffs: DiffsType) -> str:
+def format_to_json(diffs: DiffsType) -> str:
     diffs_for_json = [d.model_dump(exclude_none=True) for d in diffs]
     dict_for_json = {"diffs": diffs_for_json}
 

gendiff/views/json/view.py gendiff/formatters/json.pygendiff/views/json/view.py renamed to gendiff/formatters/json.py

@@ -1,10 +1,10 @@
 from typing import List
 
-from gendiff.models.calc_diff import DiffsType
-from gendiff.views.plain.utils import dict_value_to_str
+from gendiff.diffs_model import DiffsType
+from gendiff.formatters.plain_helpers import dict_value_to_str
 
 
-def get_plain_view(diffs: DiffsType, property_path: List[str] = []) -> str:
+def format_to_plain(diffs: DiffsType, property_path: List[str] = []) -> str:
     diffs_lines = []
 
     for d in diffs:
@@ -14,7 +14,7 @@ def get_plain_view(diffs: DiffsType, property_path: List[str] = []) -> str:
         match d.result:
             case "equal":
                 if d.children is not None:
-                    children_view = get_plain_view(
+                    children_view = format_to_plain(
                         d.children,
                         current_property_path,
                     )

gendiff/views/plain/view.py gendiff/formatters/plain.pygendiff/views/plain/view.py renamed to gendiff/formatters/plain.py

@@ -1,4 +1,4 @@
-from gendiff.models.calc_diff import DictValueType
+from gendiff.diffs_model import DictValueType
 
 
 def dict_value_to_str(value: DictValueType) -> str:

gendiff/views/plain/utils.py gendiff/formatters/plain_helpers.pygendiff/views/plain/utils.py renamed to gendiff/formatters/plain_helpers.py

@@ -1,12 +1,12 @@
-from gendiff.models.calc_diff import DiffsType
-from gendiff.views.stylish.utils import (
+from gendiff.diffs_model import DiffsType
+from gendiff.formatters.stylish_helpers import (
     INDENT,
     get_diff_line,
     get_multilines_value_with_indent,
 )
 
 
-def get_stylish_view(diffs: DiffsType, is_colored: bool = False) -> str:
+def format_to_stylish(diffs: DiffsType, is_colored: bool = False) -> str:
     level = 1
     diffs_lines = []
     diffs_lines.append("{")
@@ -19,7 +19,7 @@ def get_stylish_view(diffs: DiffsType, is_colored: bool = False) -> str:
         match d.result:
             case "equal":
                 if d.children is not None:
-                    children_view = get_stylish_view(d.children, is_colored)
+                    children_view = format_to_stylish(d.children, is_colored)
                     children_view = get_multilines_value_with_indent(
                         children_view,
                         INDENT * level

gendiff/views/stylish/view.py gendiff/formatters/stylish.pygendiff/views/stylish/view.py renamed to gendiff/formatters/stylish.py

@@ -1,6 +1,6 @@
 from typing import Dict, Optional, Union
 
-from gendiff.models.calc_diff import (
+from gendiff.diffs_model import (
     DictValueType,
     ResultType,
 )

gendiff/views/stylish/utils.py gendiff/formatters/stylish_helpers.pygendiff/views/stylish/utils.py renamed to gendiff/formatters/stylish_helpers.py

@@ -1,6 +1,6 @@
-from gendiff.models.calc_diff import get_diffs
-from gendiff.utils.file_parsing import get_data_from_file
-from gendiff.views.main import DiffViewType, get_diffs_view
+from gendiff.diffs_model import get_diffs
+from gendiff.formatters import DiffViewType, format_diffs
+from gendiff.utils.file_reader import get_data_from_file
 
 
 def generate_diff(
@@ -12,6 +12,6 @@ def generate_diff(
     dict2 = get_data_from_file(file_path2)
 
     diffs = get_diffs(dict1, dict2)
-    diffs_view = get_diffs_view(diffs, view_type)
+    formatted_diffs = format_diffs(diffs, view_type)
 
-    return diffs_view
+    return formatted_diffs