added zip multiupload

This commit is contained in:
averel10
2026-03-13 08:59:58 +01:00
parent 0fa257e53c
commit 4c3106b9c7

View File

@@ -12,20 +12,20 @@ export default function UploadDatasetEntriesModal({
datasetId, datasetId,
}: UploadDatasetEntriesModalProps) { }: UploadDatasetEntriesModalProps) {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [file, setFile] = useState<File | null>(null); const [files, setFiles] = useState<File[]>([]);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState(false); const [success, setSuccess] = useState(false);
const [entriesCreated, setEntriesCreated] = useState(0); const [uploadQueue, setUploadQueue] = useState<Array<{ file: File; status: 'pending' | 'uploading' | 'completed' | 'failed'; message?: string }>>([]);
const [status, setStatus] = useState<string>(''); const [status, setStatus] = useState<string>('');
const [isDragging, setIsDragging] = useState(false);
const [tempDir, setTempDir] = useState<string | null>(null);
function handleFileChange(e: React.ChangeEvent<HTMLInputElement>) { function handleFileChange(e: React.ChangeEvent<HTMLInputElement>) {
const selectedFile = e.target.files?.[0]; const selectedFiles = e.target.files ? Array.from(e.target.files) : [];
if (selectedFile) { if (selectedFiles.length > 0) {
setFile(selectedFile); setFiles(selectedFiles);
setError(null); setError(null);
// Initialize queue with pending status
setUploadQueue(selectedFiles.map(file => ({ file, status: 'pending' })));
} }
} }
@@ -34,18 +34,26 @@ export default function UploadDatasetEntriesModal({
setError(null); setError(null);
setSuccess(false); setSuccess(false);
if (!file) { if (files.length === 0) {
setError('Please select a ZIP file'); setError('Please select at least one ZIP file');
return; return;
} }
setLoading(true); setLoading(true);
try { try {
// Step 1: Upload and extract ZIP via API route // Process each file in the queue sequentially
setStatus('Uploading and extracting ZIP file...'); const newQueue = [...uploadQueue];
for (let i = 0; i < newQueue.length; i++) {
const item = newQueue[i];
item.status = 'uploading';
setUploadQueue([...newQueue]);
setStatus(`Processing file ${i + 1} of ${newQueue.length}: ${item.file.name}`);
try {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file); formData.append('file', item.file);
formData.append('datasetId', datasetId.toString()); formData.append('datasetId', datasetId.toString());
const uploadResponse = await fetch('/api/upload', { const uploadResponse = await fetch('/api/upload', {
@@ -64,28 +72,44 @@ export default function UploadDatasetEntriesModal({
throw new Error('Failed to upload ZIP file'); throw new Error('Failed to upload ZIP file');
} }
setTempDir(uploadResult.tempDir); // Process the extracted data
setStatus(`${uploadResult.message} Now processing...`);
// Step 2: Process the extracted data (server action)
setStatus('Processing entries and copying audio files...');
const processResult = await processDatasetEntries(datasetId, uploadResult.tempDir); const processResult = await processDatasetEntries(datasetId, uploadResult.tempDir);
setSuccess(true); item.status = 'completed';
setEntriesCreated(processResult.entriesCreated); item.message = `✓ Processed (${processResult.entriesCreated} entries)`;
setStatus(processResult.message); } catch (err) {
setFile(null); item.status = 'failed';
setTempDir(null); item.message = err instanceof Error ? err.message : 'Unknown error';
}
setUploadQueue([...newQueue]);
}
const failedCount = newQueue.filter(item => item.status === 'failed').length;
const completedCount = newQueue.filter(item => item.status === 'completed').length;
if (failedCount === 0) {
setSuccess(true);
setStatus(`All files processed! (${completedCount}/${newQueue.length} completed)`);
} else if (completedCount > 0) {
setStatus(`Completed with errors: ${completedCount} succeeded, ${failedCount} failed`);
} else {
setError(`All files failed to process`);
}
setFiles([]);
if (failedCount === 0) {
setTimeout(() => { setTimeout(() => {
setSuccess(false); setSuccess(false);
setIsOpen(false); setIsOpen(false);
setStatus(''); setStatus('');
setUploadQueue([]);
window.location.reload(); window.location.reload();
}, 2500); }, 2500);
}
} catch (err) { } catch (err) {
const errorMsg = const errorMsg = err instanceof Error ? err.message : 'Failed to process uploads';
err instanceof Error ? err.message : 'Failed to upload and process dataset entries';
setError(errorMsg); setError(errorMsg);
setStatus(''); setStatus('');
} finally { } finally {
@@ -96,11 +120,11 @@ export default function UploadDatasetEntriesModal({
function handleClose() { function handleClose() {
if (!loading) { if (!loading) {
setIsOpen(false); setIsOpen(false);
setFile(null); setFiles([]);
setError(null); setError(null);
setSuccess(false); setSuccess(false);
setStatus(''); setStatus('');
setTempDir(null); setUploadQueue([]);
} }
} }
@@ -125,7 +149,7 @@ export default function UploadDatasetEntriesModal({
disabled: loading, disabled: loading,
}, },
{ {
label: loading ? 'Uploading & Processing...' : 'Upload', label: loading ? `Processing ${uploadQueue.filter(f => f.status !== 'pending').length}/${uploadQueue.length}...` : 'Upload Queue',
onClick: () => { onClick: () => {
const form = document.getElementById( const form = document.getElementById(
'uploadForm' 'uploadForm'
@@ -133,40 +157,45 @@ export default function UploadDatasetEntriesModal({
form?.dispatchEvent(new Event('submit', { bubbles: true })); form?.dispatchEvent(new Event('submit', { bubbles: true }));
}, },
variant: 'primary', variant: 'primary',
disabled: loading || !file, disabled: loading || files.length === 0,
}, },
]} ]}
> >
<form id="uploadForm" onSubmit={handleSubmit} className="space-y-4"> <form id="uploadForm" onSubmit={handleSubmit} className="space-y-4">
<div> <div>
<label htmlFor="file" className="block text-sm font-medium mb-2"> <label htmlFor="file" className="block text-sm font-medium mb-2">
ZIP File ZIP Files (Multiple)
</label> </label>
<div className="border-2 border-dashed border-gray-300 rounded-lg p-6 text-center"> <div className="border-2 border-dashed border-gray-300 rounded-lg p-6 text-center">
<input <input
id="file" id="file"
type="file" type="file"
accept=".zip" accept=".zip"
multiple
onChange={handleFileChange} onChange={handleFileChange}
disabled={loading} disabled={loading}
className="hidden" className="hidden"
/> />
<label htmlFor="file" className="cursor-pointer block"> <label htmlFor="file" className="cursor-pointer block">
{file ? ( {files.length > 0 ? (
<div> <div>
<p className="text-sm font-medium text-blue-600"> <p className="text-sm font-medium text-blue-600">
{file.name} {files.length} file{files.length !== 1 ? 's' : ''} selected
</p>
<p className="text-xs text-gray-500 mt-1">
{(file.size / 1024 / 1024).toFixed(2)} MB
</p> </p>
<div className="mt-2 text-xs text-gray-600 max-h-24 overflow-y-auto">
{files.map((f, idx) => (
<div key={idx} className="py-1">
{f.name} ({(f.size / 1024 / 1024).toFixed(2)} MB)
</div>
))}
</div>
</div> </div>
) : ( ) : (
<div> <div>
<p className="text-sm font-medium text-gray-700"> <p className="text-sm font-medium text-gray-700">
Click to select or drag and drop Click to select or drag and drop
</p> </p>
<p className="text-xs text-gray-500 mt-1">ZIP file only</p> <p className="text-xs text-gray-500 mt-1">ZIP files only (multiple allowed)</p>
</div> </div>
)} )}
</label> </label>
@@ -185,6 +214,31 @@ export default function UploadDatasetEntriesModal({
</ul> </ul>
</div> </div>
{uploadQueue.length > 0 && (
<div className="bg-gray-50 border border-gray-200 rounded-lg p-4 space-y-2">
<p className="font-semibold text-sm text-gray-700">Upload Queue:</p>
<div className="space-y-1 max-h-32 overflow-y-auto">
{uploadQueue.map((item, idx) => (
<div key={idx} className="flex items-center gap-2 text-xs">
<span className={`font-medium ${
item.status === 'completed' ? 'text-green-600' :
item.status === 'failed' ? 'text-red-600' :
item.status === 'uploading' ? 'text-blue-600' :
'text-gray-600'
}`}>
{item.status === 'completed' ? '✓' :
item.status === 'failed' ? '✗' :
item.status === 'uploading' ? '⟳' :
'○'}
</span>
<span className="flex-1">{item.file.name}</span>
{item.message && <span className="text-gray-500">{item.message}</span>}
</div>
))}
</div>
</div>
)}
{error && ( {error && (
<div className="p-3 bg-red-100 border border-red-400 text-red-700 rounded text-sm"> <div className="p-3 bg-red-100 border border-red-400 text-red-700 rounded text-sm">
{error} {error}