refactor: Move album storage into nested 'albums' directory
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
This commit is contained in:
11
app/app.py
11
app/app.py
@@ -268,7 +268,7 @@ def get_or_create_album_dir(album_name: str) -> str:
|
|||||||
save_dir = os.path.join("./data/uploads", "public")
|
save_dir = os.path.join("./data/uploads", "public")
|
||||||
else:
|
else:
|
||||||
safe_album_name = sanitize_filename(album_name)
|
safe_album_name = sanitize_filename(album_name)
|
||||||
save_dir = os.path.join("./data/uploads", safe_album_name)
|
save_dir = os.path.join("./data/uploads", "albums", safe_album_name)
|
||||||
|
|
||||||
os.makedirs(save_dir, exist_ok=True)
|
os.makedirs(save_dir, exist_ok=True)
|
||||||
return save_dir
|
return save_dir
|
||||||
@@ -938,13 +938,14 @@ async def api_albums(request: Request) -> JSONResponse:
|
|||||||
return JSONResponse({"error": "unauthorized"}, status_code=401)
|
return JSONResponse({"error": "unauthorized"}, status_code=401)
|
||||||
|
|
||||||
upload_root = "./data/uploads"
|
upload_root = "./data/uploads"
|
||||||
|
albums_root = os.path.join(upload_root, "albums")
|
||||||
try:
|
try:
|
||||||
os.makedirs(upload_root, exist_ok=True)
|
os.makedirs(albums_root, exist_ok=True)
|
||||||
# also make public dir
|
# also make public dir
|
||||||
os.makedirs(os.path.join(upload_root, "public"), exist_ok=True)
|
os.makedirs(os.path.join(upload_root, "public"), exist_ok=True)
|
||||||
albums = []
|
albums = [{"id": "public", "albumName": "public"}]
|
||||||
for name in os.listdir(upload_root):
|
for name in os.listdir(albums_root):
|
||||||
if os.path.isdir(os.path.join(upload_root, name)):
|
if os.path.isdir(os.path.join(albums_root, name)):
|
||||||
albums.append({"id": name, "albumName": name})
|
albums.append({"id": name, "albumName": name})
|
||||||
return JSONResponse(albums)
|
return JSONResponse(albums)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user