nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
langren1353 2022-06-07 00:26:11 +08:00
parent c211b96719
commit 7c7558eb23
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/Sidebar.vue
View File

@ -85,7 +85,7 @@
v-if="$router.currentRoute.path.includes('/files/')" v-if="$router.currentRoute.path.includes('/files/')"
style="width: 90%; margin: 2em 2.5em 3em 2.5em" 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 /> <br />
{{ usage.used }} of {{ usage.total }} used {{ usage.used }} of {{ usage.total }} used
</div> </div>
@ -102,9 +102,9 @@
> >
<span> {{ version }}</span> <span> {{ version }}</span>
</span> </span>
<span <span>
><a @click="help">{{ $t("sidebar.help") }}</a></span <a @click="help">{{ $t("sidebar.help") }}</a>
> </span>
</p> </p>
</nav> </nav>
</template> </template>

21
http/resource.go
View File

@ -351,12 +351,19 @@ var diskUsage = withUser(func(w http.ResponseWriter, r *http.Request, d *data) (
return errToStatus(err), err return errToStatus(err), err
} }
fPath := file.RealPath() fPath := file.RealPath()
usage, err := disk.UsageWithContext(r.Context(), fPath) if file.IsDir {
if err != nil { usage, err := disk.UsageWithContext(r.Context(), fPath)
return errToStatus(err), err 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,
})
}) })