From 0c80fca74ea0cef62fa512e37318a5e524e15a22 Mon Sep 17 00:00:00 2001 From: xiaoyaofenfen <1254525673@qq.com> Date: Fri, 26 Aug 2022 17:35:20 +0800 Subject: [PATCH] fix download save dir error --- internal/command/share.go | 4 ++-- internal/functions/pandownload/download_task_unit.go | 2 +- internal/syncdrive/file_action_task.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/command/share.go b/internal/command/share.go index 7fdb22f..8d27142 100644 --- a/internal/command/share.go +++ b/internal/command/share.go @@ -24,7 +24,7 @@ import ( "github.com/tickstep/library-go/logger" "github.com/urfave/cli" "os" - "path" + "path/filepath" "strconv" "time" ) @@ -385,7 +385,7 @@ func RunShareExport(option, saveFilePath string) { } func ExportCsv(savePath string, data [][]string) bool { - folder := path.Dir(savePath) + folder := filepath.Dir(savePath) if _, err := os.Stat(folder); err != nil { if !os.IsExist(err) { os.MkdirAll(folder, os.ModePerm) diff --git a/internal/functions/pandownload/download_task_unit.go b/internal/functions/pandownload/download_task_unit.go index 3350711..7b1cbbd 100644 --- a/internal/functions/pandownload/download_task_unit.go +++ b/internal/functions/pandownload/download_task_unit.go @@ -128,7 +128,7 @@ func (dtu *DownloadTaskUnit) download() (err error) { if err != nil && !os.IsExist(err) { // 本地保存目录不存在,需要创建对应的保存目录 realSaveDirPath := saveDirPathSymlinkFile.RealPath - suffixPath = localfile.GetSuffixPath(path.Dir(dtu.SavePath), saveDirPathSymlinkFile.LogicPath) // 获取后缀不存在的路径 + suffixPath = localfile.GetSuffixPath(filepath.Dir(dtu.SavePath), saveDirPathSymlinkFile.LogicPath) // 获取后缀不存在的路径 if suffixPath != "" { realSaveDirPath = filepath.Join(realSaveDirPath, suffixPath) // 拼接 } diff --git a/internal/syncdrive/file_action_task.go b/internal/syncdrive/file_action_task.go index 1f3b09c..57c2e9a 100644 --- a/internal/syncdrive/file_action_task.go +++ b/internal/syncdrive/file_action_task.go @@ -231,7 +231,7 @@ func (f *FileActionTask) downloadFile(ctx context.Context) error { f.syncFileDb.Update(f.syncItem) return fmt.Errorf("文件非法,无法下载") } - localDir := path.Dir(f.syncItem.getLocalFileFullPath()) + localDir := filepath.Dir(f.syncItem.getLocalFileFullPath()) if b, e := utils.PathExists(localDir); e == nil && !b { f.localFolderCreateMutex.Lock() os.MkdirAll(localDir, 0755) @@ -406,7 +406,7 @@ func (f *FileActionTask) uploadFile(ctx context.Context) error { } // 创建文件夹 - panDirPath := path.Dir(targetPanFilePath) + panDirPath := filepath.Dir(targetPanFilePath) panDirFileId := "" if panDirItem, er := f.panFileDb.Get(panDirPath); er == nil { if panDirItem != nil && panDirItem.IsFolder() {