JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "key not found" error on uploading files with uplink cli (#807)

Browse Source
This commit is contained in:
Kaloyan Raev 2018-12-10 12:13:30 +02:00 committed by GitHub
parent c7cf97cc23
commit a4dec2da93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/uplink/cmd/cp.go
View File

@ -16,6 +16,7 @@ import (
"storj.io/storj/internal/fpath"
"storj.io/storj/pkg/process"
"storj.io/storj/pkg/storage/streams"
"storj.io/storj/pkg/storj"
"storj.io/storj/pkg/stream"
"storj.io/storj/pkg/utils"
@ -84,11 +85,6 @@ func upload(ctx context.Context, src fpath.FPath, dst fpath.FPath, showProgress
return convertError(err, dst)
}
mutableStream, err := obj.CreateStream(ctx)
if err != nil {
return err
}
reader := io.Reader(file)
var bar *progressbar.ProgressBar
if showProgress {
@ -97,14 +93,7 @@ func upload(ctx context.Context, src fpath.FPath, dst fpath.FPath, showProgress
reader = bar.NewProxyReader(reader)
}
upload := stream.NewUpload(ctx, mutableStream, streams)
defer utils.LogClose(upload)
_, err = io.Copy(upload, reader)
if err != nil {
return err
}
err = obj.Commit(ctx)
err = uploadStream(ctx, streams, obj, reader)
if err != nil {
return err
}
@ -118,6 +107,23 @@ func upload(ctx context.Context, src fpath.FPath, dst fpath.FPath, showProgress
return nil
}
func uploadStream(ctx context.Context, streams streams.Store, mutableObject storj.MutableObject, reader io.Reader) error {
mutableStream, err := mutableObject.CreateStream(ctx)
if err != nil {
return err
}
upload := stream.NewUpload(ctx, mutableStream, streams)
defer utils.LogClose(upload)
_, err = io.Copy(upload, reader)
if err != nil {
return err
}
return err
}
// download transfers s3 compatible object src to dst on local machine
func download(ctx context.Context, src fpath.FPath, dst fpath.FPath, showProgress bool) error {
if src.IsLocal() {