Tests and minor fixes

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index 71168dcbcbcea5593a555ee12ffa3593b414b4b3..d6c05bcbcfb581d4df6d7f0dd89e2eb0670cea81 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -1,8 +1,10 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "bytes"

        "encoding/binary"
        "encoding/binary"

-       "strings"
+       "errors"
+       "path"

 )
 
 const pathSeparator = "/" // File path separator TODO: make configurable to support Windows
 )
 
 const pathSeparator = "/" // File path separator TODO: make configurable to support Windows


@@ -24,33 +26,48 @@ func NewFilePathItem(b []byte) FilePathItem {
 }
 
 type FilePath struct {
 }
 
 type FilePath struct {

-       PathItemCount []byte
-       PathItems     []FilePathItem
+       ItemCount [2]byte
+       Items     []FilePathItem

 }
 
 }
 

-func NewFilePath(b []byte) FilePath {
-       if b == nil {
-               return FilePath{}
+const minFilePathLen = 2
+func (fp *FilePath) UnmarshalBinary(b []byte) error {
+       if len(b) < minFilePathLen {
+               return errors.New("insufficient bytes")
+       }
+       err := binary.Read(bytes.NewReader(b[0:2]), binary.BigEndian, &fp.ItemCount)
+       if err != nil {
+               return err

        }
 
        }
 

-       fp := FilePath{PathItemCount: b[0:2]}
-
-       // number of items in the path
-       pathItemLen := binary.BigEndian.Uint16(b[0:2])

        pathData := b[2:]
        pathData := b[2:]

-       for i := uint16(0); i < pathItemLen; i++ {
+       for i := uint16(0); i < fp.Len(); i++ {

                segLen := pathData[2]
                segLen := pathData[2]

-               fp.PathItems = append(fp.PathItems, NewFilePathItem(pathData[:segLen+3]))
+               fp.Items = append(fp.Items, NewFilePathItem(pathData[:segLen+3]))

                pathData = pathData[3+segLen:]
        }
 
                pathData = pathData[3+segLen:]
        }
 

-       return fp
+       return nil
+}
+
+func (fp *FilePath) Len() uint16 {
+       return binary.BigEndian.Uint16(fp.ItemCount[:])

 }
 
 func (fp *FilePath) String() string {
 }
 
 func (fp *FilePath) String() string {

-       var out []string
-       for _, i := range fp.PathItems {
+       out := []string{"/"}
+       for _, i := range fp.Items {

                out = append(out, string(i.Name))
        }
                out = append(out, string(i.Name))
        }

-       return strings.Join(out, pathSeparator)
+
+       return path.Join(out...)
+}
+
+func ReadFilePath(filePathFieldData []byte) string {
+       var fp FilePath
+       err := fp.UnmarshalBinary(filePathFieldData)
+       if err != nil {
+               // TODO
+       }
+       return fp.String()

 }
 }