@@ -106,10 +106,10 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
106
106
episodeIds := s .core .GetEpisodeIds (his )
107
107
108
108
for _ , id := range episodeIds {
109
- ep , err := s .db .GetEpisode ( his . MediaID , his . SeasonNum , id )
109
+ ep , err := s .db .GetEpisodeByID ( id )
110
110
if err != nil {
111
- log .Warnf ("get episode error: %v" , err )
112
- continue
111
+ log .Warnf ("get episode (%d) error: %v" , id , err )
112
+ continue
113
113
}
114
114
if ! s .db .IsEpisodeDownloadingOrDownloaded (id ) && ep .Status != episode .StatusDownloaded {
115
115
//没有正在下载中或者下载完成的任务,并且episode状态不是已经下载完成
@@ -127,7 +127,7 @@ func (s *Server) addTorrent2Blacklist(h *ent.History) error {
127
127
128
128
func (s * Server ) GetAllBlacklistItems (c * gin.Context ) (interface {}, error ) {
129
129
list , err := s .db .GetTorrentBlacklist ()
130
- if err != nil {
130
+ if err != nil {
131
131
return nil , errors .Wrap (err , "db" )
132
132
}
133
133
return list , nil
@@ -138,11 +138,11 @@ func (s *Server) RemoveBlacklistItem(c *gin.Context) (interface{}, error) {
138
138
return nil , fmt .Errorf ("id is empty" )
139
139
}
140
140
idInt , err := strconv .Atoi (id )
141
- if err != nil {
141
+ if err != nil {
142
142
return nil , fmt .Errorf ("id is not int: %v" , id )
143
143
}
144
- if err := s .db .DeleteTorrentBlacklist (idInt ); err != nil {
145
- return nil , errors .Wrap (err , "db" )
144
+ if err := s .db .DeleteTorrentBlacklist (idInt ); err != nil {
145
+ return nil , errors .Wrap (err , "db" )
146
146
}
147
147
return nil , nil
148
148
}
0 commit comments