github
/
drone-s3-sync
mirror of https://github.com/thegeeklab/drone-s3-sync.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

file path fixes

This commit is contained in:
Nathan LaFreniere 2015-11-13 16:24:54 -08:00
parent 4fe42e20b4
commit 98f7f4ab71
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@ -114,7 +114,12 @@ func (aws *AWS) visit(path string, info os.FileInfo, err error) error {
return nil return nil
} }
aws.local = append(aws.local, path) localPath := strings.TrimPrefix(path, vargs.Source)
if strings.HasPrefix(localPath, "/") {
localPath = localPath[1:]
}
aws.local = append(aws.local, localPath)
file, err := os.Open(path) file, err := os.Open(path)
if err != nil { if err != nil {
return err return err
@ -128,7 +133,7 @@ func (aws *AWS) visit(path string, info os.FileInfo, err error) error {
} else if !aws.vargs.Access.IsEmpty() { } else if !aws.vargs.Access.IsEmpty() {
accessMap := aws.vargs.Access.Map() accessMap := aws.vargs.Access.Map()
for pattern := range accessMap { for pattern := range accessMap {
if match, _ := filepath.Match(pattern, path); match == true { if match, _ := filepath.Match(pattern, localPath); match == true {
access = s3.ACL(accessMap[pattern]) access = s3.ACL(accessMap[pattern])
break break
} }
@ -139,7 +144,7 @@ func (aws *AWS) visit(path string, info os.FileInfo, err error) error {
access = s3.ACL("private") access = s3.ACL("private")
} }
fileExt := filepath.Ext(path) fileExt := filepath.Ext(localPath)
var contentType string var contentType string
if aws.vargs.ContentType.IsString() { if aws.vargs.ContentType.IsString() {
contentType = aws.vargs.ContentType.String() contentType = aws.vargs.ContentType.String()
@ -157,8 +162,8 @@ func (aws *AWS) visit(path string, info os.FileInfo, err error) error {
contentType = mime.TypeByExtension(fileExt) contentType = mime.TypeByExtension(fileExt)
} }
fmt.Printf("Uploading %s with Content-Type %s and permissions %s\n", path, contentType, access) fmt.Printf("Uploading %s with Content-Type %s and permissions %s\n", localPath, contentType, access)
err = aws.bucket.PutReader(path, file, info.Size(), contentType, access) err = aws.bucket.PutReader(filepath.Join(vargs.Target, localPath), file, info.Size(), contentType, access)
if err != nil { if err != nil {
return err return err
} }
@ -220,10 +225,6 @@ func main() {
vargs.Target = vargs.Target[1:] vargs.Target = vargs.Target[1:]
} }
if vargs.Target != "" && !strings.HasSuffix(vargs.Target, "/") {
vargs.Target = fmt.Sprintf("%s/", vargs.Target)
}
client := NewClient(vargs) client := NewClient(vargs)
resp, err := client.List(vargs.Target) resp, err := client.List(vargs.Target)