From 5ddac22d10af8349d30b7eb094f56658fb7c0124 Mon Sep 17 00:00:00 2001 From: Simon Ding Date: Fri, 12 Jul 2024 16:28:46 +0800 Subject: [PATCH] fix: nil --- pkg/doc.go | 2 +- pkg/transmission/transmission.go | 4 ++-- server/activity.go | 2 +- server/scheduler.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/doc.go b/pkg/doc.go index bc35cfc..46968b8 100644 --- a/pkg/doc.go +++ b/pkg/doc.go @@ -5,7 +5,7 @@ type Torrent interface { Progress() int Stop() error Start() error - Remove(deleteData bool) error + Remove() error Save() string Exists() bool } diff --git a/pkg/transmission/transmission.go b/pkg/transmission/transmission.go index 4e77860..4d639fa 100644 --- a/pkg/transmission/transmission.go +++ b/pkg/transmission/transmission.go @@ -106,10 +106,10 @@ func (t *Torrent) Start() error { return t.c.TorrentStartIDs(context.TODO(), []int64{t.ID}) } -func (t *Torrent) Remove(deleteData bool) error { +func (t *Torrent) Remove() error { return t.c.TorrentRemove(context.TODO(), transmissionrpc.TorrentRemovePayload{ IDs: []int64{t.ID}, - DeleteLocalData: deleteData, + DeleteLocalData: true, }) } diff --git a/server/activity.go b/server/activity.go index 8f86405..44b059d 100644 --- a/server/activity.go +++ b/server/activity.go @@ -27,7 +27,7 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) { } torrent := s.tasks[his.ID] if torrent != nil { - if err := torrent.Remove(true); err != nil { + if err := torrent.Remove(); err != nil { return nil, errors.Wrap(err, "remove torrent") } delete(s.tasks, his.ID) diff --git a/server/scheduler.go b/server/scheduler.go index e904439..c119653 100644 --- a/server/scheduler.go +++ b/server/scheduler.go @@ -43,8 +43,7 @@ func (s *Server) moveCompletedTask(id int) error { torrent := s.tasks[id] r := s.db.GetHistory(id) s.db.SetHistoryComplete(r.ID) - tt := s.tasks[r.ID] - tt.Remove(false) + delete(s.tasks, r.ID) series := s.db.GetSeriesDetails(r.SeriesID) @@ -67,5 +66,6 @@ func (s *Server) moveCompletedTask(id int) error { } log.Infof("move downloaded files to target dir success, file: %v, target dir: %v", torrent.Name(), r.TargetDir) + torrent.Remove() return nil }