Config: Refactor filesystem usage detection and add tests photoprism#4266

Signed-off-by: Michael Mayer <michael@photoprism.app>

Author: lastzero

compose.yaml

@@ -128,6 +128,7 @@ services:
     working_dir: "/go/src/github.com/photoprism/photoprism"
     volumes:
       - ".:/go/src/github.com/photoprism/photoprism"
+      - "./storage:/photoprism"
       - "go-mod:/go/pkg/mod"
 
   ## MariaDB (Database Server)

internal/config/config_usage.go

@@ -46,26 +46,26 @@ func (c *Config) Usage() Usage {
 		Select("SUM(file_size) AS used").
 		Where("deleted_at IS NULL").
 		Take(&info).Error; err != nil {
-		log.Warnf("config: %s", err.Error())
+		log.Warnf("config: failed to calculate indexed file usage (%s)", err.Error())
 	}
 
 	quotaTotal := c.QuotaBytes()
 
 	if m, err := duf.PathInfo(originalsPath); err == nil {
 		info.Free = m.Free
 		info.Total = info.Used + m.Free
+	} else {
+		log.Debugf("config: failed to detect filesystem usage (%s)", err.Error())
+	}
 
-		if quotaTotal > 0 && quotaTotal < info.Total {
-			info.Total = quotaTotal
-		}
-
-		if info.Total > 0 {
-			info.UsedPct = int(math.RoundToEven(float64(info.Used) / float64(info.Total) * 100))
-		}
-	} else if quotaTotal > 0 {
+	if quotaTotal > 0 && quotaTotal < info.Total {
 		info.Total = quotaTotal
 	}
 
+	if info.Total > 0 {
+		info.UsedPct = int(math.RoundToEven(float64(info.Used) / float64(info.Total) * 100))
+	}
+
 	if info.Used > 0 && info.UsedPct <= 0 {
 		info.UsedPct = 1
 	}

pkg/fs/duf/duf.go

@@ -71,7 +71,7 @@ func FindByPath(dir string) (m []Mount, warnings []string, err error) {
 	if len(folders) <= 1 {
 		filter.OnlyMountPoints = NewFilterValues("/")
 	} else if parent := strings.TrimSpace(folders[1]); parent != "" {
-		filter.OnlyMountPoints = NewFilterValues("/", "/"+parent+"/*")
+		filter.OnlyMountPoints = NewFilterValues("/", "/"+parent+"*")
 	} else if len(folders) > 2 {
 		filter.OnlyMountPoints = NewFilterValues("/")
 	}

pkg/fs/duf/duf_test.go

@@ -38,3 +38,62 @@ func TestMounts(t *testing.T) {
 		}
 	})
 }
+
+func TestPathInfo(t *testing.T) {
+	t.Run("Success", func(t *testing.T) {
+		// Get slice of mounted file systems.
+		result, err := PathInfo("/photoprism/originals")
+
+		// No warnings or errors are expected.
+		assert.NoError(t, err)
+
+		// Check result for plausibility.
+		assert.NotEmpty(t, result.Device)
+		assert.Equal(t, "local", result.DeviceType)
+		assert.Equal(t, "/photoprism", result.Mountpoint)
+		assert.NotEmpty(t, result.Fstype)
+		assert.NotEmpty(t, result.Opts)
+		assert.NotEmpty(t, result.Total)
+		assert.NotEmpty(t, result.Used)
+		assert.NotEmpty(t, result.Free)
+		assert.NotEmpty(t, result.Inodes)
+		assert.NotEmpty(t, result.InodesFree)
+		assert.NotEmpty(t, result.InodesUsed)
+		assert.NotEmpty(t, result.Blocks)
+		assert.NotEmpty(t, result.BlockSize)
+		assert.NotEmpty(t, result.Metadata)
+	})
+}
+
+func TestFindByPath(t *testing.T) {
+	t.Run("Success", func(t *testing.T) {
+		// Get slice of mounted file systems.
+		results, warnings, err := FindByPath("/photoprism/originals")
+
+		// No warnings or errors are expected.
+		assert.NoError(t, err)
+		assert.Empty(t, warnings)
+
+		// At least one mount returned?
+		if len(results) < 1 {
+			t.Error("at least one result expected")
+		} else {
+			// If so, check the first mount for plausibility.
+			result := results[0]
+			assert.NotEmpty(t, result.Device)
+			assert.Equal(t, "local", result.DeviceType)
+			assert.Equal(t, "/photoprism", result.Mountpoint)
+			assert.NotEmpty(t, result.Fstype)
+			assert.NotEmpty(t, result.Opts)
+			assert.NotEmpty(t, result.Total)
+			assert.NotEmpty(t, result.Used)
+			assert.NotEmpty(t, result.Free)
+			assert.NotEmpty(t, result.Inodes)
+			assert.NotEmpty(t, result.InodesFree)
+			assert.NotEmpty(t, result.InodesUsed)
+			assert.NotEmpty(t, result.Blocks)
+			assert.NotEmpty(t, result.BlockSize)
+			assert.NotEmpty(t, result.Metadata)
+		}
+	})
+}