Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 36 additions & 25 deletions src/components/modals/AddModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import useGetColor from '../../../hooks/useColor';
import network from '../../../network';
import analytics, { DriveAnalyticsEvent } from '../../../services/AnalyticsService';
import { constants } from '../../../services/AppService';
import { uploadQueueService } from '../../../services/drive/file/uploadQueue.service';
import {
createUploadingFiles,
handleDuplicateFiles,
Expand All @@ -55,7 +56,7 @@ import AppText from '../../AppText';
import BottomModal from '../BottomModal';
import CreateFolderModal from '../CreateFolderModal';

const MAX_FILES_BULK_UPLOAD = 25;
const MAX_FILES_BULK_UPLOAD = 50;

function AddModal(): JSX.Element {
const tailwind = useTailwind();
Expand Down Expand Up @@ -368,37 +369,47 @@ function AddModal(): JSX.Element {

const { filesToUpload, filesExcluded } = validateAndFilterFiles(documents);
showFileSizeAlert(filesExcluded);
const filesToProcess = await handleDuplicateFiles(filesToUpload, focusedFolder.uuid);
if (filesToProcess.length === 0) {

if (filesToUpload.length === 0) {
dispatch(uiActions.setShowUploadFileModal(false));
return;
}

const preparedFiles = await prepareUploadFiles(filesToProcess, focusedFolder.uuid);
const formattedFiles = createUploadingFiles(preparedFiles, focusedFolder);
const batchId = `batch-${Date.now()}`;
const targetFolder = focusedFolder;

initializeUploads(formattedFiles, dispatch);
return uploadQueueService.enqueue(batchId, async () => {
const filesToProcess = await handleDuplicateFiles(filesToUpload, targetFolder.uuid);
if (filesToProcess.length === 0) {
return;
}

const processedFileIds: number[] = [];
const preparedFiles = await prepareUploadFiles(filesToProcess, targetFolder.uuid);
const formattedFiles = createUploadingFiles(preparedFiles, targetFolder);

for (const file of formattedFiles) {
try {
logger.info(`User from redux when upload: ${user?.username}, bucket: ${user?.bucket}`);
await uploadSingleFile(file, dispatch, uploadFile, uploadSuccess, user);
} catch (error) {
logger.error(`File ${file.name} failed to upload:`, error);
initializeUploads(formattedFiles, dispatch);

notificationsService.show({
type: NotificationType.Error,
text1: strings.formatString(strings.errors.uploadFile, (error as Error).message) as string,
});
} finally {
processedFileIds.push(file.id);
const processedFileIds: number[] = [];
const batchFileIds = formattedFiles.map((f) => f.id);

for (const file of formattedFiles) {
try {
logger.info(`User from redux when upload: ${user?.username}, bucket: ${user?.bucket}`);
await uploadSingleFile(file, dispatch, uploadFile, uploadSuccess, user);
} catch (error) {
logger.error(`File ${file.name} failed to upload:`, error);
notificationsService.show({
type: NotificationType.Error,
text1: strings.formatString(strings.errors.uploadFile, (error as Error).message) as string,
});
} finally {
processedFileIds.push(file.id);
}
}
}

cleanupStuckUploads(processedFileIds, formattedFiles);
dispatch(driveActions.clearUploadedFiles());
cleanupStuckUploads(processedFileIds, formattedFiles);
dispatch(driveActions.clearBatchFiles(batchFileIds));
});
}

/**
Expand Down Expand Up @@ -487,7 +498,7 @@ function AddModal(): JSX.Element {
if (!fileSize) {
try {
const fileInfo = fileSystemService.getFileInfo(cleanUri);
fileSize = fileInfo.exists ? fileInfo.size ?? 0 : 0;
fileSize = fileInfo.exists ? (fileInfo.size ?? 0) : 0;
} catch (error) {
logger.warn('The file size could not be obtained:', error);
fileSize = 0;
Expand Down Expand Up @@ -580,7 +591,7 @@ function AddModal(): JSX.Element {
if (!fileSize) {
try {
const fileInfo = fileSystemService.getFileInfo(cleanUri);
fileSize = fileInfo.exists ? fileInfo.size ?? 0 : 0;
fileSize = fileInfo.exists ? (fileInfo.size ?? 0) : 0;
} catch (error) {
logger.warn('The file size could not be obtained:', error);
fileSize = 0;
Expand Down Expand Up @@ -679,7 +690,7 @@ function AddModal(): JSX.Element {
const fileInfo = fileSystemService.getFileInfo(assetToUpload.uri);
const formatInfo = detectImageFormat(assetToUpload);
const name = drive.file.removeExtension(assetToUpload.uri.split('/').pop() as string);
const size = fileInfo.exists ? fileInfo.size ?? 0 : 0;
const size = fileInfo.exists ? (fileInfo.size ?? 0) : 0;

const file: UploadingFile = {
id: new Date().getTime(),
Expand Down
Loading
Loading