diff options
author | Alan Pearce | 2025-03-11 15:47:22 +0100 |
---|---|---|
committer | Alan Pearce | 2025-03-11 15:47:22 +0100 |
commit | 598b1f24aa5f20eb8ab47fd5bb73aae55779c1b2 (patch) | |
tree | 5c9c3d3a040aac144ba66e9a20caed5c9c6eba99 | |
parent | 12947e5a912ddcd6bb82cbaab2811d02de703871 (diff) | |
download | searchix-598b1f24aa5f20eb8ab47fd5bb73aae55779c1b2.tar.lz searchix-598b1f24aa5f20eb8ab47fd5bb73aae55779c1b2.tar.zst searchix-598b1f24aa5f20eb8ab47fd5bb73aae55779c1b2.zip |
refactor: remove unnecessary source lookup
-rw-r--r-- | internal/components/data.go | 3 | ||||
-rw-r--r-- | internal/components/page.templ | 2 | ||||
-rw-r--r-- | internal/index/search.go | 32 | ||||
-rw-r--r-- | internal/server/mux.go | 7 |
4 files changed, 1 insertions, 43 deletions
diff --git a/internal/components/data.go b/internal/components/data.go index 862429e..c34dfb8 100644 --- a/internal/components/data.go +++ b/internal/components/data.go @@ -4,15 +4,12 @@ import ( "go.alanpearce.eu/searchix/frontend" "go.alanpearce.eu/searchix/internal/config" search "go.alanpearce.eu/searchix/internal/index" - - "github.com/blevesearch/bleve/v2" ) type TemplateData struct { Sources []*config.Source Source *config.Source Query string - SourceResult *bleve.SearchResult ExtraHeadHTML string Code int Message string diff --git a/internal/components/page.templ b/internal/components/page.templ index edab0f4..28bda38 100644 --- a/internal/components/page.templ +++ b/internal/components/page.templ @@ -46,7 +46,7 @@ templ Page(tdata TemplateData) { <h1><a href="/">Searchix</a></h1> <a if tdata.Source == nil { - if tdata.SourceResult != nil || tdata.Query != "" { + if tdata.Query != "" { class="current" } href="/" diff --git a/internal/index/search.go b/internal/index/search.go index dc14ddc..50a5ce2 100644 --- a/internal/index/search.go +++ b/internal/index/search.go @@ -52,38 +52,6 @@ func (index *ReadIndex) GetEnabledSources() ([]string, error) { return enabledSources, nil } -func (index *ReadIndex) GetSource( - ctx context.Context, - source *config.Source, -) (*bleve.SearchResult, error) { - var query query.Query - if source == nil { - query = bleve.NewMatchAllQuery() - } else { - tq := bleve.NewTermQuery(source.Name) - tq.SetField("Source") - query = tq - } - search := bleve.NewSearchRequest(query) - - result, err := index.index.SearchInContext(ctx, search) - - select { - case <-ctx.Done(): - return nil, ctx.Err() - default: - if err != nil { - return nil, errors.WithMessagef( - err, - "failed to execute search to find source %s in index", - source, - ) - } - } - - return result, nil -} - func setField[T query.FieldableQuery]( q T, field string, diff --git a/internal/server/mux.go b/internal/server/mux.go index 9c69a7e..6abf84f 100644 --- a/internal/server/mux.go +++ b/internal/server/mux.go @@ -175,19 +175,12 @@ func NewMux( errorHandler(w, r, err.Error(), http.StatusInternalServerError) } } else { - sourceResult, err := index.GetSource(ctx, source) - if err != nil { - errorHandler(w, r, err.Error(), http.StatusInternalServerError) - - return - } w.Header().Add("Cache-Control", "max-age=14400") err = components.SearchPage( components.TemplateData{ ExtraHeadHTML: cfg.Web.ExtraHeadHTML, Sources: sources, Source: source, - SourceResult: sourceResult, Assets: frontend.Assets, }, components.ResultData{}, |