extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 18:04:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

sftp: fix about parsing of df results so it can cope with -ve results

Browse Source 
This is useful when interacting with "serve sftp" which returns -ve
results when the corresponding value is unknown.
This commit is contained in:
Nick Craig-Wood 2019-05-09 14:29:52 +01:00
parent 9950bb9b7c
commit 610466c18c
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend/sftp/sftp.go
View File

@ -844,13 +844,15 @@ func (f *Fs) About() (*fs.Usage, error) {
_ = session.Close() _ = session.Close()
usageTotal, usageUsed, usageAvail := parseUsage(stdout.Bytes()) usageTotal, usageUsed, usageAvail := parseUsage(stdout.Bytes())
if usageTotal < 0 || usageUsed < 0 || usageAvail < 0 { usage := &fs.Usage{}
return nil, errors.Wrap(err, "About failed to parse information") if usageTotal >= 0 {
usage.Total = fs.NewUsageValue(usageTotal)
} }
usage := &fs.Usage{ if usageUsed >= 0 {
Total: fs.NewUsageValue(usageTotal), usage.Used = fs.NewUsageValue(usageUsed)
Used: fs.NewUsageValue(usageUsed), }
Free: fs.NewUsageValue(usageAvail), if usageAvail >= 0 {
usage.Free = fs.NewUsageValue(usageAvail)
} }
return usage, nil return usage, nil
} }
@ -949,26 +951,27 @@ func parseHash(bytes []byte) string {
// returned by an invocation of df into // returned by an invocation of df into
// the disk size, used space, and avaliable space on the disk, in that order. // the disk size, used space, and avaliable space on the disk, in that order.
// Only works when `df` has output info on only one disk // Only works when `df` has output info on only one disk
func parseUsage(bytes []byte) (int64, int64, int64) { func parseUsage(bytes []byte) (spaceTotal int64, spaceUsed int64, spaceAvail int64) {
spaceTotal, spaceUsed, spaceAvail = -1, -1, -1
lines := strings.Split(string(bytes), "\n") lines := strings.Split(string(bytes), "\n")
if len(lines) < 2 { if len(lines) < 2 {
return -1, -1, -1 return
} }
split := strings.Fields(lines[1]) split := strings.Fields(lines[1])
if len(split) < 6 { if len(split) < 6 {
return -1, -1, -1 return
} }
spaceTotal, err := strconv.ParseInt(split[1], 10, 64) spaceTotal, err := strconv.ParseInt(split[1], 10, 64)
if err != nil { if err != nil {
return -1, -1, -1 spaceTotal = -1
} }
spaceUsed, err := strconv.ParseInt(split[2], 10, 64) spaceUsed, err = strconv.ParseInt(split[2], 10, 64)
if err != nil { if err != nil {
return -1, -1, -1 spaceUsed = -1
} }
spaceAvail, err := strconv.ParseInt(split[3], 10, 64) spaceAvail, err = strconv.ParseInt(split[3], 10, 64)
if err != nil { if err != nil {
return -1, -1, -1 spaceAvail = -1
} }
return spaceTotal * 1024, spaceUsed * 1024, spaceAvail * 1024 return spaceTotal * 1024, spaceUsed * 1024, spaceAvail * 1024
} }