diff --git a/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte b/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte index 48a0459..c1e5729 100644 --- a/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte +++ b/src/routes/(fullscreen)/file/[id]/DownloadStatus.svelte @@ -1,7 +1,7 @@ -{#if $status && $status.status !== "decrypted" && $status.status !== "canceled" && $status.status !== "error"} +{#if $status && isFileDownloading($status.status)}

{#if $status.status === "download-pending"} @@ -26,7 +26,7 @@

{#if $status.status === "downloading"} 전송됨 - {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed($status.rate ?? 0)} + {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)} {/if}

diff --git a/src/routes/(fullscreen)/file/downloads/File.svelte b/src/routes/(fullscreen)/file/downloads/File.svelte index 670324c..4a2d501 100644 --- a/src/routes/(fullscreen)/file/downloads/File.svelte +++ b/src/routes/(fullscreen)/file/downloads/File.svelte @@ -50,7 +50,8 @@ 다운로드를 기다리는 중 {:else if $status.status === "downloading"} 전송됨 - {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed($status.rate ?? 0)} + {Math.floor(($status.progress ?? 0) * 100)}% · + {formatNetworkSpeed(($status.rate ?? 0) * 8)} {:else if $status.status === "decryption-pending"} 복호화를 기다리는 중 {:else if $status.status === "decrypting"} diff --git a/src/routes/(fullscreen)/file/uploads/File.svelte b/src/routes/(fullscreen)/file/uploads/File.svelte index e0d235d..bcc17d2 100644 --- a/src/routes/(fullscreen)/file/uploads/File.svelte +++ b/src/routes/(fullscreen)/file/uploads/File.svelte @@ -46,7 +46,7 @@ 업로드를 기다리는 중 {:else if $status.status === "uploading"} 전송됨 - {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed($status.rate ?? 0)} + {Math.floor(($status.progress ?? 0) * 100)}% · {formatNetworkSpeed(($status.rate ?? 0) * 8)} {:else if $status.status === "uploaded"} 업로드 완료 {:else if $status.status === "error"} diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte index bc410e4..6216141 100644 --- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte +++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/UploadingFile.svelte @@ -1,35 +1,36 @@ -{#if $info.status !== "uploaded" && $info.status !== "canceled" && $info.status !== "error"} +{#if isFileUploading($status.status)}
-

- {$info.name} +

+ {$status.name}

- {#if $info.status === "encryption-pending"} + {#if $status.status === "encryption-pending"} 준비 중 - {:else if $info.status === "encrypting"} + {:else if $status.status === "encrypting"} 암호화하는 중 - {:else if $info.status === "upload-pending"} + {:else if $status.status === "upload-pending"} 업로드를 기다리는 중 - {:else if $info.status === "uploading"} - 전송됨 {Math.floor(($info.progress ?? 0) * 100)}% · {formatNetworkSpeed($info.rate ?? 0)} + {:else if $status.status === "uploading"} + 전송됨 {Math.floor(($status.progress ?? 0) * 100)}% · + {formatNetworkSpeed(($status.rate ?? 0) * 8)} {/if}