add deleting files

This commit is contained in:
sam 2024-02-13 02:23:21 +01:00
parent 7467562c8f
commit 21aceb425f
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
3 changed files with 39 additions and 1 deletions

View file

@ -7,6 +7,8 @@ from sqlalchemy import select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from foxfiles.db import File, engine from foxfiles.db import File, engine
from foxfiles.errors import Errors
from foxfiles.files import delete_file
from foxfiles.user import maybe_token, require_user from foxfiles.user import maybe_token, require_user
from foxfiles.settings import BASE_URL from foxfiles.settings import BASE_URL
@ -33,7 +35,9 @@ class ListFilesResponse(BaseModel):
@require_user @require_user
@validate() @validate()
def list_files(query: ListFilesQuery): def list_files(query: ListFilesQuery):
stmt = select(File).where(File.user_id == g.user.id).limit(50).order_by(File.id.desc()) stmt = (
select(File).where(File.user_id == g.user.id).limit(50).order_by(File.id.desc())
)
if query.before: if query.before:
stmt = stmt.where(File.id < query.before) stmt = stmt.where(File.id < query.before)
if query.after: if query.after:
@ -54,3 +58,20 @@ def list_files(query: ListFilesQuery):
).model_dump() ).model_dump()
for file in files for file in files
] ]
@bp.delete("/api/files/<id>")
@maybe_token
@require_user
@validate()
def delete(id: int):
with Session(engine) as session:
file = session.scalar(select(File).where(File.id == id))
if not file or g.user.id != file.user_id:
return Errors.FILE_NOT_FOUND
session.delete(file)
session.commit()
delete_file(file.hash, file.content_type)
return "", 204

View file

@ -12,3 +12,4 @@ class Errors:
INVALID_TOKEN = ({"error": "Invalid token"}, 401) INVALID_TOKEN = ({"error": "Invalid token"}, 401)
INVALID_CREDENTIALS = ({"error": "Invalid credentials"}, 400) INVALID_CREDENTIALS = ({"error": "Invalid credentials"}, 400)
MISSING_FILE = ({"error": "Missing file"}, 400) MISSING_FILE = ({"error": "Missing file"}, 400)
FILE_NOT_FOUND = ({"error": "File not found"}, 404)

View file

@ -44,6 +44,14 @@ def upload_file(file: FileStorage) -> tuple[str, str]:
raise NotImplementedError() raise NotImplementedError()
def delete_file(hash: str, content_type: str):
match STORAGE_BACKEND:
case "local":
return _local_delete_file(hash, content_type)
case "s3":
raise NotImplementedError()
def _local_get_file_by_hash(hash: str, content_type: str): def _local_get_file_by_hash(hash: str, content_type: str):
p = _local_file_path(hash, content_type) p = _local_file_path(hash, content_type)
with p.open("rb") as f: with p.open("rb") as f:
@ -64,3 +72,11 @@ def _local_upload_file(file: FileStorage) -> tuple[str, str]:
f.write(stream) f.write(stream)
return (hash, file_type) return (hash, file_type)
def _local_delete_file(hash: str, content_type: str):
p = _local_file_path(hash, content_type)
try:
os.remove(p)
except FileNotFoundError:
pass