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 delete file error for sync command to fix issue #111

Browse Source
This commit is contained in:
tickstep 2022-07-02 17:24:41 +08:00
parent bf4027601c
commit 99cfb7d09d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/syncdrive/file_action_task.go
View File

@ -62,12 +62,16 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
if f.syncItem.UploadEntity != nil && f.syncItem.UploadEntity.FileId != "" { if f.syncItem.UploadEntity != nil && f.syncItem.UploadEntity.FileId != "" {
if file, er := f.panClient.FileInfoById(f.syncItem.DriveId, f.syncItem.UploadEntity.FileId); er == nil { if file, er := f.panClient.FileInfoById(f.syncItem.DriveId, f.syncItem.UploadEntity.FileId); er == nil {
file.Path = f.syncItem.getPanFileFullPath() file.Path = f.syncItem.getPanFileFullPath()
f.panFileDb.Add(NewPanFileItem(file)) fItem := NewPanFileItem(file)
fItem.ScanTimeAt = utils.NowTimeStr()
f.panFileDb.Add(fItem)
} }
} else { } else {
if file, er := f.panClient.FileInfoByPath(f.syncItem.DriveId, f.syncItem.getPanFileFullPath()); er == nil { if file, er := f.panClient.FileInfoByPath(f.syncItem.DriveId, f.syncItem.getPanFileFullPath()); er == nil {
file.Path = f.syncItem.getPanFileFullPath() file.Path = f.syncItem.getPanFileFullPath()
f.panFileDb.Add(NewPanFileItem(file)) fItem := NewPanFileItem(file)
fItem.ScanTimeAt = utils.NowTimeStr()
f.panFileDb.Add(fItem)
} }
} }
} }
@ -108,6 +112,8 @@ func (f *FileActionTask) DoAction(ctx context.Context) error {
FileExtension: path.Ext(file.Name()), FileExtension: path.Ext(file.Name()),
Sha1Hash: f.syncItem.PanFile.Sha1Hash, Sha1Hash: f.syncItem.PanFile.Sha1Hash,
Path: f.syncItem.getLocalFileFullPath(), Path: f.syncItem.getLocalFileFullPath(),
ScanTimeAt: utils.NowTimeStr(),
ScanStatus: ScanStatusNormal,
}) })
} }
} }
@ -369,7 +375,9 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error {
// save into DB // save into DB
if panDirFile, e := f.panClient.FileInfoById(f.syncItem.DriveId, panDirFileId); e == nil { if panDirFile, e := f.panClient.FileInfoById(f.syncItem.DriveId, panDirFileId); e == nil {
panDirFile.Path = panDirPath panDirFile.Path = panDirPath
f.panFileDb.Add(NewPanFileItem(panDirFile)) fItem := NewPanFileItem(panDirFile)
fItem.ScanTimeAt = utils.NowTimeStr()
f.panFileDb.Add(fItem)
} }
} }