WIP: parse Source 2 protos

markus-wa · Mar 23, 2023 · 4b58d56 · 4b58d56
1 parent 1c11b45
commit 4b58d56
Show file tree

Hide file tree

Showing 25 changed files with 56,042 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -2,6 +2,7 @@ module github.com/markus-wa/demoinfocs-golang/v3
 
 require (
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551
+	github.com/golang/snappy v0.0.4
 	github.com/llgcode/draw2d v0.0.0-20210904075650-80aa0a2a901d
 	github.com/markus-wa/go-heatmap/v2 v2.0.0
 	github.com/markus-wa/go-unassert v0.1.3

diff --git a/go.sum b/go.sum
@@ -10,6 +10,8 @@ github.com/golang/geo v0.0.0-20180826223333-635502111454/go.mod h1:vgWZ7cu0fq0KY
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=

diff --git a/pkg/demoinfocs/demoinfocs_test.go b/pkg/demoinfocs/demoinfocs_test.go
@@ -32,6 +32,7 @@ const (
 	csDemosPath             = testDataPath + "/cs-demos"
 	demSetPath              = csDemosPath + "/set"
 	defaultDemPath          = csDemosPath + "/default.dem"
+	s2DemPath               = csDemosPath + "/s2-gotv.dem"
 	retakeDemPath           = csDemosPath + "/retake_unknwon_bombsite_index.dem"
 	unexpectedEndOfDemoPath = csDemosPath + "/unexpected_end_of_demo.dem"
 )
@@ -194,6 +195,30 @@ func TestDemoInfoCs(t *testing.T) {
 	assertGolden(t, assertions, "default", actual.Bytes())
 }
 
+func TestS2(t *testing.T) {
+	t.Parallel()
+
+	if testing.Short() {
+		t.Skip("skipping test due to -short flag")
+	}
+
+	f, err := os.Open(s2DemPath)
+	assertions := assert.New(t)
+	assertions.NoError(err, "error opening demo %q", s2DemPath)
+
+	defer mustClose(t, f)
+
+	p := demoinfocs.NewParser(f)
+
+	t.Log("Parsing header")
+	_, err = p.ParseHeader()
+	assertions.NoError(err, "error returned by Parser.ParseHeader()")
+
+	t.Log("Parsing to end")
+	err = p.ParseToEnd()
+	assertions.NoError(err, "error occurred in ParseToEnd()")
+}
+
 func TestEncryptedNetMessages(t *testing.T) {
 	t.Parallel()
 

diff --git a/pkg/demoinfocs/msgs2/cstrike15_gcmessages.pb.go b/pkg/demoinfocs/msgs2/cstrike15_gcmessages.pb.go
diff --git a/pkg/demoinfocs/msgs2/cstrike15_usermessages.pb.go b/pkg/demoinfocs/msgs2/cstrike15_usermessages.pb.go