original_file to input_file

new test.dxf
generate_viewable function separeted into 2 functions

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -291,14 +291,3 @@ def create_coordinate_system(
     create_crs(
         geode_object, data, name, input_coordiante_system, output_coordiante_system
     )
-
-
-# def file_exists_in_upload(filename: str) -> bool:
-#     """Vérifie si un fichier existe dans le dossier d'upload."""
-#     file_path = upload_file_path(filename)
-#     return os.path.exists(file_path)
-
-# def file_exists_in_data(data_id: str, filename: str) -> bool:
-#     """Vérifie si un fichier existe dans le dossier de données."""
-#     file_path = data_file_path(data_id, filename)
-#     return os.path.exists(file_path)

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -242,14 +242,10 @@ def geode_objects_and_output_extensions():
 )
 def save_viewable_file():
     utils_functions.validate_request(flask.request, save_viewable_file_json)
-
-    file_path = geode_functions.upload_file_path(flask.request.json["filename"])
-    data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
     return flask.make_response(
-        utils_functions.generate_native_viewable_and_light_viewable(
+        utils_functions.generate_native_viewable_and_light_viewable_from_file(
             flask.request.json["input_geode_object"],
-            data,
-            original_filename=flask.request.json["filename"],
+            input_filename=flask.request.json["filename"],
         ),
         200,
     )
@@ -272,7 +268,7 @@ def create_point():
     builder.create_point(opengeode.Point3D([x, y, z]))
     builder.set_name(title)
     return flask.make_response(
-        utils_functions.generate_native_viewable_and_light_viewable(
+        utils_functions.generate_native_viewable_and_light_viewable_from_object(
             "PointSet3D", PointSet3D
         ),
         200,

src/opengeodeweb_back/utils_functions.py

@@ -143,29 +143,14 @@ def handle_exception(e):
     response.content_type = "application/json"
     return response
 
-
-def generate_native_viewable_and_light_viewable(
-    geode_object, data, original_filename=None
-):
+def generate_native_viewable_and_light_viewable_from_object(geode_object, data):
     generated_id = str(uuid.uuid4()).replace("-", "")
     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
     data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
     name = data.name()
     object_type = geode_functions.get_object_type(geode_object)
 
     additional_files_copied = []
-    if original_filename:
-        additional = geode_functions.additional_files(geode_object, original_filename)
-        for additional_file in additional.mandatory_files + additional.optional_files:
-            if not additional_file.is_missing:
-                source_path = os.path.join(
-                    os.path.dirname(original_filename), additional_file.filename
-                )
-                if os.path.exists(source_path):
-                    dest_path = os.path.join(data_path, additional_file.filename)
-                    os.makedirs(os.path.dirname(dest_path), exist_ok=True)
-                    shutil.copy2(source_path, dest_path)
-                    additional_files_copied.append(additional_file.filename)
 
     saved_native_file_path = geode_functions.save(
         geode_object,
@@ -191,9 +176,109 @@ def generate_native_viewable_and_light_viewable(
         "object_type": object_type,
         "binary_light_viewable": binary_light_viewable.decode("utf-8"),
         "geode_object": geode_object,
+        "input_files": additional_files_copied,
     }
+    return result
+
+def generate_native_viewable_and_light_viewable_from_file(geode_object, input_filename):
+    generated_id = str(uuid.uuid4()).replace("-", "")
+    DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
+    data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
+    os.makedirs(data_path, exist_ok=True)
 
-    if additional_files_copied:
-        result["additional_files"] = additional_files_copied
+    data = geode_functions.load(geode_object, input_filename)
+    name = data.name()
+    object_type = geode_functions.get_object_type(geode_object)
 
-    return result
+    additional_files_copied = []
+    additional = geode_functions.additional_files(geode_object, input_filename)
+    for additional_file in additional.mandatory_files + additional.optional_files:
+        if additional_file.is_missing:
+            continue
+        source_path = os.path.join(os.path.dirname(input_filename), additional_file.filename)
+        if not os.path.exists(source_path):
+            continue
+        dest_path = os.path.join(data_path, additional_file.filename)
+        os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+        shutil.copy2(source_path, dest_path)
+        additional_files_copied.append(additional_file.filename)
+
+    saved_native_file_path = geode_functions.save(
+        geode_object,
+        data,
+        data_path,
+        "native." + data.native_extension(),
+    )
+    saved_viewable_file_path = geode_functions.save_viewable(
+        geode_object, data, data_path, "viewable"
+    )
+    viewable_file_name = os.path.basename(saved_viewable_file_path)
+    saved_light_viewable_file_path = geode_functions.save_light_viewable(
+        geode_object, data, data_path, "light_viewable"
+    )
+    with open(saved_light_viewable_file_path, "rb") as f:
+        binary_light_viewable = f.read()
+
+    return {
+        "name": name,
+        "native_file_name": os.path.basename(saved_native_file_path[0]),
+        "viewable_file_name": viewable_file_name,
+        "id": generated_id,
+        "object_type": object_type,
+        "binary_light_viewable": binary_light_viewable.decode("utf-8"),
+        "geode_object": geode_object,
+        "input_files": additional_files_copied,
+    }
+
+
+# def generate_native_viewable_and_light_viewable(
+#     geode_object, data, input_filename
+# ):
+#     generated_id = str(uuid.uuid4()).replace("-", "")
+#     DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
+#     data_path = os.path.join(DATA_FOLDER_PATH, generated_id)
+#     name = data.name()
+#     object_type = geode_functions.get_object_type(geode_object)
+
+#     additional_files_copied = []
+#     additional = geode_functions.additional_files(geode_object, input_filename)
+#     for additional_file in additional.mandatory_files + additional.optional_files:
+#         if additional_file.is_missing:
+#             continue
+#         source_path = os.path.join(
+#             os.path.dirname(input_filename), additional_file.filename
+#         )
+#         if not os.path.exists(source_path):
+#             continue
+#         dest_path = os.path.join(data_path, additional_file.filename)
+#         os.makedirs(os.path.dirname(dest_path), exist_ok=True)
+#         shutil.copy2(source_path, dest_path)
+#         additional_files_copied.append(additional_file.filename)
+
+#     saved_native_file_path = geode_functions.save(
+#         geode_object,
+#         data,
+#         data_path,
+#         "native." + data.native_extension(),
+#     )
+#     saved_viewable_file_path = geode_functions.save_viewable(
+#         geode_object, data, data_path, "viewable"
+#     )
+#     viewable_file_name = os.path.basename(saved_viewable_file_path)
+#     saved_light_viewable_file_path = geode_functions.save_light_viewable(
+#         geode_object, data, data_path, "light_viewable"
+#     )
+#     with open(saved_light_viewable_file_path, "rb") as f:
+#         binary_light_viewable = f.read()
+
+#     result = {
+#         "name": name,
+#         "native_file_name": os.path.basename(saved_native_file_path[0]),
+#         "viewable_file_name": viewable_file_name,
+#         "id": generated_id,
+#         "object_type": object_type,
+#         "binary_light_viewable": binary_light_viewable.decode("utf-8"),
+#         "geode_object": geode_object,
+#         "input_files": additional_files_copied
+#     }
+#     return result