Skip to content

Commit e726681

Browse files
return data.name()
1 parent ff4ba3c commit e726681

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,7 @@ def save_viewable_file():
240240
data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
241241
generated_id = str(uuid.uuid4()).replace("-", "")
242242

243-
if geode_functions.is_viewable(flask.request.json["input_geode_object"]):
244-
name = data.name()
245-
else:
246-
name = flask.request.json["filename"]
247-
243+
name = data.name()
248244
native_extension = data.native_extension()
249245

250246
absolute_native_file_path = os.path.join(

tests/test_geode_functions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,14 @@ def test_load():
8686
print(f"\t\t{additional_files=}")
8787
if geode_functions.is_loadable(geode_object, file_absolute_path):
8888
data = geode_functions.load(geode_object, file_absolute_path)
89+
data_name = data.name()
8990
if "save_viewable" in value:
9091
uu_id = str(uuid.uuid4()).replace("-", "")
9192
viewable_file_path = geode_functions.save_viewable(
9293
geode_object,
9394
data,
9495
os.path.abspath(f"./output"),
95-
uu_id,
96+
data_name,
9697
)
9798
os.remove(viewable_file_path)
9899
geode_objects_and_output_extensions = (
@@ -174,6 +175,7 @@ def test_geode_object_output_extensions():
174175
geode_objets_and_output_extensions = (
175176
geode_functions.geode_objects_output_extensions(geode_object, data)
176177
)
178+
data_name = data.name()
177179
assert type(geode_objets_and_output_extensions) is dict
178180
for (
179181
output_geode_object,

0 commit comments

Comments
 (0)