Infrastructure/pingvin-share
0
Fork 0
mirror of https://github.com/stonith404/pingvin-share.git synced 2025-01-15 01:14:27 -05:00
Code Issues Activity

fix: infinite loading when file size is small

Browse source
This commit is contained in:
Elias Schneider 2022-10-29 23:09:28 +02:00
parent c6e1f07f51
commit c2ddce6203
1 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
frontend/src/pages/upload.tsx
View file

@ -3,7 +3,7 @@ import { useModals } from "@mantine/modals";
import axios from "axios"; import axios from "axios";
import getConfig from "next/config"; import getConfig from "next/config";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import { useState } from "react"; import { useEffect, useState } from "react";
import Meta from "../components/Meta"; import Meta from "../components/Meta";
import Dropzone from "../components/upload/Dropzone"; import Dropzone from "../components/upload/Dropzone";
import FileList from "../components/upload/FileList"; import FileList from "../components/upload/FileList";
@ -16,6 +16,7 @@ import { ShareSecurity } from "../types/share.type";
import toast from "../utils/toast.util"; import toast from "../utils/toast.util";
const { publicRuntimeConfig } = getConfig(); const { publicRuntimeConfig } = getConfig();
let share: any;
const Upload = () => { const Upload = () => {
const router = useRouter(); const router = useRouter();
@ -38,7 +39,7 @@ const Upload = () => {
return file; return file;
}) })
); );
const share = await shareService.create(id, expiration, security); share = await shareService.create(id, expiration, security);
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
const progressCallBack = (bytesProgress: number) => { const progressCallBack = (bytesProgress: number) => {
setFiles((files) => { setFiles((files) => {
@ -58,27 +59,6 @@ const Upload = () => {
} catch { } catch {
files[i].uploadingProgress = -1; files[i].uploadingProgress = -1;
} }
if (
files.every(
(file) =>
file.uploadingProgress >= 100 || file.uploadingProgress == -1
)
) {
const fileErrorCount = files.filter(
(file) => file.uploadingProgress == -1
).length;
setisUploading(false);
if (fileErrorCount > 0) {
toast.error(
`${fileErrorCount} file(s) failed to upload. Try again.`
);
} else {
await shareService.completeShare(share.id);
showCompletedUploadModal(modals, share);
setFiles([]);
}
}
} }
} catch (e) { } catch (e) {
if (axios.isAxiosError(e)) { if (axios.isAxiosError(e)) {
@ -89,6 +69,34 @@ const Upload = () => {
setisUploading(false); setisUploading(false);
} }
}; };
useEffect(() => {
if (
files.length > 0 &&
files.every(
(file) => file.uploadingProgress >= 100 || file.uploadingProgress == -1
)
) {
console.log(files.length);
const fileErrorCount = files.filter(
(file) => file.uploadingProgress == -1
).length;
setisUploading(false);
if (fileErrorCount > 0) {
toast.error(`${fileErrorCount} file(s) failed to upload. Try again.`);
} else {
shareService
.completeShare(share.id)
.then(() => {
showCompletedUploadModal(modals, share);
setFiles([]);
})
.catch(() =>
toast.error("An error occured while finishing your share.")
);
}
}
}, [files]);
if (!user && publicRuntimeConfig.ALLOW_UNAUTHENTICATED_SHARES == "false") { if (!user && publicRuntimeConfig.ALLOW_UNAUTHENTICATED_SHARES == "false") {
router.replace("/"); router.replace("/");
} else { } else {