fix: exception when open file

Author: ZLOI27

gendiff/gendiff.py

@@ -11,17 +11,22 @@ def main() -> None:
 
 
 def read_file(path: str):
-    if path.endswith('.json'):
-        load_data = json.load
-    elif path.endswith(('.yaml', '.yml')):
-        load_data = yaml.safe_load
-    else:
-        raise ValueError(f"ERROR: Unsupported format of file {path}.")
     try:
+        if path.endswith('.json'):
+            load_data = json.load
+        elif path.endswith(('.yaml', '.yml')):
+            load_data = yaml.safe_load
+        else:
+            raise ValueError
+
         with open(path, mode='r', encoding='utf-8') as file:
             return load_data(file)
     except OSError as error:
-        raise OSError(f"ERROR: Can't read file {path}. Reason: {error}")
+        print(f"ERROR: Can't read file {path}. Reason: {error}")
+        return None
+    except ValueError:
+        print(f"ERROR: Unsupported format of file {path}.")
+        return None
 
 
 def get_list_of_dict_with_sign(data1, data2) -> list:
@@ -73,6 +78,13 @@ def make_str_from_list(items: list) -> str:
     return '\n'.join(list_of_str)
 
 
+# def check_the_nesting(list_of_dict: list) -> list:
+#     for item in list_of_dict:
+#         value = item['value']
+#         if isinstance(value, dict):
+#             get_list_of_dict_with_sign(value)
+
+
 def generate_diff(path1, path2) -> str:
     dict_data1 = read_file(path1)
     dict_data2 = read_file(path2)

tests/test_data/file3.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/file3.yaml

@@ -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/file4.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/file4.yaml

@@ -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/test_result.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
+    }
+}