Refactored Startpage

This commit is contained in:
Simon Martens
2025-02-26 16:06:29 +01:00
parent 8f664d24ca
commit cf6d4a59ed
15 changed files with 354 additions and 603 deletions

View File

@@ -1,148 +0,0 @@
package dbmodels
import (
"strconv"
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core"
)
type EntriesAgents map[string][]*REntriesAgents
func EntriesForID(app core.App, query int) ([]*Entry, error) {
entries := []*Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{MUSENALMID_FIELD: strconv.Itoa(query)}).
All(&entries)
if err != nil {
return nil, err
}
return entries, nil
}
func YearsForEntries(app core.App) ([]int, error) {
rec := []core.Record{}
err := app.RecordQuery(ENTRIES_TABLE).
Select(YEAR_FIELD + " AS id").
Distinct(true).
OrderBy("id").
All(&rec)
if err != nil {
return nil, err
}
years := []int{}
for _, r := range rec {
years = append(years, r.GetInt("id"))
}
return years, nil
}
func EntriesForYear(app core.App, year int) ([]*Entry, error) {
entries := []*Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{YEAR_FIELD: year}).
All(&entries)
if err != nil {
return nil, err
}
return entries, nil
}
func EntriesForAgent(app core.App, agentId string) ([]*Entry, EntriesAgents, error) {
relations := []*core.Record{}
err := app.RecordQuery(RelationTableName(ENTRIES_TABLE, AGENTS_TABLE)).
Where(dbx.HashExp{AGENTS_TABLE: agentId}).
All(&relations)
if err != nil {
return nil, nil, err
}
app.ExpandRecords(relations, []string{ENTRIES_TABLE}, nil)
entries := []*Entry{}
for _, r := range relations {
record := r.ExpandedOne(ENTRIES_TABLE)
if record == nil {
continue
}
entries = append(entries, NewEntry(record))
}
agents := map[string][]*REntriesAgents{}
for _, r := range relations {
agent := NewREntriesAgents(r)
agents[agent.Entry()] = append(agents[agent.Entry()], agent)
}
return entries, agents, nil
}
func EntriesForPlace(app core.App, placeId string) ([]*Entry, error) {
entries := []*Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.Like(PLACES_TABLE, placeId).Match(true, true)).
All(&entries)
if err != nil {
return nil, err
}
return entries, nil
}
func EntryForId(app core.App, id string) (*Entry, error) {
entry := &Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{ID_FIELD: id}).
One(entry)
if err != nil {
return nil, err
}
return entry, nil
}
func EntriesForIds(app core.App, ids []any) ([]*Entry, error) {
entries := []*Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{ID_FIELD: ids}).
All(&entries)
if err != nil {
return nil, err
}
return entries, nil
}
func EntryForMusenalmID(app core.App, id string) (*Entry, error) {
entry := &Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{MUSENALMID_FIELD: id}).
One(entry)
if err != nil {
return nil, err
}
return entry, nil
}
func EntriesForContents(app core.App, contents []*Content) (map[string]*Entry, error) {
cids := []any{}
for _, c := range contents {
cids = append(cids, c.Entry())
}
entries := []*Entry{}
err := app.RecordQuery(ENTRIES_TABLE).
Where(dbx.HashExp{ID_FIELD: cids}).
All(&entries)
if err != nil {
return nil, err
}
entriesMap := make(map[string]*Entry, len(entries))
for _, e := range entries {
entriesMap[e.Id] = e
}
return entriesMap, nil
}

View File

@@ -103,6 +103,11 @@ func Series_IDs(app core.App, ids []any) ([]*Series, error) {
return TableByIDs[[]*Series](app, SERIES_TABLE, ids)
}
func Series_ID(app core.App, id string) (*Series, error) {
ret, err := TableByID[Series](app, SERIES_TABLE, id)
return &ret, err
}
func Places_IDs(app core.App, ids []any) ([]*Place, error) {
return TableByIDs[[]*Place](app, PLACES_TABLE, ids)
}

View File

