opensource/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash.git synced 2026-03-13 10:12:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix (plg_search_sqlitefts): discovery phase edge case

Browse Source
This commit is contained in:
MickaelK
2026-02-26 10:21:13 +11:00
parent 5c9956ec91
commit b33117fcab
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/plugin/plg_search_sqlitefts/crawler/phase_explore.go
View File

@@ -82,11 +82,7 @@ func (this *Crawler) DiscoverPush(doc *Document, files []os.FileInfo, tx indexer
})
}
} else {
if err := dbInsert(doc.Path, f, tx); err != nil {
if err == indexer.ErrConstraint {
return false
}
Log.Warning("search::insert index_error (%v)", err)
if err := dbInsert(doc.Path, f, tx); err != nil && err != indexer.ErrConstraint {
return false
}
}

12
server/plugin/plg_search_sqlitefts/workflow/index.go
View File

@@ -39,12 +39,12 @@ func (this StepIndexer) Manifest() WorkflowSpecs {
func (this StepIndexer) Execute(params map[string]string, input map[string]string) (map[string]string, error) {
str, err := DecryptString(SECRET_KEY_DERIVATE_FOR_USER, params["token"])
if err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=invalid_token err=%s", err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=invalid_token err=%s", err.Error())
return input, err
}
session := map[string]string{}
if err = json.Unmarshal([]byte(str), &session); err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=invalid_session err=%s", err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=invalid_session err=%s", err.Error())
return input, err
}
id := GenerateID(session)
@@ -58,7 +58,7 @@ func (this StepIndexer) Execute(params map[string]string, input map[string]strin
}
backend, err := NewBackend(app, app.Session)
if err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=cannot_create_backend err=%s", err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=cannot_create_backend err=%s", err.Error())
return input, err
}
app.Backend = backend
@@ -67,7 +67,7 @@ func (this StepIndexer) Execute(params map[string]string, input map[string]strin
tr, err := crwlr.State.Change()
if err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=cannot_begin_tx err=%s", err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=cannot_begin_tx err=%s", err.Error())
return input, err
}
@@ -93,7 +93,7 @@ func (this StepIndexer) Execute(params map[string]string, input map[string]strin
files, err := crwlr.Backend.Ls(doc.Path)
if err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=ls_error path=%s err=%s", doc.Path, err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=ls_error path=%s err=%s", doc.Path, err.Error())
}
cond.L.Lock()
@@ -108,7 +108,7 @@ func (this StepIndexer) Execute(params map[string]string, input map[string]strin
}
wg.Wait()
if err = tr.Commit(); err != nil {
Log.Warning("plg_search_sqlitefs::workflow message=commit_error err=%s", err.Error())
Log.Warning("plg_search_sqlitefts::workflow message=commit_error err=%s", err.Error())
}
return input, nil
}