Clone/aliyunpan
1
0
Fork 0
mirror of https://github.com/tickstep/aliyunpan.git synced 2025-02-02 21:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix upload file error

Browse Source
This commit is contained in:
tickstep 2024-03-03 10:50:23 +08:00
parent bb231dd45e
commit 4c0c8a4ff9
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/syncdrive/file_action_task.go
View File

@ -439,9 +439,11 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
// 检查同名文件是否存在 // 检查同名文件是否存在
panFileId := "" panFileId := ""
panFileSha1Str := ""
if panFileInDb, e := f.panFileDb.Get(targetPanFilePath); e == nil { if panFileInDb, e := f.panFileDb.Get(targetPanFilePath); e == nil {
if panFileInDb != nil { if panFileInDb != nil {
panFileId = panFileInDb.FileId panFileId = panFileInDb.FileId
panFileSha1Str = panFileInDb.Sha1Hash
} }
} else { } else {
efi, apierr := f.panClient.OpenapiPanClient().FileInfoByPath(f.syncItem.DriveId, targetPanFilePath) efi, apierr := f.panClient.OpenapiPanClient().FileInfoByPath(f.syncItem.DriveId, targetPanFilePath)
@ -454,12 +456,26 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
} }
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} }
if strings.ToUpper(panFileId) == strings.ToUpper(sha1Str) { if panFileId != "" {
logger.Verbosef("检测到同名文件，文件内容完全一致，无需重复上传: %s\n", targetPanFilePath) if strings.ToUpper(panFileSha1Str) == strings.ToUpper(sha1Str) {
f.syncItem.Status = SyncFileStatusSuccess logger.Verbosef("检测到同名文件，文件内容完全一致，无需重复上传: %s\n", targetPanFilePath)
f.syncItem.StatusUpdateTime = utils.NowTimeStr() f.syncItem.Status = SyncFileStatusSuccess
f.syncFileDb.Update(f.syncItem) f.syncItem.StatusUpdateTime = utils.NowTimeStr()
return nil f.syncFileDb.Update(f.syncItem)
return nil
} else {
// 删除云盘文件
dp := []*aliyunpan.FileBatchActionParam{
{
DriveId: f.syncItem.DriveId,
FileId: panFileId,
},
}
if _, e := f.panClient.OpenapiPanClient().FileDelete(dp); e != nil {
logger.Verbosef(" 删除云盘旧文件失败: %s\n", targetPanFilePath)
return e
}
}
} }
// 创建文件夹 // 创建文件夹