Revert change to effectiveFile func

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index d6c05bcbcfb581d4df6d7f0dd89e2eb0670cea81..3ff243557f9b96a69a2d5be6a952fc48f1f03614 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -4,7 +4,9 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
+       "io"
        "path"
+       "strings"
 )
 
 const pathSeparator = "/" // File path separator TODO: make configurable to support Windows
@@ -18,38 +20,60 @@ 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 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
 }
 
+func (fp *FilePath) IsDropbox() bool {
+       if fp.Len() == 0 {
+               return false
+       }
+
+       return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "drop box")
+}
+
+func (fp *FilePath) IsUploadDir() bool {
+       if fp.Len() == 0 {
+               return false
+       }
+
+       return strings.Contains(strings.ToLower(string(fp.Items[fp.Len()-1].Name)), "upload")
+}
+
 func (fp *FilePath) Len() uint16 {
        return binary.BigEndian.Uint16(fp.ItemCount[:])
 }
@@ -71,3 +95,21 @@ func ReadFilePath(filePathFieldData []byte) string {
        }
        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
+}