From a9a0c1ee7826aef5743a8aa056632f1391367abe Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Sat, 9 May 2026 13:14:19 +0800 Subject: [PATCH] fix(fts): full-text search should not retrieve files in trash bin (fix #3386) --- pkg/filemanager/fs/dbfs/file.go | 4 ++++ pkg/filemanager/fs/fs.go | 1 + pkg/filemanager/manager/fulltextindex.go | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/pkg/filemanager/fs/dbfs/file.go b/pkg/filemanager/fs/dbfs/file.go index 56da93c0..9d9d753c 100644 --- a/pkg/filemanager/fs/dbfs/file.go +++ b/pkg/filemanager/fs/dbfs/file.go @@ -126,6 +126,10 @@ func (f *File) SizeUsed() int64 { }) } +func (f *File) InTrashBin() bool { + return f.Root().Name() != inventory.RootFolderName +} + func (f *File) UpdatedAt() time.Time { return f.Model.UpdatedAt } diff --git a/pkg/filemanager/fs/fs.go b/pkg/filemanager/fs/fs.go index a7ea6ff4..8fac4eb2 100644 --- a/pkg/filemanager/fs/fs.go +++ b/pkg/filemanager/fs/fs.go @@ -160,6 +160,7 @@ type ( Entities() []Entity PrimaryEntity() Entity PrimaryEntityID() int + InTrashBin() bool Shared() bool IsSymbolic() bool PolicyID() (id int) diff --git a/pkg/filemanager/manager/fulltextindex.go b/pkg/filemanager/manager/fulltextindex.go index abbfe4f3..357eec7a 100644 --- a/pkg/filemanager/manager/fulltextindex.go +++ b/pkg/filemanager/manager/fulltextindex.go @@ -60,6 +60,10 @@ func (m *manager) SearchFullText(ctx context.Context, query string, offset int) return FullTextSearchResult{}, false } + if file.InTrashBin() { + return FullTextSearchResult{}, false + } + return FullTextSearchResult{ File: file, Content: result.Text,