From 2641a5fccd7986a5670ac2e8aec5aa560bb511b4 Mon Sep 17 00:00:00 2001
From: Simon Ding <dingchuan91@gmail.com>
Date: Wed, 23 Apr 2025 11:07:24 +0800
Subject: [PATCH] fix: get episode

---
 engine/integration.go |  3 ++-
 server/activity.go    | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/engine/integration.go b/engine/integration.go
index 20bd517..b655579 100644
--- a/engine/integration.go
+++ b/engine/integration.go
@@ -260,8 +260,9 @@ func (c *Engine) findEpisodeFilesPreMoving(historyId int) error {
 		return err
 	}
 	for _, id := range episodeIds {
-		ep, err := c.db.GetEpisode(his.MediaID, his.SeasonNum, id)
+		ep, err := c.db.GetEpisodeByID(id)
 		if err != nil {
+			log.Warnf("query episode error (%d): %v", id, err)
 			continue
 		}
 		task.WalkFunc()(func(path string, info fs.FileInfo) error {
diff --git a/server/activity.go b/server/activity.go
index caca92e..b1fec78 100644
--- a/server/activity.go
+++ b/server/activity.go
@@ -106,10 +106,10 @@ func (s *Server) RemoveActivity(c *gin.Context) (interface{}, error) {
 	episodeIds := s.core.GetEpisodeIds(his)
 
 	for _, id := range episodeIds {
-		ep, err := s.db.GetEpisode(his.MediaID, his.SeasonNum, id)
+		ep, err := s.db.GetEpisodeByID(id)
 		if err != nil {
-			log.Warnf("get episode error: %v", err)
-			continue	
+			log.Warnf("get episode (%d) error: %v", id, err)
+			continue
 		}
 		if !s.db.IsEpisodeDownloadingOrDownloaded(id) && ep.Status != episode.StatusDownloaded {
 			//没有正在下载中或者下载完成的任务，并且episode状态不是已经下载完成
@@ -127,7 +127,7 @@ func (s *Server) addTorrent2Blacklist(h *ent.History) error {
 
 func (s *Server) GetAllBlacklistItems(c *gin.Context) (interface{}, error) {
 	list, err := s.db.GetTorrentBlacklist()
-	if err!= nil {
+	if err != nil {
 		return nil, errors.Wrap(err, "db")
 	}
 	return list, nil
@@ -138,11 +138,11 @@ func (s *Server) RemoveBlacklistItem(c *gin.Context) (interface{}, error) {
 		return nil, fmt.Errorf("id is empty")
 	}
 	idInt, err := strconv.Atoi(id)
-	if err!= nil {
+	if err != nil {
 		return nil, fmt.Errorf("id is not int: %v", id)
 	}
-	if err := s.db.DeleteTorrentBlacklist(idInt); err!= nil {
-		return nil, errors.Wrap(err, "db")	
+	if err := s.db.DeleteTorrentBlacklist(idInt); err != nil {
+		return nil, errors.Wrap(err, "db")
 	}
 	return nil, nil
 }