From e7680f2e929bb2eb097df85edba0e908d5563891 Mon Sep 17 00:00:00 2001 From: Simon Ding Date: Mon, 15 Jul 2024 11:53:54 +0800 Subject: [PATCH] fix --- pkg/storage/webdav.go | 4 ++-- server/scheduler.go | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/storage/webdav.go b/pkg/storage/webdav.go index 95cbd28..bd5b19a 100644 --- a/pkg/storage/webdav.go +++ b/pkg/storage/webdav.go @@ -32,8 +32,8 @@ func (w *WebdavStorage) Move(local, remote string) error { baseLocal := filepath.Base(local) remoteBase := filepath.Join(w.dir,remote, baseLocal) - log.Infof("remove all content in %s", remoteBase) - w.fs.RemoveAll(remoteBase) + //log.Infof("remove all content in %s", remoteBase) + //w.fs.RemoveAll(remoteBase) err := filepath.Walk(local, func(path string, info fs.FileInfo, err error) error { if err != nil { return errors.Wrapf(err, "read file %v", path) diff --git a/server/scheduler.go b/server/scheduler.go index e1a5c59..be35edd 100644 --- a/server/scheduler.go +++ b/server/scheduler.go @@ -51,7 +51,7 @@ func (s *Server) moveCompletedTask(id int) (err error) { torrent := s.tasks[id] r := s.db.GetHistory(id) if r.Status == history.StatusUploading { - log.Infof("task %d is laready uploading, skip", id) + log.Infof("task %d is already uploading, skip", id) return nil } s.db.SetHistoryStatus(r.ID, history.StatusUploading) @@ -60,6 +60,8 @@ func (s *Server) moveCompletedTask(id int) (err error) { if err != nil { s.db.SetHistoryStatus(r.ID, history.StatusFail) } else { + torrent.Remove() + delete(s.tasks, r.ID) s.db.SetHistoryStatus(r.ID, history.StatusSuccess) } }() @@ -93,9 +95,6 @@ func (s *Server) moveCompletedTask(id int) (err error) { } log.Infof("move downloaded files to target dir success, file: %v, target dir: %v", torrent.Name(), r.TargetDir) - torrent.Remove() - delete(s.tasks, r.ID) - s.db.SetHistoryStatus(r.ID, history.StatusSuccess) return nil }