From 1e9dac9eeb7ec790c3ad63276eca96f22bf855e8 Mon Sep 17 00:00:00 2001 From: Zurdi Date: Sat, 10 Feb 2024 17:10:24 +0100 Subject: [PATCH] clean up user avatar code --- backend/endpoints/user.py | 12 ++++++------ backend/handler/fs_handler/fs_assets_handler.py | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/backend/endpoints/user.py b/backend/endpoints/user.py index 2d830ce91..3dca29102 100644 --- a/backend/endpoints/user.py +++ b/backend/endpoints/user.py @@ -2,6 +2,7 @@ import os from pathlib import Path from typing import Annotated +from config import ASSETS_BASE_PATH from decorators.auth import protected_route from endpoints.forms.identity import UserForm from endpoints.responses import MessageResponse @@ -9,7 +10,6 @@ from endpoints.responses.identity import UserSchema from fastapi import APIRouter, Depends, HTTPException, Request, status from handler import auth_handler, db_user_handler, fs_asset_handler from models.user import Role, User -from config import ASSETS_BASE_PATH router = APIRouter() @@ -134,13 +134,13 @@ def update_user( if form_data.avatar is not None: user_avatar_path = fs_asset_handler.build_avatar_path(user=user) - file_location = f"{user_avatar_path}/{form_data.avatar.filename}" cleaned_data["avatar_path"] = file_location - if not os.path.exists(f"{ASSETS_BASE_PATH}/{user_avatar_path}"): - Path(f"{ASSETS_BASE_PATH}/{user_avatar_path}").mkdir(parents=True, exist_ok=True) - with open(f"{ASSETS_BASE_PATH}/{file_location}", "wb+") as file_object: - file_object.write(form_data.avatar.file.read()) + Path(f"{ASSETS_BASE_PATH}/{user_avatar_path}").mkdir( + parents=True, exist_ok=True + ) + with open(f"{ASSETS_BASE_PATH}/{file_location}", "wb+") as file_object: + file_object.write(form_data.avatar.file.read()) if cleaned_data: db_user_handler.update_user(id, cleaned_data) diff --git a/backend/handler/fs_handler/fs_assets_handler.py b/backend/handler/fs_handler/fs_assets_handler.py index 9d97ad44b..071649d5c 100644 --- a/backend/handler/fs_handler/fs_assets_handler.py +++ b/backend/handler/fs_handler/fs_assets_handler.py @@ -21,7 +21,6 @@ class FSAssetsHandler(FSHandler): def write_file(self, file: UploadFile, path: str) -> None: Path(os.path.join(ASSETS_BASE_PATH, path)).mkdir(parents=True, exist_ok=True) - log.info(f" - Uploading {file.filename}") file_location = os.path.join(ASSETS_BASE_PATH, path, file.filename) @@ -36,9 +35,7 @@ class FSAssetsHandler(FSHandler): # /users/557365723a31/profile def build_avatar_path(self, user: User): - user_avatar_path = os.path.join(self.user_folder_path(user), "profile") - Path(user_avatar_path).mkdir(parents=True, exist_ok=True) - return user_avatar_path + return os.path.join(self.user_folder_path(user), "profile") def _build_asset_file_path( self, user: User, folder: str, platform_fs_slug, emulator: str = None