fix upload chunk file bugs

9a0e1273 · Eric · e7f14b15 · 9a0e1273
Commit 9a0e1273 authored Jul 29, 2019 by Eric
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sftpvolume.go pkg/httpd/sftpvolume.go +4 -0

No files found.
--- a/pkg/httpd/sftpvolume.go
+++ b/pkg/httpd/sftpvolume.go
@@ -173,6 +173,8 @@ func (u *UserVolume) UploadChunk(cid int, dirPath, uploadPath, filename string,
 		switch {
 		case strings.Contains(uploadPath,filename):
 			path = filepath.Join(dirPath, TrimPrefix(uploadPath))
+		case uploadPath != "":
+			path = filepath.Join(dirPath, TrimPrefix(uploadPath), filename)
 		default:
 			path = filepath.Join(dirPath, filename)

@@ -204,6 +206,8 @@ func (u *UserVolume) MergeChunk(cid, total int, dirPath, uploadPath, filename st
 	switch {
 	case strings.Contains(uploadPath,filename):
 		path = filepath.Join(dirPath, TrimPrefix(uploadPath))
+	case uploadPath != "":
+		path = filepath.Join(dirPath, TrimPrefix(uploadPath), filename)
 	default:
 		path = filepath.Join(dirPath, filename)