beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #700 from ente-io/fix-upload-issues

Browse source 
Fix upload issues
This commit is contained in:
Abhinav Kumar 2022-09-08 10:24:51 +05:30 committed by GitHub
parent 09864ffdbe 445da5e83e
commit 2089011a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/components/Upload/UploadProgress/dialog.tsx
View file

@ -19,19 +19,18 @@ export function UploadProgressDialog() {
const [hasUnUploadedFiles, setHasUnUploadedFiles] = useState(false);
useEffect(() => {
if (!hasUnUploadedFiles) {
if (
finishedUploads.get(UPLOAD_RESULT.ALREADY_UPLOADED)?.length >
0 ||
finishedUploads.get(UPLOAD_RESULT.BLOCKED)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.FAILED)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.LARGER_THAN_AVAILABLE_STORAGE)
?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.TOO_LARGE)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.UNSUPPORTED)?.length > 0
) {
setHasUnUploadedFiles(true);
}
if (
finishedUploads.get(UPLOAD_RESULT.ALREADY_UPLOADED)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.BLOCKED)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.FAILED)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.LARGER_THAN_AVAILABLE_STORAGE)
?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.TOO_LARGE)?.length > 0 ||
finishedUploads.get(UPLOAD_RESULT.UNSUPPORTED)?.length > 0
) {
setHasUnUploadedFiles(true);
} else {
setHasUnUploadedFiles(false);
}
}, [finishedUploads]);

23
src/components/Upload/Uploader.tsx
View file

@ -225,8 +225,10 @@ export default function Uploader(props: Props) {
handleCollectionCreationAndUpload(
importSuggestion,
props.isFirstUpload
props.isFirstUpload,
pickedUploadType.current
);
pickedUploadType.current = null;
props.setLoading(false);
}
}, [webFiles, appContext.sharedFiles, electronFiles]);
@ -260,9 +262,10 @@ export default function Uploader(props: Props) {
localID: index,
collectionID: collection.id,
}));
await waitInQueueAndUploadFiles(filesWithCollectionToUpload, [
waitInQueueAndUploadFiles(filesWithCollectionToUpload, [
collection,
]);
toUploadFiles.current = null;
} catch (e) {
logError(e, 'Failed to upload files to existing collections');
}
@ -327,16 +330,14 @@ export default function Uploader(props: Props) {
});
throw e;
}
await waitInQueueAndUploadFiles(
filesWithCollectionToUpload,
collections
);
waitInQueueAndUploadFiles(filesWithCollectionToUpload, collections);
toUploadFiles.current = null;
} catch (e) {
logError(e, 'Failed to upload files to new collections');
}
};
const waitInQueueAndUploadFiles = async (
const waitInQueueAndUploadFiles = (
filesWithCollectionToUploadIn: FileWithCollection[],
collections: Collection[]
) => {
@ -487,7 +488,8 @@ export default function Uploader(props: Props) {
const handleCollectionCreationAndUpload = (
importSuggestion: ImportSuggestion,
isFirstUpload: boolean
isFirstUpload: boolean,
pickedUploadType: PICKED_UPLOAD_TYPE
) => {
if (isPendingDesktopUpload.current) {
isPendingDesktopUpload.current = false;
@ -503,10 +505,7 @@ export default function Uploader(props: Props) {
}
return;
}
if (
isElectron() &&
pickedUploadType.current === PICKED_UPLOAD_TYPE.ZIPS
) {
if (isElectron() && pickedUploadType === PICKED_UPLOAD_TYPE.ZIPS) {
uploadFilesToNewCollections(UPLOAD_STRATEGY.COLLECTION_PER_FOLDER);
return;
}