v3.9.1

Author: qjfoidnh

README.md

@@ -100,6 +100,9 @@ iikira/BaiduPCS-Go was largely inspired by [GangZhuo/BaiduPCS](https://github.co
 [离线下载](#离线下载), 支持http/https/ftp/电驴/磁力链协议.
 
 # 版本更新
+**2023.03.19** v3.9.1
+- 修复秒传转存返回错误码9019
+
 **2022.12.04** v3.9.0:
 - 优化转存错误提示
 - fix #239

baidupcs/pcserror/xpanerrorinfo.go

@@ -93,7 +93,7 @@ func (pane *XPanErrorInfo) Error() string {
 
 		return fmt.Sprintf("%s, 遇到错误, %s", pane.Operation, pane.Err)
 	default:
-		panic("panerrorinfo: unknown ErrType")
+		panic("xpanerrorinfo: unknown ErrType")
 	}
 }
 
@@ -103,9 +103,13 @@ func FindXPanErr(errno int) (errmsg string) {
 	case 0:
 		return StrSuccess
 	case 2:
-		return "md5不存在"
+		return "文件长度异常"
 	case -8:
 		return "同名文件冲突"
+	case 31190:
+		return "MD5不存在"
+	case 31079:
+		return "文件已被屏蔽"
 	default:
 		return "未知错误"
 	}

baidupcs/prepare.go

@@ -335,7 +335,7 @@ func (pcs *BaiduPCS) PrepareRapidUploadV2(targetPath, contentMD5 string, length
 		return nil, pcsError
 	}
 
-	pcsURL := pcs.generatePCSURL2("xpan/file", "create", nil)
+	pcsURL := pcs.generatePanURL("create", nil)
 	post := map[string]string{
 		"path":       targetPath,
 		"size":       strconv.FormatInt(length, 10),

baidupcs/upload.go

@@ -118,29 +118,6 @@ func (pcs *BaiduPCS) RapidUpload(targetPath, contentMD5, sliceMD5, crc32 string,
 	}()
 
 	return pcs.rapidUploadV2(targetPath, strings.ToLower(contentMD5), length)
-
-	//// 尝试全大写
-	//pcsError = pcs.rapidUpload(targetPath, strings.ToUpper(contentMD5), strings.ToUpper(sliceMD5), crc32, length)
-	//if pcsError == nil || pcsError.GetRemoteErrCode() != 31079 {
-	//	return
-	//}
-	//
-	//// 尝试全小写
-	//pcsError = pcs.rapidUpload(targetPath, strings.ToLower(contentMD5), strings.ToLower(sliceMD5), crc32, length)
-	//if pcsError == nil || pcsError.GetRemoteErrCode() != 31079 {
-	//	return
-	//}
-	//
-	//// 尝试随机大小写
-	//pcsError = pcs.rapidUpload(targetPath, randomifyMD5(contentMD5), randomifyMD5(sliceMD5), crc32, length)
-	//if pcsError == nil || pcsError.GetRemoteErrCode() != 31079 {
-	//	return
-	//}
-	//
-	//return
-
-	//// 尝试 xpan 接口
-	//return pcs.rapidUploadV2(targetPath, strings.ToLower(contentMD5), length)
 }
 
 func (pcs *BaiduPCS) rapidUpload(targetPath, contentMD5, sliceMD5, crc32 string, length int64) (pcsError pcserror.Error) {
@@ -159,30 +136,6 @@ func (pcs *BaiduPCS) rapidUploadV2(targetPath, contentMD5 string, length int64)
 	}
 	defer dataReadCloser.Close()
 	return pcserror.DecodeXPanJSONError(OperationRapidUpload, dataReadCloser)
-
-	//errInfo := pcserror.NewPanErrorInfo(OperationRapidUpload)
-	//jsonData := uploadCreateJSON{
-	//	PanErrorInfo: errInfo,
-	//}
-	//pcsError = pcserror.HandleJSONParse(OperationRapidUpload, dataReadCloser, &jsonData)
-	//if pcsError != nil {
-	//	return
-	//}
-	//fmt.Println(jsonData)
-	//switch jsonData.ErrNo {
-	//case 0:
-	//	return
-	//case 2:
-	//	errInfo.SetRemoteError()
-	//	errInfo.Err = ErrUploadMD5Unknown
-	//	return errInfo
-	//case -8:
-	//	return nil
-	//default:
-	//	errInfo.ErrType = pcserror.ErrTypeOthers
-	//	errInfo.Err = fmt.Errorf("errno=%d", jsonData.ErrNo)
-	//	return errInfo
-	//}
 }
 
 // RapidUploadNoCheckDir 秒传文件, 不进行目录检查, 会覆盖掉同名的目录!

internal/pcscommand/transfer.go

@@ -136,8 +136,7 @@ func RunRapidTransfer(link string) {
 		md5 := substrs[0]
 		length, _ := strconv.ParseInt(substrs[1], 10, 64)
 		filename := path.Join(GetActiveUser().Workdir, substrs[2])
-		slicemd5 := ""
-		RunRapidUpload(filename, md5, slicemd5, "", length)
+		RunRapidUpload(filename, md5, "", "", length)
 		return
 	}
 	substrs = strings.Split(link, "|")

main.go

@@ -55,7 +55,7 @@ const (
 
 var (
 	// Version 版本号
-	Version = "v3.9.0-devel"
+	Version = "v3.9.1-devel"
 
 	historyFilePath = filepath.Join(pcsconfig.GetConfigDir(), "pcs_command_history.txt")
 	reloadFn        = func(c *cli.Context) error {

versioninfo.json

@@ -3,13 +3,13 @@
         "FileVersion": {
             "Major": 3,
             "Minor": 9,
-            "Patch": 0,
+            "Patch": 1,
             "Build": 0
         },
         "ProductVersion": {
             "Major": 3,
             "Minor": 9,
-            "Patch": 0,
+            "Patch": 1,
             "Build": 0
         },
         "FileFlagsMask": "3f",
@@ -22,14 +22,14 @@
         "Comments": "",
         "CompanyName": "qjfoidnh",
         "FileDescription": "百度网盘客户端(加强版)",
-        "FileVersion": "v3.9.0",
+        "FileVersion": "v3.9.1",
         "InternalName": "",
         "LegalCopyright": "© 2016-2020 iikira.",
         "LegalTrademarks": "",
         "OriginalFilename": "",
         "PrivateBuild": "",
         "ProductName": "BaiduPCS-Go",
-        "ProductVersion": "v3.9.0",
+        "ProductVersion": "v3.9.1",
         "SpecialBuild": ""
     },
     "VarFileInfo": {