From 778e1d774f574f45c179d0fecf0c1da9cc359b80 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 9 May 2024 18:39:45 +0200 Subject: feat(importer): add --replace flag to overwrite existing index --- import/main.go | 5 +++-- internal/search/indexer.go | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/import/main.go b/import/main.go index 87f8e4d..52b4515 100644 --- a/import/main.go +++ b/import/main.go @@ -22,6 +22,7 @@ const timeout = 30 * time.Minute type Config struct { ConfigFile string `conf:"short:c"` LogLevel slog.Level `conf:"default:INFO"` + Replace bool `conf:"default:false,help:whether to remove existing database, if exists"` } func main() { @@ -50,7 +51,7 @@ func main() { return } - indexer, err := search.NewIndexer(cfg.DataPath) + indexer, err := search.NewIndexer(cfg.DataPath, runtimeConfig.Replace) if err != nil { log.Fatalf("Failed to create indexer: %v", err) } @@ -93,7 +94,7 @@ func main() { } logger.Info("importer fetch succeeded", "updated", updated) - if updated { + if updated || runtimeConfig.Replace { hadWarnings, err := imp.Import(ctx, indexer) if err != nil { diff --git a/internal/search/indexer.go b/internal/search/indexer.go index b0e57d4..fc0214b 100644 --- a/internal/search/indexer.go +++ b/internal/search/indexer.go @@ -6,7 +6,9 @@ import ( "encoding/gob" "log" "log/slog" + "os" "path" + "searchix/internal/file" "searchix/internal/options" "github.com/blevesearch/bleve/v2" @@ -27,12 +29,26 @@ type WriteIndex struct { indexMapping *mapping.IndexMappingImpl } -func NewIndexer(dir string) (*WriteIndex, error) { +func NewIndexer(dir string, force bool) (*WriteIndex, error) { var err error bleve.SetLog(log.Default()) indexPath := path.Join(dir, indexFilename) + exists, err := file.Exists(indexPath) + if err != nil { + return nil, errors.WithMessagef(err, "could not check if index exists at path %s", indexPath) + } + if exists { + if !force { + return nil, errors.Errorf("index file %s already exists (use --force to replace)", indexPath) + } + err := os.RemoveAll(indexPath) + if err != nil { + return nil, errors.WithMessagef(err, "could not remove index file %s", indexPath) + } + } + indexMapping := bleve.NewIndexMapping() indexMapping.StoreDynamic = false indexMapping.IndexDynamic = false -- cgit 1.4.1