fix(functions): refactor functions

Author: JulienChampagnol

src/opengeodeweb_back/geode_functions.py

@@ -110,23 +110,15 @@ def get_geode_object_output_extensions(geode_object: str):
     return output_list
 
 
-def list_input_extensions(keys: list = []):
+def list_input_extensions(key: str = None):
     extensions_list = []
     for geode_object, value in objects_list().items():
-        if keys:
-            for key in keys:
-                if key in value:
-                    if type(value[key]) == bool:
-                        if value[key] == True:
-                            extensions_list += get_geode_object_input_extensions(
-                                geode_object
-                            )
-                    else:
-                        extensions_list += get_geode_object_input_extensions(
-                            geode_object
-                        )
-                else:
-                    continue
+        if key != None and key in value:
+            if type(value[key]) == bool:
+                if value[key] == True:
+                    extensions_list += get_geode_object_input_extensions(geode_object)
+            else:
+                extensions_list += get_geode_object_input_extensions(geode_object)
         else:
             extensions_list += get_geode_object_input_extensions(geode_object)
 
@@ -139,30 +131,24 @@ def has_creator(input_factories, extension: str):
     for input in input_factories:
         if input.has_creator(extension):
             return True
+    return False
 
 
-def list_geode_objects(extension: str, keys: list = []):
+def list_geode_objects(extension: str, key: str = None):
     geode_objects_list = []
     for geode_object, value in objects_list().items():
         geode_object_input_factory = get_input_factory(geode_object)
-        if keys:
-            for key in keys:
-                if key in value:
-                    if type(value[key]) == bool:
-                        if value[key] == True:
-                            if has_creator(geode_object_input_factory, extension):
-                                print(f"{geode_object=}")
-                                geode_objects_list.append(geode_object)
-                    else:
+        if key != None:
+            if key in value:
+                if type(value[key]) == bool:
+                    if value[key] == True:
                         if has_creator(geode_object_input_factory, extension):
-                            print(f"{geode_object=}")
                             geode_objects_list.append(geode_object)
-                else:
-                    continue
-        else:
-            if has_creator(geode_object_input_factory, extension):
-                print(f"{geode_object=}")
-                geode_objects_list.append(geode_object)
+                elif has_creator(geode_object_input_factory, extension):
+                    geode_objects_list.append(geode_object)
+        elif has_creator(geode_object_input_factory, extension):
+            geode_objects_list.append(geode_object)
+
     geode_objects_list.sort()
     return geode_objects_list
 

tests/test_functions.py

@@ -81,7 +81,7 @@ def test_list_input_extensions():
 def test_list_geode_objects():
     test_list = [
         {
-            "keys_array": ["crs"],
+            "key": "crs",
             "invalid_geode_objects": [
                 "Graph",
                 "RasterImage2D",
@@ -90,7 +90,7 @@ def test_list_geode_objects():
             ],
         },
         {
-            "keys_array": ["inspector"],
+            "key": "inspector",
             "invalid_geode_objects": [
                 "Graph",
                 "RasterImage2D",
@@ -102,21 +102,20 @@ def test_list_geode_objects():
         },
     ]
     for test in test_list:
-        keys_array = test["keys_array"]
+        key = test["key"]
         invalid_geode_objects = test["invalid_geode_objects"]
 
-        input_extensions = geode_functions.list_input_extensions(keys_array)
+        input_extensions = geode_functions.list_input_extensions(key)
         for geode_object, value in geode_objects.objects_list().items():
             for input_extension in input_extensions:
-                for keys in keys_array:
-                    print(f"{input_extension=}")
-                    print(f"{keys=}")
-                    geode_objects_list = geode_functions.list_geode_objects(
-                        input_extension, keys
-                    )
-                    assert type(geode_objects_list) is list
-                    for invalid_geode_object in invalid_geode_objects:
-                        assert invalid_geode_object not in geode_objects_list
+                print(f"{input_extension=}")
+                print(f"{key=}")
+                geode_objects_list = geode_functions.list_geode_objects(
+                    input_extension, key
+                )
+                assert type(geode_objects_list) is list
+                for invalid_geode_object in invalid_geode_objects:
+                    assert invalid_geode_object not in geode_objects_list
 
 
 def test_get_versions():