Windows path fix

0chain · Sep 3, 2020 · e3d69c0 · e3d69c0
1 parent 74a2120
commit e3d69c0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/zboxcore/allocationchange/copyobject.go b/zboxcore/allocationchange/copyobject.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zboxcore/fileref"
+	"github.com/0chain/gosdk/zboxcore/zboxutil"
 )
 
 type CopyFileChange struct {
@@ -58,7 +59,7 @@ func (ch *CopyFileChange) ProcessChange(rootRef *fileref.Ref) error {
 		affectedRef = ch.ObjectTree.(*fileref.Ref)
 	}
 
-	affectedRef.Path = filepath.Join(foundRef.GetPath(), affectedRef.Name)
+	affectedRef.Path = zboxutil.Join(foundRef.GetPath(), affectedRef.Name)
 	ch.processChildren(affectedRef)
 
 	destRef := foundRef.(*fileref.Ref)
@@ -76,7 +77,7 @@ func (ch *CopyFileChange) processChildren(curRef *fileref.Ref) {
 		} else {
 			childRef = childRefEntity.(*fileref.Ref)
 		}
-		childRef.Path = filepath.Join(curRef.Path, childRef.Name)
+		childRef.Path = zboxutil.Join(curRef.Path, childRef.Name)
 		if childRefEntity.GetType() == fileref.DIRECTORY {
 			ch.processChildren(childRef)
 		}

diff --git a/zboxcore/allocationchange/renameobject.go b/zboxcore/allocationchange/renameobject.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zboxcore/fileref"
+	"github.com/0chain/gosdk/zboxcore/zboxutil"
 )
 
 type RenameFileChange struct {
@@ -55,9 +56,9 @@ func (ch *RenameFileChange) ProcessChange(rootRef *fileref.Ref) error {
 	}
 
 	path, _ = filepath.Split(affectedRef.Path)
-	path = filepath.Clean(path)
+	path = zboxutil.RemoteClean(path)
 	affectedRef.Name = ch.NewName
-	affectedRef.Path = filepath.Join(path, ch.NewName)
+	affectedRef.Path = zboxutil.Join(path, ch.NewName)
 
 	// Logger.Info("Changed name: " + dirRef.Children[idx].GetName())
 

diff --git a/zboxcore/zboxutil/util.go b/zboxcore/zboxutil/util.go
@@ -207,3 +207,7 @@ func getMinShardersVerify() int {
 func calculateMinRequired(minRequired, percent float64) int {
 	return int(math.Ceil(minRequired * percent))
 }
+
+func Join(a, b string) string {
+	return strings.ReplaceAll(filepath.Join(a, b), "\\", "/")
+}