minio/mc
1
0
Fork 0
mirror of https://github.com/minio/mc.git synced 2025-11-14 23:42:27 +03:00
Code Activity

Windows fixes for Get(), GetObjectMetadata() and List()

Browse Source
This commit is contained in:
Harshavardhana
2015-04-20 17:58:47 -07:00
parent 6109b2a6ff
commit d7e4be17b0
4 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd-cp-recursive.go
View File

@@ -18,6 +18,7 @@ package main
import (
"io"
"runtime"
"strings"
"fmt"
@@ -29,9 +30,19 @@ import (
)
const (
pathSeparator = "/"
pathSeparator = "/"
pathSeparatorWindows = "\\"
)
func getSourceURL(sourceURL, objectName string) string {
if client.GetURLType(sourceURL) == client.URLFilesystem {
if runtime.GOOS == "windows" {
return strings.TrimSuffix(sourceURL, pathSeparator) + pathSeparatorWindows + objectName
}
}
return strings.TrimSuffix(sourceURL, pathSeparator) + pathSeparator + objectName
}
// getSourceObjectURLMap - get list of all source object and its URLs in a map
func getSourceObjectURLMap(manager clientManager, sourceURL string) (sourceObjectURLMap map[string]string, err error) {
sourceClnt, err := manager.getNewClient(sourceURL, globalDebugFlag)
@@ -44,7 +55,7 @@ func getSourceObjectURLMap(manager clientManager, sourceURL string) (sourceObjec
}
sourceObjectURLMap = make(map[string]string)
for _, object := range objects {
sourceObjectURLMap[object.Name] = strings.TrimSuffix(sourceURL, pathSeparator) + pathSeparator + object.Name
sourceObjectURLMap[object.Name] = getSourceURL(sourceURL, object.Name)
}
return sourceObjectURLMap, nil
}