add article and pubications
This commit is contained in:
@@ -207,6 +207,8 @@ def add_standard():
|
||||
# Sursa este folderul unde Flet salvează implicit upload-urile
|
||||
source_path = os.path.join(BASE_DIR, "client", "assets", "uploads", os.path.basename(path))
|
||||
dest_path = os.path.join(DOCUMENTS_ROOT, path)
|
||||
print(source_path)
|
||||
print(dest_path)
|
||||
|
||||
if os.path.exists(source_path):
|
||||
os.makedirs(os.path.dirname(dest_path), exist_ok=True)
|
||||
@@ -265,8 +267,8 @@ def delete_standard(id):
|
||||
def add_custom():
|
||||
user_id = get_jwt_identity()
|
||||
data = request.get_json()
|
||||
name = data.get("name")
|
||||
path = data.get("path")
|
||||
name = data.get("name", "").strip()
|
||||
path = data.get("path", "").strip()
|
||||
access = data.get("access")
|
||||
|
||||
if not name or not path:
|
||||
@@ -274,17 +276,31 @@ def add_custom():
|
||||
audit.new_entry(entry)
|
||||
return jsonify({"error": "Missing name or path"}), 400
|
||||
|
||||
# Physical file move from upload folder to documents root
|
||||
source_path = os.path.join(BASE_DIR, "client", "assets", "uploads", os.path.basename(path))
|
||||
dest_path = os.path.join(DOCUMENTS_ROOT, path)
|
||||
# Physical file move from upload folder to documents/Custom folder
|
||||
filename = os.path.basename(path)
|
||||
# The 'path' variable here is the filename from the client, not the full path.
|
||||
# We construct the full path for the database entry later.
|
||||
|
||||
source_path = os.path.join(BASE_DIR, "client", "assets", "uploads", os.path.basename(path))
|
||||
dest_dir = os.path.normpath(os.path.join(DOCUMENTS_ROOT, "Custom"))
|
||||
dest_path = os.path.join(dest_dir, filename) # This is the actual destination path for shutil.move
|
||||
print(source_path)
|
||||
print(dest_path)
|
||||
if os.path.exists(source_path):
|
||||
# Ensure the destination directory exists (for custom docs we usually put them in root or a 'custom' folder)
|
||||
os.makedirs(os.path.dirname(dest_path), exist_ok=True)
|
||||
os.makedirs(dest_dir, exist_ok=True) # Ensure the destination directory exists
|
||||
shutil.move(source_path, dest_path)
|
||||
# Update the 'path' variable to be stored in the database to reflect its new location
|
||||
db_path = f"Custom/{filename}"
|
||||
else:
|
||||
# Log an error and return a response if the source file doesn't exist
|
||||
error_message = f"Source file not found for custom document: {source_path}"
|
||||
print(f"ERROR: {error_message}") # For immediate debug visibility
|
||||
entry = AuditModel(user_id=user_id, action=f"Failed to create custom document (file not found): {name}", status="404 - File not found")
|
||||
audit.new_entry(entry)
|
||||
return jsonify({"error": "Uploaded file not found on server."}), 404
|
||||
|
||||
docs_custom = DocumentsCustom()
|
||||
custom = DocumentsCustomModel(user_id=user_id, name=name, path=path, access=access)
|
||||
custom = DocumentsCustomModel(user_id=user_id, name=name, path=db_path, access=access) # Use db_path here
|
||||
result = docs_custom.new_entry(custom)
|
||||
|
||||
if result:
|
||||
@@ -292,6 +308,10 @@ def add_custom():
|
||||
audit.new_entry(entry)
|
||||
return jsonify({"message": "Custom document created successfully", "id": result}), 201
|
||||
|
||||
# If we reach here, it means the DB entry failed after the file was moved.
|
||||
# This is a potential issue, as the file is moved but not recorded.
|
||||
entry = AuditModel(user_id=user_id, action=f"Failed to create custom document (DB entry failed): {name}", status="500 - DB error")
|
||||
audit.new_entry(entry)
|
||||
return jsonify({"error": "Failed to create custom document"}), 500
|
||||
|
||||
@documents_bp.route("/customs", methods=["GET"])
|
||||
|
||||
Reference in New Issue
Block a user