From d0d4afd2c3746749c7d0d80bc23472ebf8d08cf4 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Sat, 18 Jan 2025 11:23:22 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=86=8D=EB=8F=84?=
 =?UTF-8?q?=EA=B0=80=20=EC=9E=98=EB=AA=BB=20=ED=91=9C=EA=B8=B0=EB=90=98?=
 =?UTF-8?q?=EB=8D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/[id]/DownloadStatus.svelte           |  6 ++---
 .../(fullscreen)/file/downloads/File.svelte   |  3 ++-
 .../(fullscreen)/file/uploads/File.svelte     |  2 +-
 .../DirectoryEntries/UploadingFile.svelte     | 23 ++++++++++---------
 4 files changed, 18 insertions(+), 16 deletions(-)

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 @@
 <script lang="ts">
   import type { Writable } from "svelte/store";
   import { formatNetworkSpeed } from "$lib/modules/util";
-  import type { FileDownloadStatus } from "$lib/stores";
+  import { isFileDownloading, type FileDownloadStatus } from "$lib/stores";
 
   interface Props {
     status?: Writable<FileDownloadStatus>;
@@ -10,7 +10,7 @@
   let { status }: Props = $props();
 </script>
 
-{#if $status && $status.status !== "decrypted" && $status.status !== "canceled" && $status.status !== "error"}
+{#if $status && isFileDownloading($status.status)}
   <div class="flex w-full flex-col rounded-xl bg-gray-100 p-3">
     <p class="font-medium">
       {#if $status.status === "download-pending"}
@@ -26,7 +26,7 @@
     <p class="text-xs">
       {#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}
     </p>
   </div>
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 @@
 <script lang="ts">
   import type { Writable } from "svelte/store";
   import { formatNetworkSpeed } from "$lib/modules/util";
-  import type { FileUploadStatus } from "$lib/stores";
+  import { isFileUploading, type FileUploadStatus } from "$lib/stores";
 
   import IconDraft from "~icons/material-symbols/draft";
 
   interface Props {
-    info: Writable<FileUploadStatus>;
+    status: Writable<FileUploadStatus>;
   }
 
-  let { info }: Props = $props();
+  let { status }: Props = $props();
 </script>
 
-{#if $info.status !== "uploaded" && $info.status !== "canceled" && $info.status !== "error"}
+{#if isFileUploading($status.status)}
   <div class="flex h-14 items-center gap-x-4 p-2">
     <div class="flex-shrink-0 text-lg">
       <IconDraft class="text-gray-600" />
     </div>
     <div class="flex flex-grow flex-col overflow-hidden">
-      <p title={$info.name} class="truncate font-medium text-gray-800">
-        {$info.name}
+      <p title={$status.name} class="truncate font-medium text-gray-800">
+        {$status.name}
       </p>
       <p class="text-xs text-gray-800">
-        {#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}
       </p>
     </div>