fix today memory after restart
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"git.vakhrushev.me/av/remembos/internal/memos"
|
||||
"git.vakhrushev.me/av/remembos/internal/search"
|
||||
"git.vakhrushev.me/av/remembos/internal/storage"
|
||||
)
|
||||
@@ -14,6 +15,7 @@ import (
|
||||
type Service struct {
|
||||
selector *search.Selector
|
||||
store *storage.Storage
|
||||
client *memos.Client
|
||||
loc *time.Location
|
||||
logger *slog.Logger
|
||||
|
||||
@@ -22,16 +24,18 @@ type Service struct {
|
||||
cached *search.Memory
|
||||
}
|
||||
|
||||
func NewService(selector *search.Selector, store *storage.Storage, loc *time.Location, logger *slog.Logger) *Service {
|
||||
func NewService(selector *search.Selector, store *storage.Storage, client *memos.Client, loc *time.Location, logger *slog.Logger) *Service {
|
||||
return &Service{
|
||||
selector: selector,
|
||||
store: store,
|
||||
client: client,
|
||||
loc: loc,
|
||||
logger: logger,
|
||||
}
|
||||
}
|
||||
|
||||
// GetTodayMemory returns the memory for today, caching the result.
|
||||
// On cache miss (e.g. after restart), it checks the DB for a memo already shown today.
|
||||
func (s *Service) GetTodayMemory(ctx context.Context) (*search.Memory, error) {
|
||||
today := time.Now().In(s.loc)
|
||||
dayKey := today.Format("2006-01-02")
|
||||
@@ -44,6 +48,38 @@ func (s *Service) GetTodayMemory(ctx context.Context) (*search.Memory, error) {
|
||||
}
|
||||
s.mu.Unlock()
|
||||
|
||||
// Try to restore from DB — check if a memo was already shown today
|
||||
dayStart := time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, s.loc)
|
||||
dayEnd := dayStart.AddDate(0, 0, 1)
|
||||
|
||||
memoName, tier, err := s.store.GetLastShownToday(ctx, dayStart.Unix(), dayEnd.Unix())
|
||||
if err != nil {
|
||||
s.logger.Error("failed to check today's show history", "error", err)
|
||||
// Fall through to select a new one
|
||||
}
|
||||
|
||||
if memoName != "" {
|
||||
s.logger.Info("restoring today's memory from history", "memo", memoName)
|
||||
|
||||
memo, err := s.client.GetMemo(ctx, memoName)
|
||||
if err != nil {
|
||||
s.logger.Error("failed to fetch memo from history, selecting new", "memo", memoName, "error", err)
|
||||
} else {
|
||||
mem := &search.Memory{
|
||||
Memo: memo,
|
||||
Tier: tier,
|
||||
Date: memo.DisplayTime,
|
||||
}
|
||||
|
||||
s.mu.Lock()
|
||||
s.cacheDay = dayKey
|
||||
s.cached = mem
|
||||
s.mu.Unlock()
|
||||
|
||||
return mem, nil
|
||||
}
|
||||
}
|
||||
|
||||
s.logger.Info("selecting new memory", "date", dayKey)
|
||||
|
||||
mem, err := s.selector.Select(ctx, today)
|
||||
@@ -58,7 +94,6 @@ func (s *Service) GetTodayMemory(ctx context.Context) (*search.Memory, error) {
|
||||
|
||||
if err := s.store.RecordShow(ctx, mem.Memo.Name, mem.Tier); err != nil {
|
||||
s.logger.Error("failed to record show", "error", err)
|
||||
// Non-fatal: still return the memory
|
||||
}
|
||||
|
||||
s.mu.Lock()
|
||||
|
||||
Reference in New Issue
Block a user