sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Limit the search to the directory specified in the reference

Browse Source
This commit is contained in:
André Duffeck
2022-04-11 09:13:44 +02:00
parent 79035baaf0
commit 099a89a523
2 changed files with 78 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search/pkg/search/index/index.go
+5 -1
View File
@@ -65,7 +65,11 @@ func (i *Index) Add(ref *sprovider.Reference, ri *sprovider.ResourceInfo) error
}
func (i *Index) Search(ctx context.Context, req *search.SearchIndexRequest) (*search.SearchIndexResult, error) {
bleveReq := bleve.NewSearchRequest(bleve.NewQueryStringQuery(req.Query))
query := bleve.NewConjunctionQuery(
bleve.NewQueryStringQuery(req.Query),
bleve.NewQueryStringQuery("Path:"+req.Reference.Path+"*"), // Limit search to this directory in the space
)
bleveReq := bleve.NewSearchRequest(query)
bleveReq.Fields = []string{"*"}
res, err := i.bleveIndex.Search(bleveReq)
if err != nil {
search/pkg/search/index/index_test.go
+73 -74
View File
@@ -70,89 +70,88 @@ var _ = Describe("Index", func() {
Expect(err).ToNot(HaveOccurred())
})
It("finds files by filename", func() {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
},
Query: "foo.pdf",
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(1))
Expect(res.Matches[0].Reference.ResourceId).To(Equal(ref.ResourceId))
Expect(res.Matches[0].Reference.Path).To(Equal(ref.Path))
Expect(res.Matches[0].Info.Id).To(Equal(ri.Id))
Expect(res.Matches[0].Info.Path).To(Equal(ri.Path))
Expect(res.Matches[0].Info.Size).To(Equal(ri.Size))
})
It("finds files by filename prefix", func() {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
},
Query: "foo*",
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(1))
Expect(res.Matches[0].Reference.ResourceId).To(Equal(ref.ResourceId))
Expect(res.Matches[0].Reference.Path).To(Equal(ref.Path))
Expect(res.Matches[0].Info.Id).To(Equal(ri.Id))
Expect(res.Matches[0].Info.Path).To(Equal(ri.Path))
Expect(res.Matches[0].Info.Size).To(Equal(ri.Size))
It("finds files by name, prefix or substring match", func() {
queries := []string{"foo.pdf", "foo*", "*oo.p*"}
for _, query := range queries {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
},
Query: query,
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(1), "query returned no result: "+query)
Expect(res.Matches[0].Reference.ResourceId).To(Equal(ref.ResourceId))
Expect(res.Matches[0].Reference.Path).To(Equal(ref.Path))
Expect(res.Matches[0].Info.Id).To(Equal(ri.Id))
Expect(res.Matches[0].Info.Path).To(Equal(ri.Path))
Expect(res.Matches[0].Info.Size).To(Equal(ri.Size))
}
})
PIt("finds directories by prefix")
})
Context("with a file in a subdirectory", func() {
var (
nestedRef *sprovider.Reference
nestedRI *sprovider.ResourceInfo
)
Context("and an additional file in a subdirectory", func() {
var (
nestedRef *sprovider.Reference
nestedRI *sprovider.ResourceInfo
)
BeforeEach(func() {
nestedRef = &sprovider.Reference{
ResourceId: &sprovider.ResourceId{
StorageId: "storageid",
OpaqueId: "rootopaqueid",
},
Path: "./nested/nestedpdf.pdf",
}
nestedRI = &sprovider.ResourceInfo{
Id: &sprovider.ResourceId{
StorageId: "storageid",
OpaqueId: "opaqueid",
},
Path: "nestedpdf.pdf",
Size: 12345,
}
err := i.Add(nestedRef, nestedRI)
Expect(err).ToNot(HaveOccurred())
})
BeforeEach(func() {
nestedRef = &sprovider.Reference{
ResourceId: &sprovider.ResourceId{
StorageId: "storageid",
OpaqueId: "rootopaqueid",
},
Path: "./nested/nestedpdf.pdf",
}
nestedRI = &sprovider.ResourceInfo{
Id: &sprovider.ResourceId{
StorageId: "storageid",
OpaqueId: "nestedopaqueid",
},
Path: "nestedpdf.pdf",
Size: 12345,
}
err := i.Add(nestedRef, nestedRI)
Expect(err).ToNot(HaveOccurred())
})
It("finds files living deeper in the tree by filename", func() {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
},
Query: "nestedpdf.pdf",
It("finds files living deeper in the tree by filename, prefix or substring match", func() {
queries := []string{"nestedpdf.pdf", "nested*", "*tedpdf.*"}
for _, query := range queries {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
},
Query: query,
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(1), "query returned no result: "+query)
Expect(res.Matches[0].Reference.ResourceId).To(Equal(nestedRef.ResourceId))
Expect(res.Matches[0].Reference.Path).To(Equal(nestedRef.Path))
Expect(res.Matches[0].Info.Id).To(Equal(nestedRI.Id))
Expect(res.Matches[0].Info.Path).To(Equal(nestedRI.Path))
Expect(res.Matches[0].Info.Size).To(Equal(nestedRI.Size))
}
})
It("does not find the higher levels when limiting the searched directory", func() {
res, err := i.Search(ctx, &search.SearchIndexRequest{
Reference: &sprovider.Reference{
ResourceId: ref.ResourceId,
Path: "./nested/",
},
Query: "foo.pdf",
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(0))
})
Expect(err).ToNot(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Matches)).To(Equal(1))
Expect(res.Matches[0].Reference.ResourceId).To(Equal(nestedRef.ResourceId))
Expect(res.Matches[0].Reference.Path).To(Equal(nestedRef.Path))
Expect(res.Matches[0].Info.Id).To(Equal(nestedRI.Id))
Expect(res.Matches[0].Info.Path).To(Equal(nestedRI.Path))
Expect(res.Matches[0].Info.Size).To(Equal(nestedRI.Size))
})
PIt("finds directories living deeper in the tree by prefix")
})
})
Describe("Scan", func() {