fix issue
This commit is contained in:
@@ -133,10 +133,12 @@ async def batch_recognize(files: List[UploadFile], db: AsyncSession = Depends(ge
|
|||||||
if not file.filename:
|
if not file.filename:
|
||||||
results.append({"filename": "unknown", "status": "error", "message": "文件名为空"})
|
results.append({"filename": "unknown", "status": "error", "message": "文件名为空"})
|
||||||
continue
|
continue
|
||||||
suffix = _check_image_ext(file.filename)
|
# 只取文件名,去掉文件夹上传时带上的相对路径
|
||||||
dest_path = settings.images_dir / file.filename
|
filename = os.path.basename(file.filename)
|
||||||
|
suffix = _check_image_ext(filename)
|
||||||
|
dest_path = settings.images_dir / filename
|
||||||
counter = 1
|
counter = 1
|
||||||
stem = os.path.splitext(file.filename)[0]
|
stem = os.path.splitext(filename)[0]
|
||||||
while dest_path.exists():
|
while dest_path.exists():
|
||||||
dest_path = settings.images_dir / f"{stem}_{counter}{suffix}"
|
dest_path = settings.images_dir / f"{stem}_{counter}{suffix}"
|
||||||
counter += 1
|
counter += 1
|
||||||
@@ -240,8 +242,10 @@ async def import_from_paths(data: PathImportRequest, db: AsyncSession = Depends(
|
|||||||
async def recognize_direct(file: UploadFile, db: AsyncSession = Depends(get_db)):
|
async def recognize_direct(file: UploadFile, db: AsyncSession = Depends(get_db)):
|
||||||
if not file.filename:
|
if not file.filename:
|
||||||
raise HTTPException(status_code=400, detail="文件名不能为空")
|
raise HTTPException(status_code=400, detail="文件名不能为空")
|
||||||
suffix = _check_image_ext(file.filename)
|
# 只取文件名,去掉文件夹上传时带上的相对路径(如 xx/01.jpg -> 01.jpg)
|
||||||
dest_path = settings.images_dir / file.filename
|
filename = os.path.basename(file.filename)
|
||||||
|
suffix = _check_image_ext(filename)
|
||||||
|
dest_path = settings.images_dir / filename
|
||||||
counter = 1
|
counter = 1
|
||||||
stem = os.path.splitext(file.filename)[0]
|
stem = os.path.splitext(file.filename)[0]
|
||||||
while dest_path.exists():
|
while dest_path.exists():
|
||||||
|
|||||||
Reference in New Issue
Block a user