From 71c8a2c36f7dbbf2b3f9e5f11b25a149c01b37b9 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Sun, 15 Jun 2025 07:12:25 +0000 Subject: [PATCH] fix(db): remove invalid member from FileMetadata (#10180) --- internal/db/interface.go | 5 ++++- lib/model/model.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/db/interface.go b/internal/db/interface.go index a1d63a4e4..7cc6878da 100644 --- a/internal/db/interface.go +++ b/internal/db/interface.go @@ -103,7 +103,6 @@ type FileMetadata struct { LocalFlags protocol.FlagLocal Type protocol.FileInfoType Deleted bool - Invalid bool } func (f *FileMetadata) ModTime() time.Time { @@ -121,3 +120,7 @@ func (f *FileMetadata) IsDirectory() bool { func (f *FileMetadata) ShouldConflict() bool { return f.LocalFlags&protocol.LocalConflictFlags != 0 } + +func (f *FileMetadata) IsInvalid() bool { + return f.LocalFlags.IsInvalid() +} diff --git a/lib/model/model.go b/lib/model/model.go index 623adae13..9045c0a39 100644 --- a/lib/model/model.go +++ b/lib/model/model.go @@ -2757,7 +2757,7 @@ func (m *model) GlobalDirectoryTree(folder, prefix string, levels int, dirsOnly } // Don't include the prefix itself. - if f.Invalid || f.Deleted || strings.HasPrefix(prefix, f.Name) { + if f.IsInvalid() || f.Deleted || strings.HasPrefix(prefix, f.Name) { continue }