diff --git a/nbt/nbt_test.go b/nbt/nbt_test.go index 36982b8..3bf754e 100644 --- a/nbt/nbt_test.go +++ b/nbt/nbt_test.go @@ -1,28 +1,10 @@ package nbt -import "testing" - -func TestUnmarshal_simple(t *testing.T) { - var data = []byte{ - 0x0a, 0x00, 0x0b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, - 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x08, 0x00, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x09, 0x42, - 0x61, 0x6e, 0x61, 0x6e, 0x72, 0x61, 0x6d, 0x61, - 0x00, - } - - var value struct { - Name string `nbt:"name"` - } - - if err := Unmarshal(data, &value); err != nil { - t.Fatal(err) - } - - if value.Name != "Bananrama" { - t.Errorf("Unmarshal NBT fail: get %q, want %q", value.Name, "Bananrama") - } -} +import ( + "bytes" + "compress/gzip" + "testing" +) func TestUnmarshal_string(t *testing.T) { var data = []byte{ @@ -40,3 +22,144 @@ func TestUnmarshal_string(t *testing.T) { t.Errorf("Unmarshal NBT fail: get %q, want %q", Name, "Bananrama") } } +func TestUnmarshal_simple(t *testing.T) { + var data = []byte{ + 0x0a, 0x00, 0x0b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, + 0x20, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x08, 0x00, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x09, 0x42, + 0x61, 0x6e, 0x61, 0x6e, 0x72, 0x61, 0x6d, 0x61, + 0x00, + } + + //test parse + var value struct { + Name string `nbt:"name"` + } + if err := Unmarshal(data, &value); err != nil { + t.Fatal(err) + } + if value.Name != "Bananrama" { + t.Errorf("Unmarshal NBT fail: get %q, want %q", value.Name, "Bananrama") + } + + //test skip + var empty struct{} + if err := Unmarshal(data, &empty); err != nil { + t.Fatal(err) + } +} + +func TestUnmarshal_bittest(t *testing.T) { + // Generated by vscode-hexdump + data := []byte{ + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xed, 0x54, 0xcf, 0x4f, 0x1a, 0x41, + 0x14, 0x7e, 0xc2, 0x02, 0xcb, 0x96, 0x82, 0xb1, + 0xc4, 0x10, 0x63, 0xcc, 0xab, 0xb5, 0x84, 0xa5, + 0xdb, 0xcd, 0x42, 0x11, 0x89, 0xb1, 0x88, 0x16, + 0x2c, 0x9a, 0x0d, 0x1a, 0xd8, 0xa8, 0x31, 0x86, + 0xb8, 0x2b, 0xc3, 0x82, 0x2e, 0xbb, 0x66, 0x77, + 0xb0, 0xf1, 0xd4, 0x4b, 0x7b, 0x6c, 0x7a, 0xeb, + 0x3f, 0xd3, 0x23, 0x7f, 0x43, 0xcf, 0xbd, 0xf6, + 0xbf, 0xa0, 0xc3, 0x2f, 0x7b, 0x69, 0xcf, 0xbd, + 0xf0, 0x32, 0xc9, 0xf7, 0xe6, 0xbd, 0x6f, 0xe6, + 0x7b, 0x6f, 0x26, 0x79, 0x02, 0x04, 0x54, 0x72, + 0x4f, 0x2c, 0x0e, 0x78, 0xcb, 0xb1, 0x4d, 0x8d, + 0x78, 0xf4, 0xe3, 0x70, 0x62, 0x3e, 0x08, 0x7b, + 0x1d, 0xc7, 0xa5, 0x93, 0x18, 0x0f, 0x82, 0x47, + 0xdd, 0xee, 0x84, 0x02, 0x62, 0xb5, 0xa2, 0xaa, + 0xc7, 0x78, 0x76, 0x5c, 0x57, 0xcb, 0xa8, 0x55, + 0x0f, 0x1b, 0xc8, 0xd6, 0x1e, 0x6a, 0x95, 0x86, + 0x86, 0x0d, 0xad, 0x7e, 0x58, 0x7b, 0x8f, 0x83, + 0xcf, 0x83, 0x4f, 0x83, 0x6f, 0xcf, 0x03, 0x10, + 0x6e, 0x5b, 0x8e, 0x3e, 0xbe, 0xa5, 0x38, 0x4c, + 0x64, 0xfd, 0x10, 0xea, 0xda, 0x74, 0xa6, 0x23, + 0x40, 0xdc, 0x66, 0x2e, 0x69, 0xe1, 0xb5, 0xd3, + 0xbb, 0x73, 0xfa, 0x76, 0x0b, 0x29, 0xdb, 0x0b, + 0xe0, 0xef, 0xe8, 0x3d, 0x1e, 0x38, 0x5b, 0xef, + 0x11, 0x08, 0x56, 0xf5, 0xde, 0x5d, 0xdf, 0x0b, + 0x40, 0xe0, 0x5e, 0xb7, 0xfa, 0x64, 0xb7, 0x04, + 0x00, 0x8c, 0x41, 0x4c, 0x73, 0xc6, 0x08, 0x55, + 0x4c, 0xd3, 0x20, 0x2e, 0x7d, 0xa4, 0xc0, 0xc8, + 0xc2, 0x10, 0xb3, 0xba, 0xde, 0x58, 0x0b, 0x53, + 0xa3, 0xee, 0x44, 0x8e, 0x45, 0x03, 0x30, 0xb1, + 0x27, 0x53, 0x8c, 0x4c, 0xf1, 0xe9, 0x14, 0xa3, + 0x53, 0x8c, 0x85, 0xe1, 0xd9, 0x9f, 0xe3, 0xb3, + 0xf2, 0x44, 0x81, 0xa5, 0x7c, 0x33, 0xdd, 0xd8, + 0xbb, 0xc7, 0xaa, 0x75, 0x13, 0x5f, 0x28, 0x1c, + 0x08, 0xd7, 0x2e, 0xd1, 0x59, 0x3f, 0xaf, 0x1d, + 0x1b, 0x60, 0x21, 0x59, 0xdf, 0xfa, 0xf1, 0x05, + 0xfe, 0xc1, 0xce, 0xfc, 0x9d, 0xbd, 0x00, 0xbc, + 0xf1, 0x40, 0xc9, 0xf8, 0x85, 0x42, 0x40, 0x46, + 0xfe, 0x9e, 0xeb, 0xea, 0x0f, 0x93, 0x3a, 0x68, + 0x87, 0x60, 0xbb, 0xeb, 0x32, 0x37, 0xa3, 0x28, + 0x0a, 0x8e, 0xbb, 0xf5, 0xd0, 0x69, 0x63, 0xca, + 0x4e, 0xdb, 0xe9, 0xec, 0xe6, 0xe6, 0x2b, 0x3b, + 0xbd, 0x25, 0xbe, 0x64, 0x49, 0x09, 0x3d, 0xaa, + 0xbb, 0x94, 0xfd, 0x18, 0x7e, 0xe8, 0xd2, 0x0e, + 0xda, 0x6f, 0x15, 0x4c, 0xb1, 0x68, 0x3e, 0x2b, + 0xe1, 0x9b, 0x9c, 0x84, 0x99, 0xbc, 0x84, 0x05, + 0x09, 0x65, 0x59, 0x16, 0x45, 0x00, 0xff, 0x2f, + 0x28, 0xae, 0x2f, 0xf2, 0xc2, 0xb2, 0xa4, 0x2e, + 0x1d, 0x20, 0x77, 0x5a, 0x3b, 0xb9, 0x8c, 0xca, + 0xe7, 0x29, 0xdf, 0x51, 0x41, 0xc9, 0x16, 0xb5, + 0xc5, 0x6d, 0xa1, 0x2a, 0xad, 0x2c, 0xc5, 0x31, + 0x7f, 0xba, 0x7a, 0x92, 0x8e, 0x5e, 0x9d, 0x5f, + 0xf8, 0x12, 0x05, 0x23, 0x1b, 0xd1, 0xf6, 0xb7, + 0x77, 0xaa, 0xcd, 0x95, 0x72, 0xbc, 0x9e, 0xdf, + 0x58, 0x5d, 0x4b, 0x97, 0xae, 0x92, 0x17, 0xb9, + 0x44, 0xd0, 0x80, 0xc8, 0xfa, 0x3e, 0xbf, 0xb3, + 0xdc, 0x54, 0xcb, 0x07, 0x75, 0x6e, 0xa3, 0xb6, + 0x76, 0x59, 0x92, 0x93, 0xa9, 0xdc, 0x51, 0x50, + 0x99, 0x6b, 0xcc, 0x35, 0xe6, 0x1a, 0xff, 0x57, + 0x23, 0x08, 0x42, 0xcb, 0xe9, 0x1b, 0xd6, 0x78, + 0xc2, 0xec, 0xfe, 0xfc, 0x7a, 0xfb, 0x7d, 0x78, + 0xd3, 0x84, 0xdf, 0xd4, 0xf2, 0xa4, 0xfb, 0x08, + 0x06, 0x00, 0x00, + } + + type BitTestStruct struct { + NCT struct { + Egg struct { + Name string `nbt:"name"` + Value float32 `nbt:"value"` + } `nbt:"egg"` + Ham struct { + Name string `nbt:"name"` + Value float32 `nbt:"value"` + } `nbt:"ham"` + } `nbt:"nested compound test"` + } + + //test parse + var value BitTestStruct + r, err := gzip.NewReader(bytes.NewReader(data)) + if err != nil { + t.Fatal(err) + } + if err := NewDecoder(r).Decode(&value); err != nil { + t.Fatal(err) + } + + var want BitTestStruct + want.NCT.Egg.Name = "Eggbert" + want.NCT.Egg.Value = 0.5 + want.NCT.Ham.Name = "Hampus" + want.NCT.Ham.Value = 0.75 + + if value != want { + t.Errorf("parse fail, expect %v, get %v", want, value) + } else { + t.Log("value:", value) + } + + //test skip + var empty struct{} + r, err = gzip.NewReader(bytes.NewReader(data)) + if err != nil { + t.Fatal(err) + } + if err := NewDecoder(r).Decode(&empty); err != nil { + t.Fatal(err) + } +} diff --git a/nbt/read.go b/nbt/read.go index 051dcf4..6af691b 100644 --- a/nbt/read.go +++ b/nbt/read.go @@ -4,6 +4,7 @@ import ( "bytes" "errors" "fmt" + "math" "reflect" ) @@ -16,59 +17,159 @@ func (d *Decoder) Decode(v interface{}) error { if val.Kind() != reflect.Ptr { return errors.New("non-pointer passed to Unmarshal") } - return d.unmarshal(val.Elem()) -} - -// func (d *Decoder) unmarshalInt(val reflect.Value) error { - -// } - -func (d *Decoder) unmarshal(val reflect.Value) error { - tagType, err := d.r.ReadByte() + tagType, tagName, err := d.readTag() if err != nil { return err } + return d.unmarshal(val.Elem(), tagType, tagName) +} - var tagName string - if !d.nameless { //Read Tag - if tagName, err = d.readString(); err != nil { - return err - } - } - +func (d *Decoder) unmarshal(val reflect.Value, tagType byte, tagName string) error { switch tagType { default: - return fmt.Errorf("unknown tag 0x%2x", tagType) - case TagString: - if val.Kind() != reflect.String { - return errors.New("cannot unmarshal TAG_String into " + val.Kind().String()) + return fmt.Errorf("unknown Tag 0x%02x", tagType) + case TagFloat: + if vk := val.Kind(); vk != reflect.Float32 { + return errors.New("cannot parse TagString as " + vk.String()) } + vInt, err := d.readInt32() + if err != nil { + return err + } + val.Set(reflect.ValueOf(math.Float32frombits(uint32(vInt)))) + case TagString: + if vk := val.Kind(); vk != reflect.String { + return errors.New("cannot parse TagString as " + vk.String()) + } s, err := d.readString() if err != nil { return err } - val.SetString(s) case TagCompound: - if val.Kind() != reflect.Struct { - return errors.New("cannot unmarshal TAG_Compound into " + val.Kind().String()) + if vk := val.Kind(); vk != reflect.Struct { + return errors.New("cannot parse TagCompound as " + vk.String()) } fmt.Println("TagName:", tagName) + tinfo := getTypeInfo(val.Type()) + for { + tt, tn, err := d.readTag() + if err != nil { + return err + } + if tt == TagEnd { + break + } + field := tinfo.findIndexByName(tn) + if field != -1 { + err = d.unmarshal(val.Field(field), tt, tn) + if err != nil { + return err + } + } else { + if err := d.skip(tt); err != nil { + return err + } + } + } } return nil } +func (d *Decoder) skip(tagType byte) error { + switch tagType { + default: + return fmt.Errorf("unknown to skip 0x%02x", tagType) + case TagByte: + _, err := d.r.ReadByte() + return err + case TagString: + _, err := d.readString() + return err + case TagShort: + _, err := d.readNByte(2) + return err + case TagInt, TagFloat: + _, err := d.readNByte(4) + return err + case TagLong, TagDouble: + _, err := d.readNByte(8) + return err + case TagByteArray: + aryLen, err := d.readInt32() + if err != nil { + return err + } + if _, err = d.readNByte(int(aryLen)); err != nil { + return err + } + case TagList: + listType, err := d.r.ReadByte() + if err != nil { + return err + } + listLen, err := d.readInt32() + if err != nil { + return err + } + for i := 0; i < int(listLen); i++ { + if err := d.skip(listType); err != nil { + return err + } + } + case TagCompound: + for { + tt, _, err := d.readTag() + if err != nil { + return err + } + if tt == TagEnd { + break + } + err = d.skip(tt) + if err != nil { + return err + } + } + } + return nil +} + +func (d *Decoder) readTag() (tagType byte, tagName string, err error) { + tagType, err = d.r.ReadByte() + if err != nil { + return + } + + if tagType != TagEnd && !d.nameless { //Read Tag + tagName, err = d.readString() + } + return +} + func (d *Decoder) readNByte(n int) (buf []byte, err error) { buf = make([]byte, n) _, err = d.r.Read(buf) //what happend if (returned n) != (argument n) ? + // for i := 0; i < n; i++ { + // buf[i], err = d.r.ReadByte() + // if err != nil { + // return + // } + // } return } func (d *Decoder) readInt16() (int16, error) { data, err := d.readNByte(2) - return int16(data[0])<<4 | int16(data[1]), err + return int16(data[0])<<8 | int16(data[1]), err +} + +func (d *Decoder) readInt32() (int32, error) { + data, err := d.readNByte(4) + return int32(data[0])<<24 | int32(data[1])<<16 | + int32(data[2])<<8 | int32(data[3]), err } func (d *Decoder) readString() (string, error) { diff --git a/nbt/typeinfo.go b/nbt/typeinfo.go index 23885bf..ba41666 100644 --- a/nbt/typeinfo.go +++ b/nbt/typeinfo.go @@ -5,18 +5,35 @@ import ( ) type typeInfo struct { + tagName string + nameToIndex map[string]int } -func getTypeInfo(typ reflect.Type) (*typeInfo, error) { +func getTypeInfo(typ reflect.Type) *typeInfo { tinfo := new(typeInfo) + tinfo.nameToIndex = make(map[string]int) if typ.Kind() == reflect.Struct { n := typ.NumField() for i := 0; i < n; i++ { f := typ.Field(i) - if (f.PkgPath != "" && !f.Anonymous) || f.Tag.Get("nbt") == "-" { + tag := f.Tag.Get("nbt") + if (f.PkgPath != "" && !f.Anonymous) || tag == "-" { continue // Private field } + + tinfo.nameToIndex[tag] = i + if _, ok := tinfo.nameToIndex[f.Name]; !ok { + tinfo.nameToIndex[f.Name] = i + } } } - return tinfo, nil + return tinfo +} + +func (t *typeInfo) findIndexByName(name string) int { + i, ok := t.nameToIndex[name] + if !ok { + return -1 + } + return i }