all repos — searchix @ 0dbfe37fbddb95c184d845c79bbe014597d55fe8

Search engine for NixOS, nix-darwin, home-manager and NUR users

feat: stream files directly from fetcher to importer Use IndexMeta to store the information relevant to making conditional updates in future runs.

Alan Pearce
commit

0dbfe37fbddb95c184d845c79bbe014597d55fe8

parent

3053e41b1528ef898cccd44e056e4d167619af6b

1 file changed, 15 insertions(+), 11 deletions(-)

changed files
M internal/index/indexer.gointernal/index/indexer.go
@@ -29,7 +29,7 @@ )
type WriteIndex struct { index bleve.Index - meta *Meta + Meta *Meta } type BatchError struct {
@@ -216,10 +216,6 @@ if err != nil {
return nil, nil, false, err } - err = meta.Save() - if err != nil { - return nil, nil, false, err - } } else { idx, err = bleve.Open(indexPath) if err != nil {
@@ -245,6 +241,10 @@ exists,
nil } +func (i *WriteIndex) SaveMeta() error { + return i.Meta.Save() +} + func (i *WriteIndex) Import( ctx context.Context, objects <-chan nix.Importable,
@@ -262,7 +262,7 @@ outer:
for obj := range objects { select { case <-ctx.Done(): - slog.Debug("context cancelled") + slog.Warn("import aborted") break outer default:
@@ -336,13 +336,17 @@
return nil } -func (i *WriteIndex) Close() error { - err := i.index.Close() - if err != nil { - return errors.WithMessagef(err, "could not close index") +func (i *WriteIndex) Close() (err error) { + if e := i.Meta.Save(); e != nil { + // index needs to be closed anyway + err = errors.WithMessage(e, "could not save metadata") } - return nil + if e := i.index.Close(); e != nil { + err = errors.WithMessagef(e, "could not close index") + } + + return err } func (i *WriteIndex) DeleteBySource(source string) error {