diff --git a/assets b/assets index 0720c1a..93d616e 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 0720c1a80069c6a0c14fce93efbc03417f249a67 +Subproject commit 93d616e742d95ed666938d59200b872e98005527 diff --git a/pkg/filemanager/workflows/remote_download.go b/pkg/filemanager/workflows/remote_download.go index 7b06178..e884391 100644 --- a/pkg/filemanager/workflows/remote_download.go +++ b/pkg/filemanager/workflows/remote_download.go @@ -319,7 +319,7 @@ func (m *RemoteDownloadTask) slaveTransfer(ctx context.Context, dep dependency.D } dst := dstUri.JoinRaw(f.Name) - src := filepath.FromSlash(path.Join(m.state.Status.SavePath, f.Name)) + src := path.Join(m.state.Status.SavePath, f.Name) payload.Files = append(payload.Files, SlaveUploadEntity{ Src: src, Uri: dst, diff --git a/pkg/filemanager/workflows/upload.go b/pkg/filemanager/workflows/upload.go index 0184178..65b36ee 100644 --- a/pkg/filemanager/workflows/upload.go +++ b/pkg/filemanager/workflows/upload.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "os" + "path" "path/filepath" "sync" "sync/atomic" @@ -127,11 +128,11 @@ func (t *SlaveUploadTask) Do(ctx context.Context) (task.Status, error) { t.progress[progressKey] = &queue.Progress{Identifier: file.Uri.String(), Total: file.Size} t.Unlock() - handle, err := os.Open(file.Src) + handle, err := os.Open(filepath.FromSlash(file.Src)) if err != nil { t.l.Warning("Failed to open file %s: %s", file.Src, err.Error()) atomic.AddInt64(&t.progress[ProgressTypeUpload].Current, file.Size) - ae.Add(filepath.Base(file.Src), fmt.Errorf("failed to open file: %w", err)) + ae.Add(path.Base(file.Src), fmt.Errorf("failed to open file: %w", err)) return } @@ -140,7 +141,7 @@ func (t *SlaveUploadTask) Do(ctx context.Context) (task.Status, error) { t.l.Warning("Failed to get file stat for %s: %s", file.Src, err.Error()) handle.Close() atomic.AddInt64(&t.progress[ProgressTypeUpload].Current, file.Size) - ae.Add(filepath.Base(file.Src), fmt.Errorf("failed to get file stat: %w", err)) + ae.Add(path.Base(file.Src), fmt.Errorf("failed to get file stat: %w", err)) return } @@ -163,7 +164,7 @@ func (t *SlaveUploadTask) Do(ctx context.Context) (task.Status, error) { handle.Close() t.l.Warning("Failed to upload file %s: %s", file.Src, err.Error()) atomic.AddInt64(&t.progress[ProgressTypeUpload].Current, file.Size) - ae.Add(filepath.Base(file.Src), fmt.Errorf("failed to upload file: %w", err)) + ae.Add(path.Base(file.Src), fmt.Errorf("failed to upload file: %w", err)) return }