Use correct path and change position of usage bar

This commit is contained in:
Yash-Garg 2021-12-10 13:47:05 +05:30
parent 4fdf706ba6
commit a5b38a8419
No known key found for this signature in database
GPG Key ID: 83B503973C5C7470
2 changed files with 12 additions and 12 deletions

View File

@ -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>

View File

@ -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)