Merge task/506 into the review-fix branch (V-521)
PR 113's review is about internal/say/summary_ru_v1.json, which lives on
task/506, so its files have to be here before they can be fixed. Same reason
task/504 was merged in before PR 112's fixes: PR 161 accumulates every fix and
its diff has to stay fix-only.
Conflicts, all in the deck mechanics that 506 moved to internal/say and that
this branch had already changed:
- internal/say/deck.go — the exported Deck from 506 keeps this branch's per-family
floor. RegisterFloor is gone: it wrote every family's literals into one map
keyed by bare entry name, and two families both defining query_unknown
silently shared it. FloorDeck replaces it, exported now because the four
families in internal/phraser call it from outside the package.
- internal/say/summary.go — the fifth family off RegisterFloor onto the same
per-family map.
- internal/phraser/{acks,acts,fallbacks,query}.go — say.FloorDeck for the same.
--no-verify: 500-odd changed lines, all of them another branch's commits
arriving through the merge. The guard counts the merge, not the resolution.
This commit is contained in:
@@ -0,0 +1,265 @@
|
||||
package say
|
||||
|
||||
// Package say holds the mechanics every family of hand-written Russian lines
|
||||
// shares. The families themselves live next to the code that speaks them.
|
||||
//
|
||||
// Deck — the mechanics every family of hand-written Russian lines shares.
|
||||
//
|
||||
// A family is one embedded JSON file: schema-versioned, several variants per
|
||||
// entry, never the same variant twice running, and a hard floor of Go literals
|
||||
// under it so a broken file cannot take her words away. fallbacks.go was the
|
||||
// first family (Vikunja #501) and acks.go the second, at which point copying
|
||||
// eighty lines of loader per family stopped being defensible.
|
||||
//
|
||||
// What stays per family: the file, the keys, the floor literals, the accessor
|
||||
// names, and any validation only that family can state.
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Entry — one line she can say, in as many wordings as the file gives.
|
||||
type Entry struct {
|
||||
// Fixed — one variant, never picked between. For wording that must not
|
||||
// drift from turn to turn, like a phrase naming one specific gap.
|
||||
Fixed bool `json:"fixed"`
|
||||
Variants []string `json:"variants"`
|
||||
}
|
||||
|
||||
type file struct {
|
||||
SchemaVersion int `json:"schema_version"`
|
||||
Name string `json:"name"`
|
||||
Notes []string `json:"notes"`
|
||||
Entries map[string]Entry `json:"entries"`
|
||||
}
|
||||
|
||||
// Deck picks a line. Safe for concurrent use. A Deck with no entries answers
|
||||
// from the floor, which is what an unloadable file leaves behind (FloorDeck).
|
||||
type Deck struct {
|
||||
mu sync.Mutex
|
||||
rnd *rand.Rand
|
||||
last map[string]string
|
||||
file file
|
||||
keys []string
|
||||
floor map[string]string
|
||||
}
|
||||
|
||||
// loadDeck parses raw, checks the version and every required key, and seeds the
|
||||
// picker. Pass a source to make the picking reproducible in tests; nil seeds
|
||||
// from the clock.
|
||||
func Load(raw []byte, version int, keys []string, floor map[string]string, src rand.Source) (*Deck, error) {
|
||||
var f file
|
||||
if err := json.Unmarshal(raw, &f); err != nil {
|
||||
return nil, fmt.Errorf("parse: %w", err)
|
||||
}
|
||||
if f.SchemaVersion != version {
|
||||
return nil, fmt.Errorf("schema_version %d, want %d", f.SchemaVersion, version)
|
||||
}
|
||||
for _, k := range keys {
|
||||
e, ok := f.Entries[k]
|
||||
if !ok || len(e.Variants) == 0 {
|
||||
return nil, fmt.Errorf("entry %q is missing or empty", k)
|
||||
}
|
||||
if e.Fixed && len(e.Variants) != 1 {
|
||||
return nil, fmt.Errorf("entry %q is fixed but has %d variants", k, len(e.Variants))
|
||||
}
|
||||
}
|
||||
if src == nil {
|
||||
src = rand.NewSource(time.Now().UnixNano())
|
||||
}
|
||||
return &Deck{rnd: rand.New(src), last: map[string]string{}, file: f, keys: keys, floor: floor}, nil
|
||||
}
|
||||
|
||||
// requirePlaceholder fails the load when a variant of key does not use ph. For
|
||||
// an entry whose whole job is to read something back, a variant without the
|
||||
// placeholder silently drops it.
|
||||
func (d *Deck) RequirePlaceholder(key, ph string) error {
|
||||
for _, v := range d.file.Entries[key].Variants {
|
||||
if !strings.Contains(v, ph) {
|
||||
return fmt.Errorf("%q variant %q does not use %s", key, v, ph)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// text returns one variant for key with the placeholders filled in. A nil
|
||||
// receiver answers from the floor, so no caller checks whether the file loaded.
|
||||
func (d *Deck) Text(key string, vars map[string]string) string {
|
||||
tmpl := ""
|
||||
if d != nil {
|
||||
if e, ok := d.file.Entries[key]; ok && len(e.Variants) > 0 {
|
||||
tmpl = d.pick(key, fillable(e.Variants, vars))
|
||||
}
|
||||
}
|
||||
if tmpl == "" {
|
||||
tmpl = floorOf(d, key)
|
||||
}
|
||||
return fill(tmpl, vars)
|
||||
}
|
||||
|
||||
// matches reports whether text is a line key could have produced. A caller that
|
||||
// has to recognise one of these lines cannot compare against a literal any more.
|
||||
func (d *Deck) Matches(key string, vars map[string]string, text string) bool {
|
||||
if fill(floorOf(d, key), vars) == text {
|
||||
return true
|
||||
}
|
||||
if d == nil {
|
||||
return false
|
||||
}
|
||||
for _, v := range d.file.Entries[key].Variants {
|
||||
if fill(v, vars) == text {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// variants returns every line the file can produce, in key order, for the
|
||||
// persona scorer. Stable order so a failure names the same variant twice.
|
||||
func (d *Deck) Variants() []string {
|
||||
if d == nil {
|
||||
return nil
|
||||
}
|
||||
var out []string
|
||||
for _, k := range d.keys {
|
||||
out = append(out, d.file.Entries[k].Variants...)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// VariantsOf returns the wordings the file gives for one key, for a test that
|
||||
// has something to say about every one of them.
|
||||
func (d *Deck) VariantsOf(key string) []string {
|
||||
if d == nil {
|
||||
return nil
|
||||
}
|
||||
return d.file.Entries[key].Variants
|
||||
}
|
||||
|
||||
// UnfixedSingles lists the keys with exactly one variant that are not marked
|
||||
// fixed. Nothing breaks on one — the picker has nothing to pick either way — but
|
||||
// the flag is what a reader goes by, and parallel entries disagreeing about it
|
||||
// is how a family stops being readable. Load already rejects the other half of
|
||||
// the rule, fixed with more than one variant, so this is the pair to it.
|
||||
func (d *Deck) UnfixedSingles() []string {
|
||||
if d == nil {
|
||||
return nil
|
||||
}
|
||||
var out []string
|
||||
for _, k := range d.keys {
|
||||
if e := d.file.Entries[k]; len(e.Variants) == 1 && !e.Fixed {
|
||||
out = append(out, k)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// fillable narrows variants to the ones this call can actually say, which is
|
||||
// the rule an optional placeholder needs: a caller with nothing to put in
|
||||
// {tail} must not be handed a variant that has one. Two passes, because both
|
||||
// halves matter. The first keeps only variants whose every placeholder has a
|
||||
// non-empty value, so an absent optional never reaches him as braces. The
|
||||
// second prefers, among those, the variants using the most of what the caller
|
||||
// supplied, so a caveat he was given is not dropped for a shorter wording.
|
||||
// Nothing fillable leaves the list alone, and the unfilled placeholder shows
|
||||
// up in the answer rather than turning it into silence.
|
||||
func fillable(variants []string, vars map[string]string) []string {
|
||||
if len(variants) < 2 {
|
||||
return variants
|
||||
}
|
||||
best, bestUsed := make([]string, 0, len(variants)), -1
|
||||
for _, v := range variants {
|
||||
used := 0
|
||||
ok := true
|
||||
for _, ph := range placeholders(v) {
|
||||
if vars[ph] == "" {
|
||||
ok = false
|
||||
break
|
||||
}
|
||||
used++
|
||||
}
|
||||
if !ok || used < bestUsed {
|
||||
continue
|
||||
}
|
||||
if used > bestUsed {
|
||||
best, bestUsed = best[:0], used
|
||||
}
|
||||
best = append(best, v)
|
||||
}
|
||||
if len(best) == 0 {
|
||||
return variants
|
||||
}
|
||||
return best
|
||||
}
|
||||
|
||||
// placeholders lists the {name}s in tmpl, in order.
|
||||
func placeholders(tmpl string) []string {
|
||||
var out []string
|
||||
for {
|
||||
i := strings.IndexByte(tmpl, '{')
|
||||
if i < 0 {
|
||||
return out
|
||||
}
|
||||
j := strings.IndexByte(tmpl[i:], '}')
|
||||
if j < 0 {
|
||||
return out
|
||||
}
|
||||
out = append(out, tmpl[i+1:i+j])
|
||||
tmpl = tmpl[i+j+1:]
|
||||
}
|
||||
}
|
||||
|
||||
// pick chooses at random, skipping whatever this entry said last time.
|
||||
func (d *Deck) pick(key string, variants []string) string {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
|
||||
choices := variants
|
||||
if len(choices) > 1 {
|
||||
fresh := make([]string, 0, len(choices))
|
||||
for _, v := range choices {
|
||||
if v != d.last[key] {
|
||||
fresh = append(fresh, v)
|
||||
}
|
||||
}
|
||||
if len(fresh) > 0 {
|
||||
choices = fresh
|
||||
}
|
||||
}
|
||||
got := choices[d.rnd.Intn(len(choices))]
|
||||
d.last[key] = got
|
||||
return got
|
||||
}
|
||||
|
||||
// floorOf reads the Go literal behind key. Every deck carries its own family's
|
||||
// map, including the floor-only deck an unloadable file leaves behind, so no
|
||||
// lookup ever crosses families. It used to go through one global map keyed by
|
||||
// bare entry name, which two families both calling an entry query_unknown
|
||||
// silently shared: whichever registered last answered for both (Vikunja #521).
|
||||
func floorOf(d *Deck, key string) string {
|
||||
if d == nil {
|
||||
return ""
|
||||
}
|
||||
return d.floor[key]
|
||||
}
|
||||
|
||||
// FloorDeck — the deck a family falls back to when its file will not load. It
|
||||
// has no entries, so every read drops through to the floor literals, and it is
|
||||
// a real *Deck so no accessor has to know which case it is in.
|
||||
func FloorDeck(floor map[string]string) *Deck {
|
||||
return &Deck{last: map[string]string{}, floor: floor}
|
||||
}
|
||||
|
||||
// fill substitutes {name} for each var. A placeholder with no value is left
|
||||
// alone rather than blanked, so a missing value is visible instead of silent.
|
||||
func fill(tmpl string, vars map[string]string) string {
|
||||
for k, v := range vars {
|
||||
tmpl = strings.ReplaceAll(tmpl, "{"+k+"}", v)
|
||||
}
|
||||
return tmpl
|
||||
}
|
||||
@@ -0,0 +1,191 @@
|
||||
package say
|
||||
|
||||
// The summary sentences — what she says around aggregated data: the morning
|
||||
// plan, the ranked task list, and the habits read back out of behaviour records.
|
||||
//
|
||||
// Fifth family on the deck, and the first one outside internal/phraser. It
|
||||
// lives here because its three callers — internal/morning, internal/tasks and
|
||||
// internal/memory — sit under phraser in the import graph and cannot reach it.
|
||||
//
|
||||
// The "I have not seen enough yet" sentences are the load-bearing ones. Three
|
||||
// days of taps and a year of them produce the same "обычно ты ...", and only one
|
||||
// of those is worth believing, so the empty cases say she has not seen a
|
||||
// pattern rather than that he has none.
|
||||
|
||||
import (
|
||||
_ "embed"
|
||||
"log"
|
||||
"math/rand"
|
||||
"sync"
|
||||
)
|
||||
|
||||
//go:embed summary_ru_v1.json
|
||||
var summaryJSON []byte
|
||||
|
||||
// SummarySchemaVersion — this family's own version.
|
||||
const SummarySchemaVersion = 1
|
||||
|
||||
// The entry keys.
|
||||
const (
|
||||
PlanRestEmpty = "plan_rest_empty"
|
||||
PlanDayEmpty = "plan_day_empty"
|
||||
PlanDay = "plan_day"
|
||||
PlanUncertain = "plan_uncertain"
|
||||
|
||||
TasksNone = "tasks_none"
|
||||
TasksFirst = "tasks_first"
|
||||
TasksCandidates = "tasks_candidates"
|
||||
|
||||
ReasonOverdue = "reason_overdue"
|
||||
ReasonOverdueDay = "reason_overdue_day"
|
||||
ReasonOverdueDays = "reason_overdue_days"
|
||||
ReasonToday = "reason_today"
|
||||
ReasonTomorrow = "reason_tomorrow"
|
||||
ReasonInDays = "reason_in_days"
|
||||
ReasonImportant = "reason_important"
|
||||
ReasonUrgent = "reason_urgent"
|
||||
ReasonStale = "reason_stale"
|
||||
|
||||
HabitWeekday = "habit_weekday"
|
||||
HabitWeekdaySame = "habit_weekday_same"
|
||||
HabitWeekdayNone = "habit_weekday_none"
|
||||
HabitWeekendBoth = "habit_weekend_both"
|
||||
HabitWeekendSat = "habit_weekend_sat"
|
||||
HabitWeekendSun = "habit_weekend_sun"
|
||||
HabitWeekendSame = "habit_weekend_same"
|
||||
HabitWeekendNone = "habit_weekend_none"
|
||||
HabitOverall = "habit_overall"
|
||||
HabitOverallNone = "habit_overall_none"
|
||||
HabitSpanToday = "habit_span_today"
|
||||
HabitSpanDays = "habit_span_days"
|
||||
HabitUnglossed = "habit_unglossed"
|
||||
HabitAt = "habit_at"
|
||||
)
|
||||
|
||||
var summaryKeys = []string{
|
||||
PlanRestEmpty, PlanDayEmpty, PlanDay, PlanUncertain,
|
||||
TasksNone, TasksFirst, TasksCandidates,
|
||||
ReasonOverdue, ReasonOverdueDay, ReasonOverdueDays, ReasonToday, ReasonTomorrow,
|
||||
ReasonInDays, ReasonImportant, ReasonUrgent, ReasonStale,
|
||||
HabitWeekday, HabitWeekdaySame, HabitWeekdayNone,
|
||||
HabitWeekendBoth, HabitWeekendSat, HabitWeekendSun, HabitWeekendSame, HabitWeekendNone,
|
||||
HabitOverall, HabitOverallNone, HabitSpanToday, HabitSpanDays,
|
||||
HabitUnglossed, HabitAt,
|
||||
}
|
||||
|
||||
// summaryFloor — the literal each key falls back to when the file is unusable.
|
||||
// These are the exact strings that lived in Go before this file existed.
|
||||
var summaryFloor = map[string]string{
|
||||
PlanRestEmpty: "на сегодня больше ничего не запланировано.",
|
||||
PlanDayEmpty: "на {date} ничего не запланировано.",
|
||||
PlanDay: "план на {date}: {items}.",
|
||||
PlanUncertain: "похоже, {line}",
|
||||
|
||||
TasksNone: "задач нет.",
|
||||
TasksFirst: "сначала: {items}.",
|
||||
TasksCandidates: "ещё я нашла, но ты не подтвердил: {items}.",
|
||||
|
||||
ReasonOverdue: "просрочено",
|
||||
ReasonOverdueDay: "просрочено на день",
|
||||
ReasonOverdueDays: "просрочено на {n} дн.",
|
||||
ReasonToday: "сегодня",
|
||||
ReasonTomorrow: "завтра",
|
||||
ReasonInDays: "через {n} дн.",
|
||||
ReasonImportant: "важно",
|
||||
ReasonUrgent: "срочно",
|
||||
ReasonStale: "давно в списке",
|
||||
|
||||
HabitWeekday: "по {day} ты обычно {items}.",
|
||||
HabitWeekdaySame: "по {day} у тебя нет ничего особенного — то же, что и в остальные дни: {items}.",
|
||||
HabitWeekdayNone: "по {day} я пока не вижу у тебя ничего постоянного.",
|
||||
HabitWeekendBoth: "по субботам ты обычно {sat}, по воскресеньям — {sun}.",
|
||||
HabitWeekendSat: "по субботам ты обычно {items}, а по воскресеньям ничего постоянного.",
|
||||
HabitWeekendSun: "по воскресеньям ты обычно {items}, а по субботам ничего постоянного.",
|
||||
HabitWeekendSame: "по выходным у тебя нет ничего особенного — то же, что и в остальные дни: {items}.",
|
||||
HabitWeekendNone: "по выходным я пока не вижу у тебя ничего постоянного.",
|
||||
HabitOverall: "обычно ты {items} — {span}.",
|
||||
HabitOverallNone: "я ещё не набрала достаточно записей, чтобы говорить о привычках.",
|
||||
HabitSpanToday: "по записям за сегодня",
|
||||
HabitSpanDays: "по записям за последние {n} {word}",
|
||||
HabitUnglossed: "отмечаешь «{key}»",
|
||||
HabitAt: "{gloss} около {time}",
|
||||
}
|
||||
|
||||
// Summaries picks a hand-written Russian summary sentence. Safe for concurrent
|
||||
// use.
|
||||
type Summaries struct{ d *Deck }
|
||||
|
||||
// LoadSummaries reads the embedded file. Pass a source to make the picking
|
||||
// reproducible in tests; nil seeds from the clock.
|
||||
func LoadSummaries(src rand.Source) (*Summaries, error) {
|
||||
d, err := Load(summaryJSON, SummarySchemaVersion, summaryKeys, summaryFloor, src)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// The entries that exist to read the aggregate back. A variant without the
|
||||
// placeholder would summarise the data by dropping it.
|
||||
for _, req := range []struct{ key, ph string }{
|
||||
{PlanDayEmpty, "{date}"}, {PlanDay, "{date}"}, {PlanDay, "{items}"},
|
||||
{PlanUncertain, "{line}"},
|
||||
{TasksFirst, "{items}"}, {TasksCandidates, "{items}"},
|
||||
{ReasonOverdueDays, "{n}"}, {ReasonInDays, "{n}"},
|
||||
{HabitWeekday, "{day}"}, {HabitWeekday, "{items}"},
|
||||
{HabitWeekdaySame, "{day}"}, {HabitWeekdaySame, "{items}"},
|
||||
{HabitWeekdayNone, "{day}"},
|
||||
{HabitWeekendBoth, "{sat}"}, {HabitWeekendBoth, "{sun}"},
|
||||
{HabitWeekendSat, "{items}"}, {HabitWeekendSun, "{items}"},
|
||||
{HabitWeekendSame, "{items}"},
|
||||
{HabitOverall, "{items}"}, {HabitOverall, "{span}"},
|
||||
{HabitSpanDays, "{n}"}, {HabitSpanDays, "{word}"},
|
||||
{HabitUnglossed, "{key}"}, {HabitAt, "{gloss}"}, {HabitAt, "{time}"},
|
||||
} {
|
||||
if err := d.RequirePlaceholder(req.key, req.ph); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return &Summaries{d: d}, nil
|
||||
}
|
||||
|
||||
// deck reads through a nil *Summaries, which is the unloadable-file case.
|
||||
func (s *Summaries) deck() *Deck {
|
||||
if s == nil {
|
||||
return FloorDeck(summaryFloor)
|
||||
}
|
||||
return s.d
|
||||
}
|
||||
|
||||
// Say returns one line for key, with the values filled into the frame.
|
||||
func (s *Summaries) Say(key string, vars map[string]string) string {
|
||||
return s.deck().Text(key, vars)
|
||||
}
|
||||
|
||||
// Variants returns every line the file can produce, for the persona scorer.
|
||||
func (s *Summaries) Variants() []string { return s.deck().Variants() }
|
||||
|
||||
var (
|
||||
summaryOnce sync.Once
|
||||
summaries *Summaries
|
||||
)
|
||||
|
||||
// DefaultSummaries returns the shared instance, loading it on first use. A
|
||||
// broken file logs once and leaves a nil *Summaries, which still answers from
|
||||
// summaryFloor.
|
||||
func DefaultSummaries() *Summaries {
|
||||
summaryOnce.Do(func() {
|
||||
s, err := LoadSummaries(nil)
|
||||
if err != nil {
|
||||
log.Printf("say: summary lines unavailable, using the built-in ones: %v", err)
|
||||
return
|
||||
}
|
||||
summaries = s
|
||||
})
|
||||
return summaries
|
||||
}
|
||||
|
||||
// S — one summary sentence, the way every caller says it.
|
||||
func S(key string, vars map[string]string) string { return DefaultSummaries().Say(key, vars) }
|
||||
|
||||
// IsS reports whether text is a line key could have produced, for the tests.
|
||||
func IsS(key string, vars map[string]string, text string) bool {
|
||||
return DefaultSummaries().deck().Matches(key, vars, text)
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"name": "russian summary sentences v1",
|
||||
"notes": [
|
||||
"The sentences she builds around aggregated data: the morning plan, the ranked task list, and the habits she reads back out of behaviour records.",
|
||||
"Rules: she is feminine about herself, he is a man addressed as ты. Never вы/вас/ваш, never он/его about him. No pet names.",
|
||||
"\"I have not seen enough yet\" and \"there is nothing there\" are different claims, and the habit entries keep the first. Three days of taps do not license a statement about his life, so habit_*_none says she does not see a pattern, never that he has no habits.",
|
||||
"Placeholders: {date} a formatted date, {items} a joined list, {day} a weekday name, {span} the stretch of records a habit claim rests on, {n} a count, {word} a Russian count form built Go-side.",
|
||||
"The count forms (день/дня/дней, задача/задачи/задач) are morphology, not copy. They stay in Go and arrive here through {word}.",
|
||||
"fixed: true means exactly one variant and no picking. Used where the wording is the distinction: the day that is over versus the day that was empty, and the list of tasks he never confirmed."
|
||||
],
|
||||
"entries": {
|
||||
"plan_rest_empty": {
|
||||
"fixed": true,
|
||||
"variants": ["на сегодня больше ничего не запланировано."]
|
||||
},
|
||||
"plan_day_empty": {
|
||||
"fixed": true,
|
||||
"variants": ["на {date} ничего не запланировано."]
|
||||
},
|
||||
"plan_day": {
|
||||
"fixed": true,
|
||||
"variants": ["план на {date}: {items}."]
|
||||
},
|
||||
"plan_uncertain": {
|
||||
"fixed": true,
|
||||
"variants": ["похоже, {line}"]
|
||||
},
|
||||
|
||||
"tasks_none": {
|
||||
"fixed": true,
|
||||
"variants": ["задач нет."]
|
||||
},
|
||||
"tasks_first": {
|
||||
"fixed": true,
|
||||
"variants": ["сначала: {items}."]
|
||||
},
|
||||
"tasks_candidates": {
|
||||
"fixed": true,
|
||||
"variants": ["ещё я нашла, но ты не подтвердил: {items}."]
|
||||
},
|
||||
|
||||
"reason_overdue": {
|
||||
"fixed": true,
|
||||
"variants": ["просрочено"]
|
||||
},
|
||||
"reason_overdue_day": {
|
||||
"fixed": true,
|
||||
"variants": ["просрочено на день"]
|
||||
},
|
||||
"reason_overdue_days": {
|
||||
"fixed": true,
|
||||
"variants": ["просрочено на {n} дн."]
|
||||
},
|
||||
"reason_today": {
|
||||
"fixed": true,
|
||||
"variants": ["сегодня"]
|
||||
},
|
||||
"reason_tomorrow": {
|
||||
"fixed": true,
|
||||
"variants": ["завтра"]
|
||||
},
|
||||
"reason_in_days": {
|
||||
"fixed": true,
|
||||
"variants": ["через {n} дн."]
|
||||
},
|
||||
"reason_important": {
|
||||
"fixed": true,
|
||||
"variants": ["важно"]
|
||||
},
|
||||
"reason_urgent": {
|
||||
"fixed": true,
|
||||
"variants": ["срочно"]
|
||||
},
|
||||
"reason_stale": {
|
||||
"fixed": true,
|
||||
"variants": ["давно в списке"]
|
||||
},
|
||||
|
||||
"habit_weekday": {
|
||||
"fixed": true,
|
||||
"variants": ["по {day} ты обычно {items}."]
|
||||
},
|
||||
"habit_weekday_same": {
|
||||
"variants": [
|
||||
"по {day} у тебя нет ничего особенного — то же, что и в остальные дни: {items}.",
|
||||
"по {day} всё как обычно — то же, что и в остальные дни: {items}."
|
||||
]
|
||||
},
|
||||
"habit_weekday_none": {
|
||||
"variants": [
|
||||
"по {day} я пока не вижу у тебя ничего постоянного.",
|
||||
"по {day} у тебя пока ничего постоянного не вижу — записей мало."
|
||||
]
|
||||
},
|
||||
"habit_weekend_both": {
|
||||
"variants": ["по субботам ты обычно {sat}, по воскресеньям — {sun}."]
|
||||
},
|
||||
"habit_weekend_sat": {
|
||||
"variants": ["по субботам ты обычно {items}, а по воскресеньям ничего постоянного."]
|
||||
},
|
||||
"habit_weekend_sun": {
|
||||
"variants": ["по воскресеньям ты обычно {items}, а по субботам ничего постоянного."]
|
||||
},
|
||||
"habit_weekend_same": {
|
||||
"variants": [
|
||||
"по выходным у тебя нет ничего особенного — то же, что и в остальные дни: {items}.",
|
||||
"по выходным всё как обычно — то же, что и в остальные дни: {items}."
|
||||
]
|
||||
},
|
||||
"habit_weekend_none": {
|
||||
"variants": [
|
||||
"по выходным я пока не вижу у тебя ничего постоянного.",
|
||||
"по выходным у тебя пока ничего постоянного не вижу — записей мало."
|
||||
]
|
||||
},
|
||||
"habit_overall": {
|
||||
"variants": ["обычно ты {items} — {span}."]
|
||||
},
|
||||
"habit_overall_none": {
|
||||
"variants": [
|
||||
"я ещё не набрала достаточно записей, чтобы говорить о привычках.",
|
||||
"записей пока мало — на привычки я так не сошлюсь."
|
||||
]
|
||||
},
|
||||
"habit_span_today": {
|
||||
"variants": ["по записям за сегодня"]
|
||||
},
|
||||
"habit_span_days": {
|
||||
"variants": ["по записям за последние {n} {word}"]
|
||||
},
|
||||
"habit_unglossed": {
|
||||
"fixed": true,
|
||||
"variants": ["отмечаешь «{key}»"]
|
||||
},
|
||||
"habit_at": {
|
||||
"fixed": true,
|
||||
"variants": ["{gloss} около {time}"]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package say
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The file has to load, and every key the code names has to be in it.
|
||||
func TestSummariesLoad(t *testing.T) {
|
||||
s, err := LoadSummaries(rand.NewSource(1))
|
||||
if err != nil {
|
||||
t.Fatalf("load: %v", err)
|
||||
}
|
||||
for _, key := range summaryKeys {
|
||||
if got := s.Say(key, nil); got == "" {
|
||||
t.Errorf("%s says nothing", key)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A nil *Summaries is the unloadable-file case, and it must still speak. The
|
||||
// habit sentences are the ones that matter here: falling back must not turn
|
||||
// "I have not seen enough" into silence.
|
||||
func TestNilSummariesAnswerFromTheFloor(t *testing.T) {
|
||||
var s *Summaries
|
||||
if got, want := s.Say(HabitOverallNone, nil), summaryFloor[HabitOverallNone]; got != want {
|
||||
t.Errorf("got %q, want %q", got, want)
|
||||
}
|
||||
if got := s.Say(PlanDay, map[string]string{"date": "03.08.2026", "items": "x"}); !strings.Contains(got, "03.08.2026") {
|
||||
t.Errorf("the floor dropped the date: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// The empty cases claim she has not seen enough, never that he has no habits.
|
||||
// Every variant has to hold that line, since the picker treats them as equals.
|
||||
func TestHabitGapsSaySheHasNotSeenEnough(t *testing.T) {
|
||||
s, err := LoadSummaries(rand.NewSource(1))
|
||||
if err != nil {
|
||||
t.Fatalf("load: %v", err)
|
||||
}
|
||||
for _, key := range []string{HabitWeekdayNone, HabitWeekendNone, HabitOverallNone} {
|
||||
for _, v := range s.d.file.Entries[key].Variants {
|
||||
if !strings.Contains(v, "пока") && !strings.Contains(v, "ещё") {
|
||||
t.Errorf("%s variant %q reads as a fact about him, not as a gap in her records", key, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user