Cleanup and logging improvements

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index f7da29818e8bfc2489442609aeaf99f3316fac60..460af03464cc2e5376769a30f2a1b5951cb4d785 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -4,12 +4,11 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
-       "path"
+       "io"
+       "path/filepath"
        "strings"
 )
 
-const pathSeparator = "/" // File path separator TODO: make configurable to support Windows
-
 // FilePathItem represents the file or directory portion of a delimited file path (e.g. foo and bar in "/foo/bar")
 // 00 00
 // 09
@@ -19,37 +18,39 @@ type FilePathItem struct {
        Name []byte
 }
 
-func NewFilePathItem(b []byte) FilePathItem {
-       return FilePathItem{
-               Len:  b[2],
-               Name: b[3:],
-       }
-}
-
 type FilePath struct {
        ItemCount [2]byte
        Items     []FilePathItem
 }
 
-const minFilePathLen = 2
-
 func (fp *FilePath) UnmarshalBinary(b []byte) error {
-       if b == nil {
-               return nil
-       }
-       if len(b) < minFilePathLen {
-               return errors.New("insufficient bytes")
-       }
-       err := binary.Read(bytes.NewReader(b[0:2]), binary.BigEndian, &fp.ItemCount)
-       if err != nil {
+       reader := bytes.NewReader(b)
+       err := binary.Read(reader, binary.BigEndian, &fp.ItemCount)
+       if err != nil && !errors.Is(err, io.EOF) {
                return err
        }
+       if errors.Is(err, io.EOF) {
+               return nil
+       }
 
-       pathData := b[2:]
        for i := uint16(0); i < fp.Len(); i++ {
-               segLen := pathData[2]
-               fp.Items = append(fp.Items, NewFilePathItem(pathData[:segLen+3]))
-               pathData = pathData[3+segLen:]
+               // skip two bytes for the file path delimiter
+               _, _ = reader.Seek(2, io.SeekCurrent)
+
+               // read the length of the next pathItem
+               segLen, err := reader.ReadByte()
+               if err != nil {
+                       return err
+               }
+
+               pBytes := make([]byte, segLen)
+
+               _, err = reader.Read(pBytes)
+               if err != nil && !errors.Is(err, io.EOF) {
+                       return err
+               }
+
+               fp.Items = append(fp.Items, FilePathItem{Len: segLen, Name: pBytes})
        }
 
        return nil
@@ -75,24 +76,6 @@ func (fp *FilePath) Len() uint16 {
        return binary.BigEndian.Uint16(fp.ItemCount[:])
 }
 
-func (fp *FilePath) String() string {
-       out := []string{"/"}
-       for _, i := range fp.Items {
-               out = append(out, string(i.Name))
-       }
-
-       return path.Join(out...)
-}
-
-func ReadFilePath(filePathFieldData []byte) string {
-       var fp FilePath
-       err := fp.UnmarshalBinary(filePathFieldData)
-       if err != nil {
-               // TODO
-       }
-       return fp.String()
-}
-
 func readPath(fileRoot string, filePath, fileName []byte) (fullPath string, err error) {
        var fp FilePath
        if filePath != nil {
@@ -101,11 +84,15 @@ func readPath(fileRoot string, filePath, fileName []byte) (fullPath string, err
                }
        }
 
-       fullPath = path.Join(
-               "/",
+       var subPath string
+       for _, pathItem := range fp.Items {
+               subPath = filepath.Join("/", subPath, string(pathItem.Name))
+       }
+
+       fullPath = filepath.Join(
                fileRoot,
-               fp.String(),
-               path.Join("/", string(fileName)),
+               subPath,
+               filepath.Join("/", string(fileName)),
        )
 
        return fullPath, nil