From a5b38a8419021aba17267864a60e64f5052dacdd Mon Sep 17 00:00:00 2001
From: Yash-Garg <yash.garg@outlook.in>
Date: Fri, 10 Dec 2021 13:47:05 +0530
Subject: [PATCH] Use correct path and change position of usage bar

---
 frontend/src/components/Sidebar.vue | 19 ++++++++++---------
 http/resource.go                    |  5 ++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue
index c0fb45b0..b3396da0 100644
--- a/frontend/src/components/Sidebar.vue
+++ b/frontend/src/components/Sidebar.vue
@@ -44,15 +44,6 @@
           <span>{{ $t("sidebar.settings") }}</span>
         </button>
 
-        <div
-          v-if="$router.currentRoute.path.includes('/files/')"
-          style="padding: 0.5em 1.3em 0 1.3em"
-        >
-          <progress-bar :val="req.diskUsedPercent" :size="large"></progress-bar>
-          <br />
-          {{ req.freeDiskSpace }} free of {{ req.totalDiskSpace }}
-        </div>
-
         <button
           v-if="authMethod == 'json'"
           @click="logout"
@@ -89,6 +80,16 @@
       </router-link>
     </template>
 
+    <div
+      class="credits"
+      v-if="$router.currentRoute.path.includes('/files/')"
+      style="width: 90%; margin: 0em 2.5em 3em 2.5em"
+    >
+      <progress-bar :val="req.diskUsedPercent" :size="large"></progress-bar>
+      <br />
+      {{ req.freeDiskSpace }} free of {{ req.totalDiskSpace }}
+    </div>
+
     <p class="credits">
       <span>
         <span v-if="disableExternal">File Browser</span>
diff --git a/http/resource.go b/http/resource.go
index c7971d9a..fd5aa0a3 100644
--- a/http/resource.go
+++ b/http/resource.go
@@ -12,10 +12,9 @@ import (
 	"strings"
 
 	"code.cloudfoundry.org/bytefmt"
-	"github.com/filebrowser/filebrowser/v2/disk"
-
 	"github.com/spf13/afero"
 
+	"github.com/filebrowser/filebrowser/v2/disk"
 	"github.com/filebrowser/filebrowser/v2/errors"
 	"github.com/filebrowser/filebrowser/v2/files"
 	"github.com/filebrowser/filebrowser/v2/fileutils"
@@ -32,7 +31,7 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
 		Content:    true,
 	})
 
-	usage := disk.GetDiskUsage(d.server.Root)
+	usage := disk.GetDiskUsage(filepath.Dir(d.user.FullPath(r.URL.Path)))
 	file.DiskUsedPercent = fmt.Sprintf("%.2f", usage.UsedPercent)
 	file.TotalDiskSpace = bytefmt.ByteSize(usage.Total)
 	file.FreeDiskSpace = bytefmt.ByteSize(usage.Free)