Calc log fix (#316)

* fix status end * add ordering event log Co-authored-by: srliao <[email protected]>
genshinsim · Feb 24, 2022 · 8d19811 · 8d19811
1 parent 4240637
commit 8d19811
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 38 deletions.
diff --git a/internal/eventlog/eventlog.go b/internal/eventlog/eventlog.go
@@ -18,12 +18,14 @@ type keyVal struct {
 
 //easyjson:json
 type Event struct {
-	Typ     core.LogSource         `json:"event"`
-	F       int                    `json:"frame"`
-	Ended   int                    `json:"ended"`
-	SrcChar int                    `json:"char_index"`
-	Msg     string                 `json:"msg,nocopy"`
-	Logs    map[string]interface{} `json:"logs"`
+	Typ      core.LogSource         `json:"event"`
+	F        int                    `json:"frame"`
+	Ended    int                    `json:"ended"`
+	SrcChar  int                    `json:"char_index"`
+	Msg      string                 `json:"msg,nocopy"`
+	Logs     map[string]interface{} `json:"logs"`
+	Ordering map[string]int         `json:"ordering"`
+	counter  int
 }
 
 //easyjson:json
@@ -48,6 +50,8 @@ func (e *Event) Write(keysAndValues ...interface{}) {
 		// 	Val: keysAndValues[i],
 		// })
 		e.Logs[key] = keysAndValues[i]
+		e.Ordering[key] = e.counter
+		e.counter++
 	}
 }
 
@@ -96,12 +100,13 @@ func (c *Ctrl) NewEventBuildMsg(typ core.LogSource, srcChar int, msg ...string)
 
 func (c *Ctrl) NewEvent(msg string, typ core.LogSource, srcChar int, keysAndValues ...interface{}) core.LogEvent {
 	e := &Event{
-		Msg:     msg,
-		F:       c.core.F,
-		Ended:   c.core.F,
-		Typ:     typ,
-		SrcChar: srcChar,
-		Logs:    make(map[string]interface{}), //+5 from default just in case we need to add in more keys
+		Msg:      msg,
+		F:        c.core.F,
+		Ended:    c.core.F,
+		Typ:      typ,
+		SrcChar:  srcChar,
+		Logs:     make(map[string]interface{}), //+5 from default just in case we need to add in more keys
+		Ordering: make(map[string]int),
 	}
 	// c.events = append(c.events, e)
 	c.events[c.count] = e

diff --git a/internal/eventlog/eventlog_easyjson.go b/internal/eventlog/eventlog_easyjson.go
diff --git a/internal/eventlog/eventlog_test.go b/internal/eventlog/eventlog_test.go
@@ -49,11 +49,12 @@ func TestEventWriteNonStringKeyPanic(t *testing.T) {
 
 func TestEventWriteKeyVal(t *testing.T) {
 	e := &Event{
-		Msg:     "test",
-		F:       1,
-		Typ:     core.LogCharacterEvent,
-		SrcChar: 0,
-		Logs:    map[string]interface{}{},
+		Msg:      "test",
+		F:        1,
+		Typ:      core.LogCharacterEvent,
+		SrcChar:  0,
+		Logs:     map[string]interface{}{},
+		Ordering: make(map[string]int),
 	}
 
 	//this should be ok no panic

diff --git a/internal/tmpl/status/status.go b/internal/tmpl/status/status.go
@@ -51,6 +51,7 @@ func (s *StatusCtrl) AddStatus(key string, dur int) {
 	//otherwise create a new event
 	a.evt = s.core.Log.NewEvent("status added: ", core.LogStatusEvent, -1, "key", key, "expiry", s.core.F+dur)
 	a.expiry = s.core.F + dur
+	a.evt.SetEnded(a.expiry)
 
 	s.status[key] = a
 }