libretic/transfer.sh
6
0
Fork 0
mirror of https://github.com/dutchcoders/transfer.sh.git synced 2024-11-26 22:20:18 +01:00
Code Issues Projects Releases Packages 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
Show stats 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) {
key := fmt.Sprintf("%s/%s", token, filename)
key := storj.JoinPaths(token, filename)
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) {
key := fmt.Sprintf("%s/%s", token, filename)
key := storj.JoinPaths(token, filename)
ctx := context.TODO()
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) {
key := fmt.Sprintf("%s/%s", token, filename)
key := storj.JoinPaths(token, filename)
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) {
key := fmt.Sprintf("%s/%s", token, filename)
key := storj.JoinPaths(token, 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
}
func toStorjKey(key string) (newKey storj.Key) {
var encryptionKey storj.Key
copy(encryptionKey[:], []byte(key))
return encryptionKey
}