X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/6844f8c992ec4e276a3a0d93b544de0127eebbd2..7b8d8e8f4b57bd51fd6d0f0d926b821f06b0e1f0:/memory.go?ds=sidebyside

diff --git a/memory.go b/memory.go
index c9fe1c5..602b86c 100644
--- a/memory.go
+++ b/memory.go
@@ -149,6 +149,11 @@ func (m *Memory) AppendDated(kind, text, date string) (Message, error) {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 
+	return m.appendDated(kind, text, date)
+}
+
+// appendDated appends under the memory lock and updates the views and builds.
+func (m *Memory) appendDated(kind, text, date string) (Message, error) {
 	message, err := m.log.AppendDated(kind, text, date)
 	if err != nil {
 		return Message{}, fmt.Errorf("append dated log message: %w", err)
@@ -172,6 +177,44 @@ func (m *Memory) AppendDated(kind, text, date string) (Message, error) {
 	return message, nil
 }
 
+// AppendOnce appends a queued message. prepare saves its log ID before the
+// append, under the memory lock. A saved ID permits recovery after a stop
+// between that save and the append, without a second log entry. prepare must
+// not call Memory. The caller stops delivery after a failed append.
+func (m *Memory) AppendOnce(kind, text string, id *int, prepare func(int) error) (Message, error) {
+	m.mutex.Lock()
+	defer m.mutex.Unlock()
+
+	if id != nil && *id < m.log.Len() {
+		message, err := m.log.Message(*id)
+		if err != nil {
+			return Message{}, fmt.Errorf("read queued message: %w", err)
+		}
+
+		if message.Kind != kind || message.Text != text {
+			return Message{}, errors.New("queued message does not match its log entry")
+		}
+
+		return message, nil
+	}
+
+	if id != nil && *id != m.log.Len() {
+		return Message{}, errors.New("queued message is beyond the log")
+	}
+
+	err := prepare(m.log.Len())
+	if err != nil {
+		return Message{}, fmt.Errorf("prepare queued message: %w", err)
+	}
+
+	message, err := m.appendDated(kind, text, "")
+	if err != nil {
+		return Message{}, fmt.Errorf("append queued message: %w", err)
+	}
+
+	return message, nil
+}
+
 // children reads the two children of the node key.
 func (m *Memory) children(key NodeKey) (Node, Node, error) {
 	var children [2]Node
@@ -564,6 +607,7 @@ func (m *Memory) task(key NodeKey) (Task, error) {
 		}
 
 		task.Input = []string{leafSource(message)}
+		task.Images = imageFiles(message.Text)
 
 		return task, nil
 	}
@@ -738,12 +782,14 @@ func (m *Memory) buildBuiltByModel(key NodeKey) (bool, error) {
 
 // Task is the build of the node (Level, Index). Context is the compaction view
 // for the build. Input holds the source "kind: text" of a leaf, or the two
-// child lines of a merge with their newlines as spaces.
+// child lines of a merge with their newlines as spaces. Images holds the leaf
+// image filenames and is empty for merges.
 type Task struct {
 	Level   int
 	Index   int
 	Context string
 	Input   []string
+	Images  []string
 }
 
 // MemoryViewFile is the content of view.json.