diff --git a/src/components/UploadResumeBootstrap.tsx b/src/components/UploadResumeBootstrap.tsx index 4637ef9..1004e42 100644 --- a/src/components/UploadResumeBootstrap.tsx +++ b/src/components/UploadResumeBootstrap.tsx @@ -3,6 +3,7 @@ import toast from 'react-hot-toast' import { listUploads } from '@/services/uploadStore' import { resumeStoredUpload } from '@/services/uploadQueue' import { resumeStoredZip } from '@/services/uploadQueue' +import { resumeStoredAnnotationImport } from '@/services/uploadQueue' let started = false @@ -19,6 +20,11 @@ export function UploadResumeBootstrap() { toast.success(`ZIP đã hoàn tất: ${job.files[0]?.name ?? 'dataset'}`) return } + if (job.kind === 'coco' || job.kind === 'yolo') { + await resumeStoredAnnotationImport(job) + toast.success(`Import ${job.kind.toUpperCase()} đã hoàn tất`) + return + } await resumeStoredUpload(job, (done, total) => { if (done === 0 || done === total) return toast(`Đang tiếp tục upload ${done}/${total}: ${job.files[0]?.name ?? ''}`) diff --git a/src/pages/projects/components/detail/DataTab.tsx b/src/pages/projects/components/detail/DataTab.tsx index 3c38635..a6da1e3 100644 --- a/src/pages/projects/components/detail/DataTab.tsx +++ b/src/pages/projects/components/detail/DataTab.tsx @@ -9,7 +9,7 @@ import { type UploadTask, } from '@/services/uploadQueue' import { api } from '@/services/api' -import { saveUpload } from '@/services/uploadStore' +import { deleteUpload, saveUpload } from '@/services/uploadStore' import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants' import { getStorageItem } from '@/utils/storage' import { @@ -275,9 +275,12 @@ export const DataTab: React.FC = ({ const handleCocoSelected = async (files: FileList | null) => { const file = files?.[0] if (!file) return + const storedId = `coco:${project.id}:${file.name}:${file.size}:${file.lastModified}` setIsImporting(true) try { + await saveUpload({ id: storedId, projectId: project.id, jobId: '', files: [file], kind: 'coco', createdAt: Date.now() }) summarizeImport(await importCocoFile(project.id, file), 'COCO') + await deleteUpload(storedId) } catch (err) { toast.error(err instanceof Error ? err.message : 'Nhập COCO thất bại') } finally { @@ -287,9 +290,12 @@ export const DataTab: React.FC = ({ const handleYoloSelected = async (files: FileList | null) => { if (!files || files.length === 0) return + const storedId = `yolo:${project.id}:${Array.from(files).map((file) => `${file.name}:${file.size}:${file.lastModified}`).join('|')}` setIsImporting(true) try { + await saveUpload({ id: storedId, projectId: project.id, jobId: '', files: Array.from(files), kind: 'yolo', createdAt: Date.now() }) summarizeImport(await importYoloFiles(project.id, Array.from(files)), 'YOLO') + await deleteUpload(storedId) } catch (err) { toast.error(err instanceof Error ? err.message : 'Nhập YOLO thất bại') } finally { diff --git a/src/services/uploadQueue.ts b/src/services/uploadQueue.ts index 4d38516..b3bbe2a 100644 --- a/src/services/uploadQueue.ts +++ b/src/services/uploadQueue.ts @@ -2,6 +2,7 @@ import { api } from './api' import { deleteUpload, prepareUploadStorage, saveUpload, type StoredUpload } from './uploadStore' import { API_BASE_URL, STORAGE_KEYS } from '@/app/constants' import { getStorageItem } from '@/utils/storage' +import { importCocoFile, importYoloFiles } from './datasetImportService' export type UploadTaskStatus = 'pending' | 'uploading' | 'done' | 'error' | 'skipped' @@ -455,3 +456,9 @@ export async function resumeStoredZip(stored: StoredUpload, onProgress?: (messag onProgress?.(`Đang import ZIP ${done}/${total} ảnh…`)) await deleteUpload(stored.id) } + +export async function resumeStoredAnnotationImport(stored: StoredUpload) { + if (stored.kind === 'coco') await importCocoFile(stored.projectId, stored.files[0]!) + else await importYoloFiles(stored.projectId, stored.files) + await deleteUpload(stored.id) +} diff --git a/src/services/uploadStore.ts b/src/services/uploadStore.ts index 7621f8c..cac085f 100644 --- a/src/services/uploadStore.ts +++ b/src/services/uploadStore.ts @@ -4,7 +4,7 @@ export interface StoredUpload { jobId: string files: File[] createdAt: number - kind?: 'images' | 'zip' | 'zip-import' + kind?: 'images' | 'zip' | 'zip-import' | 'coco' | 'yolo' r2Key?: string }