OpenGeodeWeb-Back 3.0.0rc9__tar.gz → 3.0.0rc11__tar.gz

{OpenGeodeWeb-Back-3.0.0rc9/src/OpenGeodeWeb_Back.egg-info → OpenGeodeWeb-Back-3.0.0rc11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 3.0.0rc9
+Version: 3.0.0rc11
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{OpenGeodeWeb-Back-3.0.0rc9 → OpenGeodeWeb-Back-3.0.0rc11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "3.0.0-rc.9"
+version = "3.0.0-rc.11"
 dynamic = ["dependencies"]
 authors = [
   { name="Geode-solutions", email="team-web@geode-solutions.com" },

{OpenGeodeWeb-Back-3.0.0rc9 → OpenGeodeWeb-Back-3.0.0rc11/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: OpenGeodeWeb-Back
-Version: 3.0.0rc9
+Version: 3.0.0rc11
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{OpenGeodeWeb-Back-3.0.0rc9 → OpenGeodeWeb-Back-3.0.0rc11}/src/opengeodeweb_back/geode_functions.py

@@ -113,18 +113,26 @@ def geode_object_output_extensions(geode_object: str):
     return geode_object_output_list_creators
 
 
-def list_input_extensions(key: str = None):
-    extensions_list = []
+def filter_geode_objects(key: str = None):
+    geode_objects_filtered_list = []
     for geode_object, value in geode_objects_dict().items():
-        if key != None:
+        if key != None and key != "":
             if key in value:
                 if type(value[key]) == bool:
-                    if value[key] == True:
-                        extensions_list += geode_object_input_extensions(geode_object)
+                    geode_objects_filtered_list.append(geode_object)
                 else:
-                    extensions_list += geode_object_input_extensions(geode_object)
+                    geode_objects_filtered_list.append(geode_object)
         else:
-            extensions_list += geode_object_input_extensions(geode_object)
+            geode_objects_filtered_list.append(geode_object)
+    geode_objects_filtered_list.sort()
+    return geode_objects_filtered_list
+
+
+def list_input_extensions(key: str = None):
+    extensions_list = []
+    geode_objects_filtered_list = filter_geode_objects(key)
+    for geode_object in geode_objects_filtered_list:
+        extensions_list += geode_object_input_extensions(geode_object)
 
     extensions_list = list(set(extensions_list))
     extensions_list.sort()
@@ -141,21 +149,12 @@ def list_geode_objects(
 ):
     return_dict = {}
     file_extension = extension_from_filename(os.path.basename(file_absolute_path))
+    geode_objects_filtered_list = filter_geode_objects(key)
 
-    for geode_object, value in geode_objects_dict().items():
+    for geode_object in geode_objects_filtered_list:
         if has_creator(geode_object, file_extension):
             file_is_loadable = is_loadable(geode_object, file_absolute_path)
-            if key != None:
-                if key in value:
-                    if type(value[key]) == bool:
-                        if value[key] == True:
-                            return_dict[geode_object] = {
-                                "is_loadable": file_is_loadable
-                            }
-                    else:
-                        return_dict[geode_object] = {"is_loadable": file_is_loadable}
-            else:
-                return_dict[geode_object] = {"is_loadable": file_is_loadable}
+            return_dict[geode_object] = {"is_loadable": file_is_loadable}
     return return_dict
 
 

{OpenGeodeWeb-Back-3.0.0rc9 → OpenGeodeWeb-Back-3.0.0rc11}/tests/test_functions.py

@@ -174,10 +174,19 @@ def test_geode_object_output_extensions():
                         output_extension_value,
                     ) in output_geode_object_value.items():
                         assert type(output_extension) is str
-                        assert type(output_extension_value) is dict
                         assert type(output_extension_value["is_saveable"]) is bool
 
 
+def test_filter_geode_objects():
+    filters_list = ["", "crs", "inspector", None]
+
+    for filter in filters_list:
+        geode_objects_filtered_list = geode_functions.filter_geode_objects(filter)
+        assert type(geode_objects_filtered_list) is list
+        for geode_object in geode_objects_filtered_list:
+            assert type(geode_object) is str
+
+
 def test_list_input_extensions():
     keys_array = ["crs", "inspector", None]
     for geode_object, value in geode_objects.geode_objects_dict().items():
@@ -260,7 +269,6 @@ def test_geode_objects_output_extensions():
                         output_extension,
                         output_extension_value,
                     ) in output_geode_object_value.items():
-                        assert type(output_extension_value) is dict
                         assert type(output_extension_value["is_saveable"]) is bool