Initial permission handling refactor

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index ae96e528633d02e464c0aa035aa1a27746c83981..2e2e085046a6269f5f577930ec7b7e1781d2c436 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,12 +26,22 @@ func NewFilePathItem(b []byte) FilePathItem {
 }
 
 type FilePath struct {
 }
 
 type FilePath struct {

-       ItemCount []byte
+       ItemCount [2]byte

        Items     []FilePathItem
 }
 
        Items     []FilePathItem
 }
 

+const minFilePathLen = 2

 func (fp *FilePath) UnmarshalBinary(b []byte) error {
 func (fp *FilePath) UnmarshalBinary(b []byte) error {

-       fp.ItemCount = b[0:2]
+       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 {
+               return err
+       }

 
        pathData := b[2:]
        for i := uint16(0); i < fp.Len(); i++ {
 
        pathData := b[2:]
        for i := uint16(0); i < fp.Len(); i++ {


@@ -42,13 +54,41 @@ func (fp *FilePath) UnmarshalBinary(b []byte) error {
 }
 
 func (fp *FilePath) Len() uint16 {
 }
 
 func (fp *FilePath) Len() uint16 {

-       return binary.BigEndian.Uint16(fp.ItemCount)
+       return binary.BigEndian.Uint16(fp.ItemCount[:])

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

-       var out []string
+       out := []string{"/"}

        for _, i := range fp.Items {
                out = append(out, string(i.Name))
        }
        for _, i := range fp.Items {
                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()
+}
+
+func readPath(fileRoot string, filePath, fileName []byte) (fullPath string, err error) {
+       var fp FilePath
+       if filePath != nil {
+               if err = fp.UnmarshalBinary(filePath); err != nil {
+                       return "", err
+               }
+       }
+
+       fullPath = path.Join(
+               "/",
+               fileRoot,
+               fp.String(),
+               path.Join("/", string(fileName)),
+       )
+
+       return fullPath, nil

 }
 }