Merge pull request #69 from beclab/fix/get_files_size

fix: get file size

Author: aby913

pkg/drivers/clouds/rclone/operations/operations.go

@@ -16,6 +16,7 @@ import (
 type Interface interface {
 	List(fs string, opts *OperationsOpt) (*OperationsList, error)
 	Stat(fs string, remote string, opts *OperationsOpt) (*OperationsStat, error)
+	About(fs string) (*OperationsAboutResp, error)
 	Mkdir(fs string, dirName string) error
 	Uploadfile(fs string, dirName string) error
 	Copyfile(srcFs string, srcR string, dstFs string, dstR string) error
@@ -97,6 +98,32 @@ func (o *operations) Stat(fs string, remote string, opts *OperationsOpt) (*Opera
 	return data, nil
 }
 
+func (o *operations) About(fs string) (*OperationsAboutResp, error) {
+	var url = fmt.Sprintf("%s/%s", common.ServeAddr, AboutPath)
+
+	var param = OperationsReq{
+		Fs: fs, // xxx:yyy
+	}
+
+	klog.Infof("[rclone] operations about, param: %s", commonutils.ToJson(param))
+
+	resp, err := utils.Request(context.Background(), url, http.MethodPost, nil, []byte(commonutils.ToJson(param)))
+	if err != nil {
+		klog.Errorf("[rclone] operations about error: %v, fs: %s", err, fs)
+		return nil, err
+	}
+
+	var data *OperationsAboutResp
+	if err := json.Unmarshal(resp, &data); err != nil {
+		klog.Errorf("[rclone] operations about unmarshal error: %v, fs: %s", err, fs)
+		return nil, err
+	}
+
+	klog.Infof("[rclone] operations about done! fs: %s, data: %s", fs, commonutils.ToJson(data))
+
+	return data, nil
+}
+
 func (o *operations) Copyfile(srcFs string, srcR string, dstFs string, dstR string) error {
 	var url = fmt.Sprintf("%s/%s", common.ServeAddr, CopyfilePath)
 	var async = false

pkg/drivers/clouds/rclone/operations/vars.go

@@ -10,6 +10,7 @@ var (
 	PurgePath      = "operations/purge"
 	StatPath       = "operations/stat"
 	SizePath       = "operations/size"
+	AboutPath      = "operations/about"
 
 	SyncCopyPath = "sync/copy"
 	SyncMovePath = "sync/move"
@@ -99,3 +100,9 @@ type SyncCopyReq struct {
 	DeleteEmptySrcDirs bool   `json:"deleteEmptySrcDirs"`
 	Async              *bool  `json:"_async,omitempty"`
 }
+
+type OperationsAboutResp struct {
+	Free  int64 `json:"free"`
+	Total int64 `json:"total"`
+	Used  int64 `json:"used"`
+}

pkg/drivers/clouds/rclone/rclone.go

@@ -227,6 +227,23 @@ func (r *rclone) checkChangedConfigs(configs []*config.Config) *config.CreateCon
 	return changed
 }
 
+func (r *rclone) GetSpaceSize(fileParam *models.FileParam) (int64, error) {
+	var fsPrefix, err = r.GetFsPrefix(fileParam)
+	if err != nil {
+		return 0, err
+	}
+
+	var fs string
+	fs = fsPrefix
+
+	resp, err := r.operation.About(fs)
+	if err != nil {
+		return 0, err
+	}
+
+	return resp.Free, nil
+}
+
 func (r *rclone) GetFilesSize(fileParam *models.FileParam) (int64, error) {
 	var fsPrefix, err = r.GetFsPrefix(fileParam)
 	if err != nil {

pkg/tasks/task_paste_cloud.go

@@ -31,14 +31,16 @@ func (t *Task) DownloadFromCloud() error {
 		return err
 	}
 
-	posixSize, err := cmd.GetFilesSize(posixParam)
+	posixSize, err := cmd.GetSpaceSize(posixParam)
 	if err != nil {
 		klog.Errorf("get posix free space size error: %v", err)
 		return err
 	}
 
 	klog.Infof("[Task] Id: %s, check posix space, cloudSize: %d, posixSize: %d", t.id, cloudSize, posixSize)
 
+	t.updateTotalSize(cloudSize)
+
 	requiredSpace := int64(float64(cloudSize) * 1.05)
 	if posixSize < requiredSpace {
 		return fmt.Errorf("not enough free space on disk, required: %s, available: %s", common.FormatBytes(requiredSpace), common.FormatBytes(posixSize))