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 download path error to fix issue #130

Browse Source
This commit is contained in:
tickstep 2022-08-21 08:39:32 +08:00
parent 15bef9fcc3
commit 1cf3db39b1
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/functions/pandownload/download_task_unit.go
View File

@ -126,21 +126,25 @@ func (dtu *DownloadTaskUnit) download() (err error) {
suffixPath := localfile.GetSuffixPath(dir, dtu.OriginSaveRootPath)
saveDirPathSymlinkFile, saveDirPathFileInfo, err := localfile.RetrieveRealPathFromLogicSuffixPath(originSaveRootSymlinkFile, suffixPath)
if err != nil && !os.IsExist(err) {
realSavePath := saveDirPathSymlinkFile.RealPath
suffixPath = localfile.GetSuffixPath(dtu.SavePath, saveDirPathSymlinkFile.LogicPath) // 获取后缀不存在的路径
// 本地保存目录不存在，需要创建对应的保存目录
realSaveDirPath := saveDirPathSymlinkFile.RealPath
suffixPath = localfile.GetSuffixPath(path.Dir(dtu.SavePath), saveDirPathSymlinkFile.LogicPath) // 获取后缀不存在的路径
if suffixPath != "" {
realSavePath = filepath.Join(realSavePath, suffixPath) // 拼接
realSaveDirPath = filepath.Join(realSaveDirPath, suffixPath) // 拼接
}
// 目录不存在, 创建
err = os.MkdirAll(realSavePath, 0777)
// 创建保存目录
err = os.MkdirAll(realSaveDirPath, 0777)
if err != nil {
return err
}
savePathSymlinkFile.RealPath = realSavePath + "/" + filepath.Base(localfile.CleanPath(dtu.SavePath))
// 拼接完整的保存文件路径
savePathSymlinkFile.RealPath = filepath.Join(realSaveDirPath, filepath.Base(localfile.CleanPath(dtu.SavePath)))
} else if !saveDirPathFileInfo.IsDir() {
// SavePath所在的目录不是目录
return fmt.Errorf("%s, path %s: not a directory", StrDownloadInitError, saveDirPathSymlinkFile.RealPath)
} else {
// 保存目录已存在，直接拼接成文件完整保存路径
savePathSymlinkFile.RealPath = filepath.Join(saveDirPathSymlinkFile.RealPath, filepath.Base(localfile.CleanPath(dtu.SavePath)))
}
savePathSymlinkFile, _, _ = localfile.RetrieveRealPath(savePathSymlinkFile)
@ -485,7 +489,14 @@ func (dtu *DownloadTaskUnit) Run() (result *taskframework.TaskUnitRunResult) {
if suffixPath != "" {
realSavePath = filepath.Join(realSavePath, suffixPath)
}
os.MkdirAll(realSavePath, 0777) // 首先在本地创建目录, 保证空目录也能被保存
err1 := os.MkdirAll(realSavePath, 0777) // 首先在本地创建目录, 保证空目录也能被保存
if err1 != nil {
result.ResultMessage = "创建目录错误"
result.Succeed = false
result.Err = err1
result.NeedRetry = false
return
}
}
// 获取该目录下的文件列表

14
internal/functions/pandownload/utils.go
View File

@ -50,14 +50,18 @@ func SymlinkFileExist(fullPath, rootPath string) bool {
originSaveRootSymlinkFile := localfile.NewSymlinkFile(rootPath)
suffixPath := localfile.GetSuffixPath(fullPath, rootPath)
savePathSymlinkFile, savePathFileInfo, err := localfile.RetrieveRealPathFromLogicSuffixPath(originSaveRootSymlinkFile, suffixPath)
if err != nil {
if err != nil || savePathFileInfo == nil {
return false
} else {
if savePathFileInfo.Size() == 0 {
return false
}
if _, err = os.Stat(savePathSymlinkFile.RealPath + DownloadSuffix); err != nil {
if savePathFileInfo.IsDir() {
return true
} else {
if savePathFileInfo.Size() == 0 {
return false
}
if _, err = os.Stat(savePathSymlinkFile.RealPath + DownloadSuffix); err != nil {
return true
}
}
}
return false