Skip to content

Commit 2641a5f

Browse files
committed
fix: get episode
1 parent 98823e2 commit 2641a5f

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

engine/integration.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,9 @@ func (c *Engine) findEpisodeFilesPreMoving(historyId int) error {
260260
return err
261261
}
262262
for _, id := range episodeIds {
263-
ep, err := c.db.GetEpisode(his.MediaID, his.SeasonNum, id)
263+
ep, err := c.db.GetEpisodeByID(id)
264264
if err != nil {
265+
log.Warnf("query episode error (%d): %v", id, err)
265266
continue
266267
}
267268
task.WalkFunc()(func(path string, info fs.FileInfo) error {

server/activity.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
106106
episodeIds := s.core.GetEpisodeIds(his)
107107

108108
for _, id := range episodeIds {
109-
ep, err := s.db.GetEpisode(his.MediaID, his.SeasonNum, id)
109+
ep, err := s.db.GetEpisodeByID(id)
110110
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
113113
}
114114
if !s.db.IsEpisodeDownloadingOrDownloaded(id) && ep.Status != episode.StatusDownloaded {
115115
//没有正在下载中或者下载完成的任务,并且episode状态不是已经下载完成
@@ -127,7 +127,7 @@ func (s *Server) addTorrent2Blacklist(h *ent.History) error {
127127

128128
func (s *Server) GetAllBlacklistItems(c *gin.Context) (interface{}, error) {
129129
list, err := s.db.GetTorrentBlacklist()
130-
if err!= nil {
130+
if err != nil {
131131
return nil, errors.Wrap(err, "db")
132132
}
133133
return list, nil
@@ -138,11 +138,11 @@ func (s *Server) RemoveBlacklistItem(c *gin.Context) (interface{}, error) {
138138
return nil, fmt.Errorf("id is empty")
139139
}
140140
idInt, err := strconv.Atoi(id)
141-
if err!= nil {
141+
if err != nil {
142142
return nil, fmt.Errorf("id is not int: %v", id)
143143
}
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")
146146
}
147147
return nil, nil
148148
}

0 commit comments

Comments
 (0)