Merge pull request #45 from jhalter/add_ignorefiles_option

[rbdr/mobius] / hotline / file_path.go

diff --git a/hotline/file_path.go b/hotline/file_path.go
index 3ff243557f9b96a69a2d5be6a952fc48f1f03614..460af03464cc2e5376769a30f2a1b5951cb4d785 100644 (file)
--- a/hotline/file_path.go
+++ b/hotline/file_path.go
@@ -5,12 +5,10 @@ import (
        "encoding/binary"
        "errors"
        "io"
        "encoding/binary"
        "errors"
        "io"

-       "path"
+       "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


@@ -78,24 +76,6 @@ func (fp *FilePath) Len() uint16 {
        return binary.BigEndian.Uint16(fp.ItemCount[:])
 }
 
        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 {
 func readPath(fileRoot string, filePath, fileName []byte) (fullPath string, err error) {
        var fp FilePath
        if filePath != nil {


@@ -104,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,
                fileRoot,

-               fp.String(),
-               path.Join("/", string(fileName)),
+               subPath,
+               filepath.Join("/", string(fileName)),

        )
 
        return fullPath, nil
        )
 
        return fullPath, nil