Skip to content

Commit 965cc08

Browse files
fix(functions): fix typos & tests
1 parent 7a56a81 commit 965cc08

File tree

3 files changed

+28
-343
lines changed

3 files changed

+28
-343
lines changed

geode_objects.py

Lines changed: 0 additions & 324 deletions
This file was deleted.

src/opengeodeweb_back/geode_functions.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,15 @@ def get_geode_object_output_extensions(geode_object: str):
113113
def list_input_extensions(key: str = None):
114114
extensions_list = []
115115
for geode_object, value in objects_list().items():
116-
if key != None and key in value:
117-
if type(value[key]) == bool:
118-
if value[key] == True:
116+
if key != None:
117+
if key in value:
118+
if type(value[key]) == bool:
119+
if value[key] == True:
120+
extensions_list += get_geode_object_input_extensions(
121+
geode_object
122+
)
123+
else:
119124
extensions_list += get_geode_object_input_extensions(geode_object)
120-
else:
121-
extensions_list += get_geode_object_input_extensions(geode_object)
122125
else:
123126
extensions_list += get_geode_object_input_extensions(geode_object)
124127

@@ -127,8 +130,9 @@ def list_input_extensions(key: str = None):
127130
return extensions_list
128131

129132

130-
def has_creator(input_factories, extension: str):
131-
for input in input_factories:
133+
def has_creator(geode_object: str, extension: str):
134+
geode_object_input_factory = get_input_factory(geode_object)
135+
for input in geode_object_input_factory:
132136
if input.has_creator(extension):
133137
return True
134138
return False
@@ -137,17 +141,17 @@ def has_creator(input_factories, extension: str):
137141
def list_geode_objects(extension: str, key: str = None):
138142
geode_objects_list = []
139143
for geode_object, value in objects_list().items():
140-
geode_object_input_factory = get_input_factory(geode_object)
141144
if key != None:
142145
if key in value:
143146
if type(value[key]) == bool:
144147
if value[key] == True:
145-
if has_creator(geode_object_input_factory, extension):
148+
if has_creator(geode_object, extension):
146149
geode_objects_list.append(geode_object)
147-
elif has_creator(geode_object_input_factory, extension):
150+
elif has_creator(geode_object, extension):
148151
geode_objects_list.append(geode_object)
149-
elif has_creator(geode_object_input_factory, extension):
150-
geode_objects_list.append(geode_object)
152+
else:
153+
if has_creator(geode_object, extension):
154+
geode_objects_list.append(geode_object)
151155

152156
geode_objects_list.sort()
153157
return geode_objects_list

0 commit comments

Comments
 (0)