From 577c0efa9cff13628d5e3bac710ef568a00949e0 Mon Sep 17 00:00:00 2001
From: langren1353 <14857127+langren1353@users.noreply.github.com>
Date: Mon, 13 Jun 2022 18:50:39 +0800
Subject: [PATCH] fix: don't calculate usage for files (#1973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: use incorrect suffix and return no 500(#1972、#1967)

* chore: set progress bar to small

Co-authored-by: Ramires Viana <59319979+ramiresviana@users.noreply.github.com>

* chore: refactoring

Co-authored-by: Oleg Lobanov <oleg@lobanov.me>
Co-authored-by: Ramires Viana <59319979+ramiresviana@users.noreply.github.com>
---
 frontend/src/components/Sidebar.vue | 8 ++++----
 http/resource.go                    | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index 3b151845..24345838 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="small"></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..3a12538a 100644
--- a/http/resource.go
+++ b/http/resource.go
@@ -351,6 +351,13 @@ var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (
 		return errToStatus(err), err
 	}
 	fPath := file.RealPath()
+	if !file.IsDir {
+		return renderJSON(w, r, &DiskUsageResponse{
+			Total: 0,
+			Used:  0,
+		})
+	}
+
 	usage, err := disk.UsageWithContext(r.Context(), fPath)
 	if err != nil {
 		return errToStatus(err), err