resolve merge conflicts after squash merge from main

Author: Suyunmeng

drivers/123_open/driver.go

@@ -225,8 +225,7 @@ func (d *Open123) Put(ctx context.Context, dstDir model.Obj, file model.FileStre
 	return nil, fmt.Errorf("upload complete timeout")
 }
 
-<<<<<<< HEAD
-// Preup 预上传
+// Preup handles pre-upload initialization for slice upload
 func (d *Open123) Preup(ctx context.Context, srcobj model.Obj, req *reqres.PreupReq) (*model.PreupInfo, error) {
 	pid, err := strconv.ParseUint(srcobj.GetID(), 10, 64)
 	if err != nil {
@@ -257,21 +256,21 @@ func (d *Open123) Preup(ctx context.Context, srcobj model.Obj, req *reqres.Preup
 	}, nil
 }
 
-// UploadSlice 上传分片
+// SliceUpload handles individual slice upload
 func (d *Open123) SliceUpload(ctx context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
 	sh := strings.Split(req.SliceHash, ",")
 	if int(sliceno) >= len(sh) {
 		return fmt.Errorf("slice number %d out of range, total slices: %d", sliceno, len(sh))
 	}
-	
+
 	if req.PreupID == "" {
 		return fmt.Errorf("preupload ID is empty for slice %d", sliceno)
 	}
-	
+
 	if req.Server == "" {
 		return fmt.Errorf("upload server is empty for slice %d", sliceno)
 	}
-	
+
 	r := &UploadSliceReq{
 		Name:        req.Name,
 		PreuploadID: req.PreupID,
@@ -280,26 +279,26 @@ func (d *Open123) SliceUpload(ctx context.Context, req *tables.SliceUpload, slic
 		SliceMD5:    sh[sliceno],
 		SliceNo:     int(sliceno) + 1,
 	}
-	
+
 	if err := d.uploadSlice(r); err != nil {
 		return fmt.Errorf("upload slice %d failed: %w", sliceno, err)
 	}
 	return nil
 }
 
-// UploadSliceComplete 分片上传完成
+// UploadSliceComplete finalizes slice upload process
+// UploadSliceComplete finalizes slice upload process
 func (d *Open123) UploadSliceComplete(ctx context.Context, su *tables.SliceUpload) error {
 	if su.PreupID == "" {
 		return fmt.Errorf("preupload ID is empty")
 	}
-	
+
 	if err := d.sliceUpComplete(su.PreupID); err != nil {
 		return fmt.Errorf("slice upload complete failed: %w", err)
 	}
 	return nil
 }
 
-=======
 func (d *Open123) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
 	userInfo, err := d.getUserInfo()
 	if err != nil {
@@ -315,6 +314,5 @@ func (d *Open123) GetDetails(ctx context.Context) (*model.StorageDetails, error)
 	}, nil
 }
 
->>>>>>> origin/main
 var _ driver.Driver = (*Open123)(nil)
 var _ driver.PutResult = (*Open123)(nil)

drivers/baidu_netdisk/driver.go

@@ -378,7 +378,6 @@ func (d *BaiduNetdisk) uploadSlice(ctx context.Context, params map[string]string
 	return nil
 }
 
-<<<<<<< HEAD
 // SliceUpload 上传分片
 func (d *BaiduNetdisk) SliceUpload(ctx context.Context, req *tables.SliceUpload, sliceno uint, fd io.Reader) error {
 	fp := filepath.Join(req.DstPath, req.Name)
@@ -405,11 +404,11 @@ func (d *BaiduNetdisk) SliceUpload(ctx context.Context, req *tables.SliceUpload,
 		}
 		req.PreupID = precreateResp.Uploadid
 	}
-	
+
 	if req.PreupID == "" {
 		return fmt.Errorf("preupload ID is empty for slice %d", sliceno)
 	}
-	
+
 	err := d.uploadSlice(ctx, map[string]string{
 		"method":       "upload",
 		"access_token": d.AccessToken,
@@ -418,7 +417,7 @@ func (d *BaiduNetdisk) SliceUpload(ctx context.Context, req *tables.SliceUpload,
 		"uploadid":     req.PreupID,
 		"partseq":      strconv.Itoa(int(sliceno)),
 	}, req.Name, fd)
-	
+
 	if err != nil {
 		return fmt.Errorf("upload slice %d failed: %w", sliceno, err)
 	}
@@ -437,36 +436,36 @@ func (d *BaiduNetdisk) UploadSliceComplete(ctx context.Context, su *tables.Slice
 	fp := filepath.Join(su.DstPath, su.Name)
 	rsp := &SliceUpCompleteResp{}
 	t := time.Now().Unix()
-	
+
 	sliceHashList := strings.Split(su.SliceHash, ",")
 	if len(sliceHashList) == 0 {
 		return fmt.Errorf("slice hash list is empty")
 	}
-	
+
 	sh, err := json.Marshal(sliceHashList)
 	if err != nil {
 		return fmt.Errorf("failed to marshal slice hash: %w", err)
 	}
-	
+
 	b, err := d.create(fp, int64(su.Size), 0, su.PreupID, string(sh), rsp, t, t)
 	if err != nil {
 		log.Errorf("create file failed: %v, response: %v, body: %s", err, rsp, string(b))
 		return fmt.Errorf("create file failed: %w", err)
 	}
-	
+
 	if rsp.Errno != 0 {
 		return fmt.Errorf("baidu response error: errno=%d", rsp.Errno)
 	}
-	
+
 	return nil
-=======
+}
+
 func (d *BaiduNetdisk) GetDetails(ctx context.Context) (*model.StorageDetails, error) {
 	du, err := d.quota()
 	if err != nil {
 		return nil, err
 	}
 	return &model.StorageDetails{DiskUsage: *du}, nil
->>>>>>> origin/main
 }
 
 var _ driver.Driver = (*BaiduNetdisk)(nil)

drivers/baidu_netdisk/types.go

@@ -190,7 +190,6 @@ type PrecreateResp struct {
 	File File `json:"info"`
 }
 
-<<<<<<< HEAD
 // PrecreateReq  预上传请求
 type PrecreateReq struct {
 	Path       string   `json:"path"`                  // 上传后使用的文件绝对路径（需urlencode）
@@ -235,13 +234,13 @@ type SliceUpCompleteResp struct {
 	Ctime          uint64 `json:"ctime"`           // 文件创建时间
 	Mtime          uint64 `json:"mtime"`           // 文件修改时间
 	Isdir          int    `json:"isdir"`           // 是否目录，0 文件、1 目录
-=======
+}
+
 type QuotaResp struct {
 	Errno     int    `json:"errno"`
 	RequestId int64  `json:"request_id"`
 	Total     uint64 `json:"total"`
 	Used      uint64 `json:"used"`
 	//Free      uint64 `json:"free"`
 	//Expire    bool   `json:"expire"`
->>>>>>> origin/main
 }