@@ -1,7 +1,6 @@
package dbmodels
import (
"slices"
"strings"
"github.com/Theodor-Springmann-Stiftung/musenalm/helpers/datatypes"
@@ -69,7 +68,7 @@ outer_loop:
ids = append(ids, id.ID)
}
altseries, err := SeriessesForIds(app, ids)
altseries, err := Series_IDs(app, ids)
if err != nil {
return nil, nil, err
}
@@ -99,246 +98,3 @@ func TitleSearchSeries(app core.App, query string) ([]*Series, error) {
return series, nil
}
// INFO: expects a normalized query string
// Returns all ids that match the query
func FTS5SearchSeries(app core.App, query string) ([]*FTS5IDQueryResult, error) {
seriesids := []*FTS5IDQueryResult{}
q := NewFTS5Query().
From(SERIES_TABLE).
SelectID()
queries := strings.Split(query, " ")
for _, que := range queries {
que := datatypes.NormalizeString(que)
if len(que) >= 3 {
q.AndMatch([]string{SERIES_TITLE_FIELD, ANNOTATION_FIELD, REFERENCES_FIELD}, que)
}
}
querystring := q.Query()
if querystring == "" {
return seriesids, nil
}
err := app.DB().NewQuery(querystring).All(&seriesids)
if err != nil {
return nil, err
}
return seriesids, nil
}
func IDsForSeriesses(series []*Series) []any {
ids := []any{}
for _, s := range series {
ids = append(ids, s.Id)
}
return ids
}
func makeMapForEnrySeries(relations []*REntriesSeries, entries map[string]*Entry) SeriesEntries {
m := map[string][]*REntriesSeries{}
for _, r := range relations {
m[r.Series()] = append(m[r.Series()], r)
}
for _, rel := range m {
slices.SortFunc(rel, func(i, j *REntriesSeries) int {
ientry := entries[i.Entry()]
jentry := entries[j.Entry()]
return ientry.Year() - jentry.Year()
})
}
return m
}
func EntriesForSeriesses(app core.App, series []*Series) (
SeriesEntries,
map[string]*Entry,
error) {
ids := IDsForSeriesses(series)
relations := []*core.Record{}
err := app.RecordQuery(RelationTableName(ENTRIES_TABLE, SERIES_TABLE)).
Where(dbx.HashExp{
SERIES_TABLE: ids,
}).
All(&relations)
if err != nil {
return nil, nil, err
}
app.ExpandRecords(relations, []string{ENTRIES_TABLE}, nil)
bmap := map[string]*Entry{}
for _, r := range relations {
record := r.ExpandedOne(ENTRIES_TABLE)
if record == nil {
continue
}
entry := NewEntry(record)
bmap[entry.Id] = entry
}
smap := map[string][]*REntriesSeries{}
for _, r := range relations {
rel := NewREntriesSeries(r)
smap[rel.Series()] = append(smap[rel.Series()], rel)
}
for _, rel := range smap {
slices.SortFunc(rel, func(i, j *REntriesSeries) int {
ientry := bmap[i.Entry()]
jentry := bmap[j.Entry()]
return ientry.Year() - jentry.Year()
})
}
return smap, bmap, nil
}
func LettersForSeries(app core.App) ([]string, error) {
letters := []core.Record{}
ids := []string{}
err := app.RecordQuery(SERIES_TABLE).
Select("upper(substr(" + SERIES_TITLE_FIELD + ", 1, 1)) AS id").
Distinct(true).
All(&letters)
if err != nil {
return nil, err
}
for _, l := range letters {
ids = append(ids, l.GetString("id"))
}
return ids, nil
}
func AllAgentsForSeries(app core.App) ([]*Agent, error) {
rels := []*core.Record{}
// INFO: we could just fetch all relations here
err := app.RecordQuery(RelationTableName(ENTRIES_TABLE, AGENTS_TABLE)).
GroupBy(AGENTS_TABLE).
All(&rels)
if err != nil {
return nil, err
}
app.ExpandRecords(rels, []string{AGENTS_TABLE}, nil)
agents := []*Agent{}
for _, r := range rels {
record := r.ExpandedOne(AGENTS_TABLE)
if record == nil {
continue
}
agent := NewAgent(record)
agents = append(agents, agent)
}
SortAgentsByName(agents)
return agents, err
}
func SeriesForLetter(app core.App, letter string) ([]*Series, error) {
series := []*Series{}
err := app.RecordQuery(SERIES_TABLE).
Where(dbx.Like(SERIES_TITLE_FIELD, letter).Match(false, true)).
OrderBy(SERIES_TITLE_FIELD).
All(&series)
if err != nil {
return nil, err
}
return series, nil
}
func SeriesForAgent(app core.App, id string) ([]*Series, SeriesEntries, map[string]*Entry, error) {
entries, _, err := EntriesForAgent(app, id)
if err != nil {
return nil, nil, nil, err
}
return SeriesForEntries(app, entries)
}
func SeriesForPlace(app core.App, id string) ([]*Series, SeriesEntries, map[string]*Entry, error) {
entries, err := EntriesForPlace(app, id)
if err != nil {
return nil, nil, nil, err
}
return SeriesForEntries(app, entries)
}
func SeriesForEntries(app core.App, entries []*Entry) ([]*Series, SeriesEntries, map[string]*Entry, error) {
bids := make([]any, 0, len(entries))
for _, e := range entries {
bids = append(bids, e.Id)
}
srels := []*REntriesSeries{}
err := app.RecordQuery(RelationTableName(ENTRIES_TABLE, SERIES_TABLE)).
Where(dbx.HashExp{ENTRIES_TABLE: bids}).
All(&srels)
if err != nil {
return nil, nil, nil, err
}
sids := []any{}
for _, s := range srels {
sids = append(sids, s.Series())
}
series := []*Series{}
err = app.RecordQuery(SERIES_TABLE).
Where(dbx.HashExp{ID_FIELD: sids}).
All(&series)
if err != nil {
return nil, nil, nil, err
}
bmap := make(map[string]*Entry, len(entries))
for _, e := range entries {
bmap[e.Id] = e
}
smap := makeMapForEnrySeries(srels, bmap)
return series, smap, bmap, nil
}
func SeriesForYear(app core.App, year int) ([]*Series, SeriesEntries, map[string]*Entry, error) {
series, err := EntriesForYear(app, year)
if err != nil {
return nil, nil, nil, err
}
return SeriesForEntries(app, series)
}
func SeriesForId(app core.App, id string) (*Series, error) {
s := &Series{}
err := app.RecordQuery(SERIES_TABLE).
Where(dbx.HashExp{MUSENALMID_FIELD: id}).
One(s)
if err != nil {
return nil, err
}
return s, nil
}
func SeriessesForIds(app core.App, ids []any) ([]*Series, error) {
series := []*Series{}
err := app.RecordQuery(SERIES_TABLE).
Where(dbx.HashExp{ID_FIELD: ids}).
All(&series)
if err != nil {
return nil, err
}
return series, nil
}