Allow fractional free space percentages (fixes #2233)

This commit is contained in:
Jakob Borg
2015-09-06 08:47:52 +02:00
parent 66df2e57ae
commit 41c131d840
7 changed files with 24 additions and 18 deletions
+2 -2
View File
@@ -1670,7 +1670,7 @@ func (m *Model) BringToFront(folder, file string) {
// CheckFolderHealth checks the folder for common errors and returns the
// current folder error, or nil if the folder is healthy.
func (m *Model) CheckFolderHealth(id string) error {
if minFree := float64(m.cfg.Options().MinHomeDiskFreePct); minFree > 0 {
if minFree := m.cfg.Options().MinHomeDiskFreePct; minFree > 0 {
if free, err := osutil.DiskFreePercentage(m.cfg.ConfigPath()); err == nil && free < minFree {
return errors.New("home disk is out of space")
}
@@ -1691,7 +1691,7 @@ func (m *Model) CheckFolderHealth(id string) error {
err = errors.New("folder path missing")
} else if !folder.HasMarker() {
err = errors.New("folder marker missing")
} else if free, errDfp := osutil.DiskFreePercentage(folder.Path()); errDfp == nil && free < float64(folder.MinDiskFreePct) {
} else if free, errDfp := osutil.DiskFreePercentage(folder.Path()); errDfp == nil && free < folder.MinDiskFreePct {
err = errors.New("out of disk space")
}
} else if os.IsNotExist(err) {