parsing: fix lint errors

Author: markus-wa

pkg/demoinfocs/demoinfocs_test.go

@@ -240,6 +240,33 @@ func TestParseToEnd_Cancel(t *testing.T) {
 	assert.True(t, tix == maxTicks, "FrameDone handler was not triggered the correct amount of times")
 }
 
+// See https://github.com/markus-wa/demoinfocs-golang/issues/276
+func TestParseToEnd_MultiCancel(t *testing.T) {
+	t.Parallel()
+
+	if testing.Short() {
+		t.Skip("skipping test")
+	}
+
+	f := openFile(t, defaultDemPath)
+	defer mustClose(t, f)
+
+	p := demoinfocs.NewParser(f)
+
+	var handlerID dispatch.HandlerIdentifier
+	handlerID = p.RegisterEventHandler(func(events.FrameDone) {
+		p.Cancel()
+		p.Cancel()
+		p.Cancel()
+		p.Cancel()
+		p.Cancel()
+		p.UnregisterEventHandler(handlerID)
+	})
+
+	err := p.ParseToEnd()
+	assert.Equal(t, demoinfocs.ErrCancelled, err, "parsing cancelled but error was not ErrCancelled")
+}
+
 func TestInvalidFileType(t *testing.T) {
 	t.Parallel()
 

pkg/demoinfocs/parser.go

@@ -59,7 +59,7 @@ type parser struct {
 	header                       *common.DemoHeader // Pointer so we can check for nil
 	gameState                    *gameState
 	demoInfoProvider             demoInfoProvider // Provides demo infos to other packages that the core package depends on
-	cancelChan                   chan struct{}    // Non-anime-related, used for aborting the parsing
+	cancelled                    bool             // Indicates if Parser.Cancel() has been called
 	err                          error            // Contains a error that occurred during parsing if any
 	errLock                      sync.Mutex       // Used to sync up error mutations between parsing & handling go-routines
 
@@ -303,7 +303,6 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 	p.equipmentMapping = make(map[*st.ServerClass]common.EquipmentType)
 	p.rawPlayers = make(map[int]*playerInfo)
 	p.triggers = make(map[int]*boundingBoxInformation)
-	p.cancelChan = make(chan struct{}, 1)
 	p.demoInfoProvider = demoInfoProvider{parser: &p}
 	p.gameState = newGameState(p.demoInfoProvider)
 	p.grenadeModelIndices = make(map[int]common.EquipmentType)

pkg/demoinfocs/parsing.go

@@ -139,6 +139,7 @@ func recoverFromUnexpectedEOF(r interface{}) error {
 	switch err := r.(type) {
 	case dispatch.ConsumerCodePanic:
 		panic(err.Value())
+
 	default:
 		panic(err)
 	}
@@ -203,7 +204,7 @@ const (
 	dcStringTables   demoCommand = 9
 )
 
-//nolint:funlen
+//nolint:funlen,cyclop
 func (p *parser) parseFrame() bool {
 	cmd := demoCommand(p.bitReader.ReadSingleByte())
 
@@ -273,6 +274,7 @@ func (p *parser) parseFrame() bool {
 var byteSlicePool = sync.Pool{
 	New: func() interface{} {
 		s := make([]byte, 0, 256)
+
 		return &s
 	},
 }
@@ -338,6 +340,7 @@ func (p *parser) parsePacket() {
 		}
 
 		b := byteSlicePool.Get().(*[]byte)
+
 		p.bitReader.ReadBytesInto(b, size)
 
 		m := msgCreator()