From c3a696138a05ffcac834128383330cf9e07483b3 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Fri, 5 Jan 2024 04:43:46 -0500 Subject: [PATCH] refactor: move directoryReferenceMap and fileReferenceMap to its own file --- metadata/directory.go | 146 ------------------------------------ metadata/directory_map.go | 152 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 146 deletions(-) create mode 100644 metadata/directory_map.go diff --git a/metadata/directory.go b/metadata/directory.go index eb6f0c7..8ebbb85 100644 --- a/metadata/directory.go +++ b/metadata/directory.go @@ -1,22 +1,12 @@ package metadata import ( - "encoding/json" "errors" - "fmt" "git.lumeweb.com/LumeWeb/libs5-go/serialize" "git.lumeweb.com/LumeWeb/libs5-go/types" - "github.com/emirpasic/gods/maps/linkedhashmap" "github.com/vmihailenco/msgpack/v5" ) -type directoryReferenceMap struct { - linkedhashmap.Map -} -type fileReferenceMap struct { - linkedhashmap.Map -} - type DirectoryMetadata struct { Details DirectoryMetadataDetails `json:"details"` Directories directoryReferenceMap `json:"directories"` @@ -26,7 +16,6 @@ type DirectoryMetadata struct { } var _ SerializableMetadata = (*DirectoryMetadata)(nil) -var _ SerializableMetadata = (*directoryReferenceMap)(nil) func NewDirectoryMetadata(details DirectoryMetadataDetails, directories directoryReferenceMap, files fileReferenceMap, extraMetadata ExtraMetadata) *DirectoryMetadata { dirMetadata := &DirectoryMetadata{ @@ -101,138 +90,3 @@ func (dm *DirectoryMetadata) DecodeMsgpack(dec *msgpack.Decoder) error { return nil } -func (drm directoryReferenceMap) EncodeMsgpack(enc *msgpack.Encoder) error { - return marshallMapMsgpack(enc, &drm.Map) -} - -func (drm *directoryReferenceMap) DecodeMsgpack(dec *msgpack.Decoder) error { - return unmarshalMapMsgpack(dec, &drm.Map, &DirectoryReference{}) -} - -func (frm fileReferenceMap) EncodeMsgpack(enc *msgpack.Encoder) error { - return marshallMapMsgpack(enc, &frm.Map) -} - -func (frm *fileReferenceMap) DecodeMsgpack(dec *msgpack.Decoder) error { - return unmarshalMapMsgpack(dec, &frm.Map, &FileReference{}) -} - -func (frm *fileReferenceMap) UnmarshalJSON(bytes []byte) error { - createFileInstance := func() interface{} { return &FileReference{} } - return unmarshalMapJson(bytes, &frm.Map, createFileInstance) -} - -type unmarshalNewInstanceFunc func() interface{} - -func (drm *directoryReferenceMap) UnmarshalJSON(bytes []byte) error { - createDirInstance := func() interface{} { return &DirectoryReference{} } - return unmarshalMapJson(bytes, &drm.Map, createDirInstance) -} - -func unmarshalMapMsgpack(dec *msgpack.Decoder, m *linkedhashmap.Map, placeholder interface{}) error { - *m = *linkedhashmap.New() - - l, err := dec.DecodeMapLen() - if err != nil { - return err - } - - for i := 0; i < l; i++ { - key, err := dec.DecodeString() - if err != nil { - return err - } - - fmt.Println("dir: ", key) - - switch placeholder.(type) { - case *DirectoryReference: - var value DirectoryReference - if err := dec.Decode(&value); err != nil { - return err - } - m.Put(key, value) - - case *FileReference: - var file FileReference - if err := dec.Decode(&file); err != nil { - return err - } - m.Put(key, file) - - default: - return fmt.Errorf("unsupported type for decoding") - } - } - - return nil -} - -func marshallMapMsgpack(enc *msgpack.Encoder, m *linkedhashmap.Map) error { - // First, encode the length of the map - if err := enc.EncodeMapLen(m.Size()); err != nil { - return err - } - - iter := m.Iterator() - for iter.Next() { - key := iter.Key().(string) - if err := enc.EncodeString(key); err != nil { - return err - } - - value := iter.Value() - switch v := value.(type) { - case FileReference: - if err := enc.Encode(&v); err != nil { - return err - } - case DirectoryReference: - if err := enc.Encode(&v); err != nil { - return err - } - default: - return fmt.Errorf("unsupported type for encoding") - } - } - - return nil -} - -func unmarshalMapJson(bytes []byte, m *linkedhashmap.Map, newInstance unmarshalNewInstanceFunc) error { - *m = *linkedhashmap.New() - err := m.FromJSON(bytes) - if err != nil { - return err - } - - iter := m.Iterator() - for iter.Next() { - key := iter.Key() - val := iter.Value() - - instance := newInstance() - - data, err := json.Marshal(val) - if err != nil { - return err - } - - err = json.Unmarshal(data, &instance) - if err != nil { - return err - } - - // Type switch to handle different types - switch v := instance.(type) { - case *DirectoryReference: - m.Put(key, *v) - case *FileReference: - m.Put(key, *v) - default: - return fmt.Errorf("unhandled type: %T", v) - } - } - - return nil -} diff --git a/metadata/directory_map.go b/metadata/directory_map.go new file mode 100644 index 0000000..05b7587 --- /dev/null +++ b/metadata/directory_map.go @@ -0,0 +1,152 @@ +package metadata + +import ( + "encoding/json" + "fmt" + "github.com/emirpasic/gods/maps/linkedhashmap" + "github.com/vmihailenco/msgpack/v5" +) + +type directoryReferenceMap struct { + linkedhashmap.Map +} +type fileReferenceMap struct { + linkedhashmap.Map +} + +type unmarshalNewInstanceFunc func() interface{} + +var _ SerializableMetadata = (*directoryReferenceMap)(nil) + +func unmarshalMapMsgpack(dec *msgpack.Decoder, m *linkedhashmap.Map, placeholder interface{}) error { + *m = *linkedhashmap.New() + + l, err := dec.DecodeMapLen() + if err != nil { + return err + } + + for i := 0; i < l; i++ { + key, err := dec.DecodeString() + if err != nil { + return err + } + + fmt.Println("dir: ", key) + + switch placeholder.(type) { + case *DirectoryReference: + var value DirectoryReference + if err := dec.Decode(&value); err != nil { + return err + } + m.Put(key, value) + + case *FileReference: + var file FileReference + if err := dec.Decode(&file); err != nil { + return err + } + m.Put(key, file) + + default: + return fmt.Errorf("unsupported type for decoding") + } + } + + return nil +} + +func marshallMapMsgpack(enc *msgpack.Encoder, m *linkedhashmap.Map) error { + // First, encode the length of the map + if err := enc.EncodeMapLen(m.Size()); err != nil { + return err + } + + iter := m.Iterator() + for iter.Next() { + key := iter.Key().(string) + if err := enc.EncodeString(key); err != nil { + return err + } + + value := iter.Value() + switch v := value.(type) { + case FileReference: + if err := enc.Encode(&v); err != nil { + return err + } + case DirectoryReference: + if err := enc.Encode(&v); err != nil { + return err + } + default: + return fmt.Errorf("unsupported type for encoding") + } + } + + return nil +} + +func unmarshalMapJson(bytes []byte, m *linkedhashmap.Map, newInstance unmarshalNewInstanceFunc) error { + *m = *linkedhashmap.New() + err := m.FromJSON(bytes) + if err != nil { + return err + } + + iter := m.Iterator() + for iter.Next() { + key := iter.Key() + val := iter.Value() + + instance := newInstance() + + data, err := json.Marshal(val) + if err != nil { + return err + } + + err = json.Unmarshal(data, &instance) + if err != nil { + return err + } + + // Type switch to handle different types + switch v := instance.(type) { + case *DirectoryReference: + m.Put(key, *v) + case *FileReference: + m.Put(key, *v) + default: + return fmt.Errorf("unhandled type: %T", v) + } + } + + return nil +} +func (drm directoryReferenceMap) EncodeMsgpack(enc *msgpack.Encoder) error { + return marshallMapMsgpack(enc, &drm.Map) +} + +func (drm *directoryReferenceMap) DecodeMsgpack(dec *msgpack.Decoder) error { + return unmarshalMapMsgpack(dec, &drm.Map, &DirectoryReference{}) +} + +func (frm fileReferenceMap) EncodeMsgpack(enc *msgpack.Encoder) error { + return marshallMapMsgpack(enc, &frm.Map) +} + +func (frm *fileReferenceMap) DecodeMsgpack(dec *msgpack.Decoder) error { + return unmarshalMapMsgpack(dec, &frm.Map, &FileReference{}) +} + +func (frm *fileReferenceMap) UnmarshalJSON(bytes []byte) error { + createFileInstance := func() interface{} { return &FileReference{} } + return unmarshalMapJson(bytes, &frm.Map, createFileInstance) +} + +func (drm *directoryReferenceMap) UnmarshalJSON(bytes []byte) error { + createDirInstance := func() interface{} { return &DirectoryReference{} } + return unmarshalMapJson(bytes, &drm.Map, createDirInstance) +}