refactor: deduce index path automatically from config.DataPath
1 file changed, 5 insertions(+), 10 deletions(-)
changed files
M internal/search/indexer.go → internal/search/indexer.go
@@ -28,8 +28,6 @@ type WriteIndex struct { index bleve.Index } -const ExpectedIndexExtension = ".bleve" - func createIndexMapping() (mapping.IndexMapping, error) { indexMapping := bleve.NewIndexMapping() indexMapping.StoreDynamic = false@@ -125,9 +123,13 @@ return idx, nil } -func NewIndexer(indexPath string, force bool) (*WriteIndex, error) { +const indexBaseName = "index.bleve" + +func NewIndexer(dataRoot string, force bool) (*WriteIndex, error) { var err error bleve.SetLog(log.Default()) + + indexPath := path.Join(dataRoot, indexBaseName) exists, err := file.Exists(indexPath) if err != nil {@@ -141,13 +143,6 @@ var idx bleve.Index if !exists || force { if force { - if path.Ext(indexPath) != ExpectedIndexExtension { - return nil, errors.Errorf( - "cowardly refusing to delete path %s (it doesn't end in '%s')", - indexPath, - ExpectedIndexExtension, - ) - } err := os.RemoveAll(indexPath) if err != nil { return nil, errors.WithMessagef(err, "could not remove index file %s", indexPath)