Merge pull request #49 from jhalter/fix_1.2.3_client_no_agreement_behavior

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index 71168dcbcbcea5593a555ee12ffa3593b414b4b3..460af03464cc2e5376769a30f2a1b5951cb4d785 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -1,12 +1,14 @@
 package hotline
 
 import (
 package hotline
 
 import (

+       "bytes"

        "encoding/binary"
        "encoding/binary"

+       "errors"
+       "io"
+       "path/filepath"

        "strings"
 )
 
        "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
 // FilePathItem represents the file or directory portion of a delimited file path (e.g. foo and bar in "/foo/bar")
 // 00 00
 // 09


@@ -16,41 +18,82 @@ type FilePathItem struct {
        Name []byte
 }
 
        Name []byte
 }
 

-func NewFilePathItem(b []byte) FilePathItem {
-       return FilePathItem{
-               Len:  b[2],
-               Name: b[3:],
-       }
+type FilePath struct {
+       ItemCount [2]byte
+       Items     []FilePathItem

 }
 
 }
 

-type FilePath struct {
-       PathItemCount []byte
-       PathItems     []FilePathItem
+func (fp *FilePath) UnmarshalBinary(b []byte) error {
+       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
+       }
+
+       for i := uint16(0); i < fp.Len(); i++ {
+               // 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

 }
 
 }
 

-func NewFilePath(b []byte) FilePath {
-       if b == nil {
-               return FilePath{}
+func (fp *FilePath) IsDropbox() bool {
+       if fp.Len() == 0 {
+               return false

        }
 
        }
 

-       fp := FilePath{PathItemCount: b[0:2]}
+       return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "drop box")
+}

 
 

-       // number of items in the path
-       pathItemLen := binary.BigEndian.Uint16(b[0:2])
-       pathData := b[2:]
-       for i := uint16(0); i < pathItemLen; i++ {
-               segLen := pathData[2]
-               fp.PathItems = append(fp.PathItems, NewFilePathItem(pathData[:segLen+3]))
-               pathData = pathData[3+segLen:]
+func (fp *FilePath) IsUploadDir() bool {
+       if fp.Len() == 0 {
+               return false

        }
 
        }
 

-       return fp
+       return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "upload")
+}
+
+func (fp *FilePath) Len() uint16 {
+       return binary.BigEndian.Uint16(fp.ItemCount[:])

 }
 
 }
 

-func (fp *FilePath) String() string {
-       var out []string
-       for _, i := range fp.PathItems {
-               out = append(out, string(i.Name))
+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
+               }
+       }
+
+       var subPath string
+       for _, pathItem := range fp.Items {
+               subPath = filepath.Join("/", subPath, string(pathItem.Name))

        }
        }

-       return strings.Join(out, pathSeparator)
+
+       fullPath = filepath.Join(
+               fileRoot,
+               subPath,
+               filepath.Join("/", string(fileName)),
+       )
+
+       return fullPath, nil

 }
 }