gaspersic/transfer.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changes according to CR

Browse Source
This commit is contained in:
stefanbenten
2019-08-29 16:35:24 +02:00
parent c1691c58dc
commit 79c5130066
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/storage.go
View File

@@ -613,7 +613,7 @@ func (s *StorjStorage) Type() string {
} }
func (s *StorjStorage) Head(token string, filename string) (contentType string, contentLength uint64, err error) { func (s *StorjStorage) Head(token string, filename string) (contentType string, contentLength uint64, err error) {
key := fmt.Sprintf("%s/%s", token, filename) key := storj.JoinPaths(token, filename)
ctx := context.TODO() ctx := context.TODO()
@@ -628,7 +628,7 @@ func (s *StorjStorage) Head(token string, filename string) (contentType string,
} }
func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error) { func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error) {
key := fmt.Sprintf("%s/%s", token, filename) key := storj.JoinPaths(token, filename)
ctx := context.TODO() ctx := context.TODO()
obj, err := s.bucket.OpenObject(ctx, key) obj, err := s.bucket.OpenObject(ctx, key)
@@ -642,7 +642,7 @@ func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser,
} }
func (s *StorjStorage) Delete(token string, filename string) (err error) { func (s *StorjStorage) Delete(token string, filename string) (err error) {
key := fmt.Sprintf("%s/%s", token, filename) key := storj.JoinPaths(token, filename)
ctx := context.TODO() ctx := context.TODO()
@@ -652,7 +652,7 @@ func (s *StorjStorage) Delete(token string, filename string) (err error) {
} }
func (s *StorjStorage) Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) (err error) { func (s *StorjStorage) Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) (err error) {
key := fmt.Sprintf("%s/%s", token, filename) key := storj.JoinPaths(token, filename)
s.logger.Printf("Uploading file %s to S3 Bucket", filename) s.logger.Printf("Uploading file %s to S3 Bucket", filename)
@@ -664,9 +664,3 @@ func (s *StorjStorage) Put(token string, filename string, reader io.Reader, cont
} }
return nil return nil
} }
func toStorjKey(key string) (newKey storj.Key) {
var encryptionKey storj.Key
copy(encryptionKey[:], []byte(key))
return encryptionKey
}