Fix the problem of the empty directory for breakpoint resume

Author: yangzong18

oss/upload.go

@@ -42,11 +42,15 @@ func (bucket Bucket) UploadFile(objectKey, filePath string, partSize int64, opti
 }
 
 func getUploadCpFilePath(cpConf *cpConfig, srcFile, destBucket, destObject string) string {
-	if cpConf.FilePath == "" && cpConf.DirPath != "" {
+	if cpConf.FilePath == "" {
 		dest := fmt.Sprintf("oss://%v/%v", destBucket, destObject)
 		absPath, _ := filepath.Abs(srcFile)
 		cpFileName := getCpFileName(absPath, dest, "")
-		cpConf.FilePath = cpConf.DirPath + string(os.PathSeparator) + cpFileName
+		if cpConf.DirPath != "" {
+			cpConf.FilePath = cpConf.DirPath + string(os.PathSeparator) + cpFileName
+		}else{
+			cpConf.FilePath = cpFileName
+		}
 	}
 	return cpConf.FilePath
 }

oss/upload_test.go

@@ -417,6 +417,54 @@ func (s *OssUploadSuite) TestUploadRoutineWithRecovery(c *C) {
 	c.Assert(err, IsNil)
 }
 
+// TestUploadRoutineWithEmptyCheckPoint is multi-routine upload with empty check point
+func (s *OssUploadSuite) TestUploadRoutineWithEmptyCheckPoint(c *C) {
+	objectName := objectNamePrefix + RandStr(8)
+	fileName := "../sample/BingWallpaper-2015-11-07.jpg"
+	newFile := "upload-new-file-2.jpg"
+
+	// Use default routines and default CP file path
+	// First upload for 4 parts
+	uploadPartHooker = ErrorHooker
+	err := s.bucket.UploadFile(objectName, fileName, 100*1024, Checkpoint(true, ""))
+	c.Assert(err, NotNil)
+	c.Assert(err.Error(), Equals, "ErrorHooker")
+	uploadPartHooker = defaultUploadPart
+	// Check CP
+	ucp := uploadCheckpoint{}
+	cpConf := cpConfig{IsEnable: true, FilePath: ""}
+	cpFilePath := getUploadCpFilePath(&cpConf, fileName, s.bucket.BucketName, objectName)
+	err = ucp.load(cpFilePath)
+	c.Assert(err, IsNil)
+	c.Assert(ucp.Magic, Equals, uploadCpMagic)
+	c.Assert(len(ucp.MD5), Equals, len("LC34jZU5xK4hlxi3Qn3XGQ=="))
+	c.Assert(ucp.FilePath, Equals, fileName)
+	c.Assert(ucp.FileStat.Size, Equals, int64(482048))
+	c.Assert(len(ucp.FileStat.LastModified.String()) > 0, Equals, true)
+	c.Assert(ucp.FileStat.MD5, Equals, "")
+	c.Assert(ucp.ObjectKey, Equals, objectName)
+	c.Assert(len(ucp.UploadID), Equals, len("3F79722737D1469980DACEDCA325BB52"))
+	c.Assert(len(ucp.Parts), Equals, 5)
+	c.Assert(len(ucp.todoParts()), Equals, 1)
+	c.Assert(len(ucp.allParts()), Equals, 5)
+
+	// Second upload, finish the remaining part
+	err = s.bucket.UploadFile(objectName, fileName, 100*1024, Checkpoint(true, ""))
+	c.Assert(err, IsNil)
+
+	os.Remove(newFile)
+	os.Remove(cpFilePath)
+	err = s.bucket.GetObjectToFile(objectName, newFile)
+	c.Assert(err, IsNil)
+
+	eq, err := compareFiles(fileName, newFile)
+	c.Assert(err, IsNil)
+	c.Assert(eq, Equals, true)
+
+	err = s.bucket.DeleteObject(objectName)
+	c.Assert(err, IsNil)
+}
+
 // TestUploadRoutineWithRecoveryNegative is multiroutineed upload without checkpoint
 func (s *OssUploadSuite) TestUploadRoutineWithRecoveryNegative(c *C) {
 	objectName := objectNamePrefix + RandStr(8)