浏览代码

fix(db): remove invalid member from FileMetadata (#10180)

Simon Frei 4 月之前
父节点
当前提交
71c8a2c36f
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 4 1
      internal/db/interface.go
  2. 1 1
      lib/model/model.go

+ 4 - 1
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()
+}

+ 1 - 1
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
 		}