From 7c7558eb237bc4495e8c674b95c8cfb2a0272b76 Mon Sep 17 00:00:00 2001
From: langren1353 <1353464539@qq.com>
Date: Tue, 7 Jun 2022 00:26:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20use=20incorrect=20suffix=20and=20return?=
 =?UTF-8?q?=20no=20500(#1972=E3=80=81#1967)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Sidebar.vue |  8 ++++----
 http/resource.go                    | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 3b151845..a3dca90d 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -85,7 +85,7 @@
       v-if="$router.currentRoute.path.includes('/files/')"
       style="width: 90%; margin: 2em 2.5em 3em 2.5em"
     >
-      <progress-bar :val="usage.usedPercentage" :size="large"></progress-bar>
+      <progress-bar :val="usage.usedPercentage" size="large"></progress-bar>
       <br />
       {{ usage.used }} of {{ usage.total }} used
     </div>
@@ -102,9 +102,9 @@
         >
         <span> {{ version }}</span>
       </span>
-      <span
-        ><a @click="help">{{ $t("sidebar.help") }}</a></span
-      >
+      <span>
+        <a @click="help">{{ $t("sidebar.help") }}</a>
+      </span>
     </p>
   </nav>
 </template>
diff --git a/http/resource.go b/http/resource.go
index f46287ca..422e8389 100644
--- a/http/resource.go
+++ b/http/resource.go
@@ -351,12 +351,19 @@ var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (
 		return errToStatus(err), err
 	}
 	fPath := file.RealPath()
-	usage, err := disk.UsageWithContext(r.Context(), fPath)
-	if err != nil {
-		return errToStatus(err), err
+	if file.IsDir {
+		usage, err := disk.UsageWithContext(r.Context(), fPath)
+		if err != nil {
+			return errToStatus(err), err
+		}
+		return renderJSON(w, r, &DiskUsageResponse{
+			Total: usage.Total,
+			Used:  usage.Used,
+		})
+	} else {
+		return renderJSON(w, r, &DiskUsageResponse{
+			Total: 0,
+			Used:  0,
+		})
 	}
-	return renderJSON(w, r, &DiskUsageResponse{
-		Total: usage.Total,
-		Used:  usage.Used,
-	})
 })