From 68c6f64333bf8756db31c5ceae0f040162703c0f Mon Sep 17 00:00:00 2001 From: Pacien TRAN-GIRARD Date: Sat, 22 Sep 2012 23:40:07 +0200 Subject: Fix path separator in URI on Windows (\ to /). --- src/ninjacloud.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ninjacloud.go b/src/ninjacloud.go index f15d7f1..5632709 100644 --- a/src/ninjacloud.go +++ b/src/ninjacloud.go @@ -234,10 +234,12 @@ func listDir(path string, recursive bool, filter []string, returnType string) (l var e element modTime := strconv.FormatInt(d.ModTime().UnixNano(), 10) modTime = modTime[:len(modTime)-6] - uri := filepath.Clean(path + "/" + d.Name()) + uri := path + "/" + d.Name() + uri = filepath.Clean(drivePrefix + projectsDir + "/" + uri) + uri = filepath.ToSlash(uri) e.Type = "directory" e.Name = d.Name() - e.Uri = filepath.Clean(drivePrefix + projectsDir + "/" + uri) + e.Uri = uri e.CreationDate = modTime // TODO e.ModifiedDate = modTime e.Size = strconv.FormatInt(d.Size(), 10) @@ -260,9 +262,11 @@ func listDir(path string, recursive bool, filter []string, returnType string) (l var e element modTime := strconv.FormatInt(d.ModTime().UnixNano(), 10) modTime = modTime[:len(modTime)-6] + uri := filepath.Clean(drivePrefix + projectsDir + "/" + path + "/" + d.Name()) + uri = filepath.ToSlash(uri) e.Type = "file" e.Name = d.Name() - e.Uri = filepath.Clean(drivePrefix + projectsDir + "/" + path + "/" + d.Name()) + e.Uri = uri e.CreationDate = modTime // TODO e.ModifiedDate = modTime e.Size = strconv.FormatInt(d.Size(), 10) -- cgit v1.2.3