Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
simon-ding committed Jul 15, 2024
1 parent 7a19521 commit e7680f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/storage/webdav.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions server/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
}()
Expand Down Expand Up @@ -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
}

Expand Down

0 comments on commit e7680f2

Please sign in to comment.