jwetzell/psn-go
1
0
Fork 0
mirror of https://github.com/jwetzell/psn-go.git synced 2026-08-21 23:19:14 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

add most basic error handling on the decode side

Browse Source
This commit is contained in:
Joel Wetzell
2024-12-23 23:59:11 -06:00
parent 0c297d606d
commit 6bc6fb3668
15 changed files with 227 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/decoders/data_tracker_chunk.go
+39 -12
View File
@@ -20,8 +20,13 @@ type DataTrackerChunk struct {
Data DataTrackerChunkData
}
func DecodeDataTrackerChunk(bytes []byte) DataTrackerChunk {
chunk := DecodeChunk(bytes)
func DecodeDataTrackerChunk(bytes []byte) (DataTrackerChunk, error) {
chunk, err := DecodeChunk(bytes)
if err != nil {
return DataTrackerChunk{}, err
}
data := DataTrackerChunkData{}
if chunk.Header.HasSubchunks && chunk.ChunkData != nil && chunk.Header.DataLen > 0 {
@@ -30,49 +35,70 @@ func DecodeDataTrackerChunk(bytes []byte) DataTrackerChunk {
for offset < int(chunk.Header.DataLen) {
switch id := binary.LittleEndian.Uint16(chunk.ChunkData[offset : offset+2]); id {
case 0x0000:
pos := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
pos, err := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Pos = &pos
offset += 4
if data.Pos.Chunk.Header.DataLen > 0 {
offset = offset + int(data.Pos.Chunk.Header.DataLen)
}
case 0x0001:
speed := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
speed, err := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Speed = &speed
offset += 4
if data.Speed.Chunk.Header.DataLen > 0 {
offset = offset + int(data.Speed.Chunk.Header.DataLen)
}
case 0x0002:
ori := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
ori, err := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Ori = &ori
offset += 4
if data.Ori.Chunk.Header.DataLen > 0 {
offset = offset + int(data.Ori.Chunk.Header.DataLen)
}
case 0x0003:
status := DecodeDataTrackerStatusChunk(chunk.ChunkData[offset:])
status, err := DecodeDataTrackerStatusChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Status = &status
offset += 4
if data.Status.Chunk.Header.DataLen > 0 {
offset = offset + int(data.Status.Chunk.Header.DataLen)
}
case 0x0004:
accel := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
accel, err := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Accel = &accel
offset += 4
if data.Accel.Chunk.Header.DataLen > 0 {
offset = offset + int(data.Accel.Chunk.Header.DataLen)
}
case 0x0005:
trgtpos := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
trgtpos, err := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.TrgtPos = &trgtpos
offset += 4
if data.TrgtPos.Chunk.Header.DataLen > 0 {
offset = offset + int(data.TrgtPos.Chunk.Header.DataLen)
}
case 0x0006:
timestamp := DecodeDataTrackerTimestampChunk(chunk.ChunkData[offset:])
timestamp, err := DecodeDataTrackerTimestampChunk(chunk.ChunkData[offset:])
if err != nil {
return DataTrackerChunk{}, err
}
data.Timestamp = &timestamp
offset += 4
if data.Timestamp.Chunk.Header.DataLen > 0 {
@@ -86,7 +112,8 @@ func DecodeDataTrackerChunk(bytes []byte) DataTrackerChunk {
}
return DataTrackerChunk{
Chunk: chunk,
Data: data,
}
Chunk: chunk,
Data: data,
},
nil
}