feat: change method to monitor episodes

2026-06-08 11:07:42 +08:00 · 2024-08-02 12:52:54 +08:00
parent 3aeecac4fb
commit 5132714247
14 changed files with 219 additions and 68 deletions
--- a/server/core/resources.go
+++ b/server/core/resources.go
@@ -112,7 +112,7 @@ func (c *Client) DownloadEpisodeTorrent(r1 torznab.Result, seriesId, seasonNum,
 }
 func (c *Client) SearchAndDownload(seriesId, seasonNum, episodeNum int) (*string, error) {

-	res, err := SearchEpisode(c.db, seriesId, seasonNum, episodeNum, true)
+	res, err := SearchTvSeries(c.db, seriesId, seasonNum, []int{episodeNum}, true)
 	if err != nil {
 		return nil, err
 	}
--- a/server/core/scheduler.go
+++ b/server/core/scheduler.go
@@ -11,7 +11,6 @@ import (
 	"polaris/pkg"
 	"polaris/pkg/notifier/message"
 	"polaris/pkg/utils"
-	"time"

 	"github.com/pkg/errors"
 )
@@ -140,7 +139,7 @@ func (c *Client) moveCompletedTask(id int) (err1 error) {
 	c.sendMsg(fmt.Sprintf(message.ProcessingComplete, torrentName))

 	//判断是否需要删除本地文件
-	ok, err := c.isSeedRatioLimitReached(r.IndexerID, torrent) 
+	ok, err := c.isSeedRatioLimitReached(r.IndexerID, torrent)
 	if err != nil {
 		log.Warnf("getting torrent seed ratio %s: %v", torrent.Name(), err)
 		ok = false
@@ -217,15 +216,8 @@ func (c *Client) downloadTvSeries() {
 	for _, series := range allSeries {
 		tvDetail := c.db.GetMediaDetails(series.ID)
 		for _, ep := range tvDetail.Episodes {
-			if !series.DownloadHistoryEpisodes { //设置不下载历史已播出剧集，只下载将来剧集
-				t, err := time.Parse("2006-01-02", ep.AirDate)
-				if err != nil {
-					log.Error("air date not known, skip: %v", ep.Title)
-					continue
-				}
-				if series.CreatedAt.Sub(t) > 24*time.Hour { //剧集在加入watchlist之前，不去下载
-					continue
-				}
+			if !ep.Monitored { //未监控的剧集不去下载
+				continue
 			}

 			if ep.Status != episode.StatusMissing { //已经下载的不去下载
@@ -338,6 +330,7 @@ func (c *Client) checkSeiesNewSeason(media *ent.Media) error {
 					Overview:      ep.Overview,
 					AirDate:       ep.AirDate,
 					Status:        episode.StatusMissing,
+					Monitored:     true,
 				}
 				c.db.SaveEposideDetail2(episode)
 			}
--- a/server/core/torrent.go
+++ b/server/core/torrent.go
@@ -7,6 +7,7 @@ import (
 	"polaris/pkg/metadata"
 	"polaris/pkg/torznab"
 	"polaris/pkg/utils"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -15,30 +16,12 @@ import (
 	"github.com/pkg/errors"
 )

-func SearchSeasonPackage(db1 *db.Client, seriesId, seasonNum int, checkResolution bool) ([]torznab.Result, error) {
-	return SearchEpisode(db1, seriesId, seasonNum, -1, checkResolution)
-}
-
-func isNumberedSeries(detail *db.MediaDetails) bool {
-	hasSeason2 := false
-	season2HasEpisode1 := false
-	for _, ep := range detail.Episodes {
-		if ep.SeasonNumber == 2 {
-			hasSeason2 = true
-			if ep.EpisodeNumber == 1 {
-				season2HasEpisode1 = true
-			}
-
-		}
-	}
-	return hasSeason2 && !season2HasEpisode1 //only one 1st episode
-}
-
-func SearchEpisode(db1 *db.Client, seriesId, seasonNum, episodeNum int, checkResolution bool) ([]torznab.Result, error) {
+func SearchTvSeries(db1 *db.Client, seriesId, seasonNum int, episodes []int, checkResolution bool) ([]torznab.Result, error) {
 	series := db1.GetMediaDetails(seriesId)
 	if series == nil {
 		return nil, fmt.Errorf("no tv series of id %v", seriesId)
 	}
+	slices.Contains(episodes, 1)

 	res := searchWithTorznab(db1, series.NameEn)
 	resCn := searchWithTorznab(db1, series.NameCn)
@@ -56,14 +39,14 @@ func SearchEpisode(db1 *db.Client, seriesId, seasonNum, episodeNum int, checkRes
 				continue
 			}
 		}
-		if isNumberedSeries(series) && episodeNum == -1 {
+		if isNumberedSeries(series) && len(episodes) == 0 {
 			//should not want season
 			continue
 		}

-		if episodeNum != -1 && meta.Episode != episodeNum { //not season pack, episode number equals
+		if len(episodes) > 0 && slices.Contains(episodes, meta.Episode) { //not season pack, episode number equals
 			continue
-		}else if episodeNum == -1 && !meta.IsSeasonPack { //want season pack, but not season pack
+		}else if len(episodes) == 0 && !meta.IsSeasonPack { //want season pack, but not season pack
 			continue
 		}
 		if checkResolution && meta.Resolution != series.Resolution.String() {
@@ -82,6 +65,21 @@ func SearchEpisode(db1 *db.Client, seriesId, seasonNum, episodeNum int, checkRes

 }

+func isNumberedSeries(detail *db.MediaDetails) bool {
+	hasSeason2 := false
+	season2HasEpisode1 := false
+	for _, ep := range detail.Episodes {
+		if ep.SeasonNumber == 2 {
+			hasSeason2 = true
+			if ep.EpisodeNumber == 1 {
+				season2HasEpisode1 = true
+			}
+
+		}
+	}
+	return hasSeason2 && !season2HasEpisode1 //only one 1st episode
+}
+
 func SearchMovie(db1 *db.Client, movieId int, checkResolution bool) ([]torznab.Result, error) {
 	movieDetail := db1.GetMediaDetails(movieId)
 	if movieDetail == nil {
--- a/server/resources.go
+++ b/server/resources.go
@@ -13,7 +13,7 @@ import (

 func (s *Server) searchAndDownloadSeasonPackage(seriesId, seasonNum int) (*string, error) {

-	res, err := core.SearchSeasonPackage(s.db, seriesId, seasonNum, true)
+	res, err := core.SearchTvSeries(s.db, seriesId, seasonNum, nil, true)
 	if err != nil {
 		return nil, err
 	}
@@ -46,13 +46,13 @@ func (s *Server) SearchAvailableTorrents(c *gin.Context) (interface{}, error) {
 		if in.Episode == 0 {
 			//search season package
 			log.Infof("search series season package S%02d", in.Season)
-			res, err = core.SearchSeasonPackage(s.db, in.ID, in.Season, false)
+			res, err = core.SearchTvSeries(s.db, in.ID, in.Season, nil, false)
 			if err != nil {
 				return nil, errors.Wrap(err, "search season package")
 			}
 		} else {
 			log.Infof("search series episode S%02dE%02d", in.Season, in.Episode)
-			res, err = core.SearchEpisode(s.db, in.ID, in.Season, in.Episode, false)
+			res, err = core.SearchTvSeries(s.db, in.ID, in.Season, []int{in.Episode}, false)
 			if err != nil {
 				if err.Error() == "no resource found" {
 					return []string{}, nil
--- a/server/watchlist.go
+++ b/server/watchlist.go
@@ -102,12 +102,29 @@ func (s *Server) AddTv2Watchlist(c *gin.Context) (interface{}, error) {
 			continue
 		}
 		for _, ep := range se.Episodes {
+			shouldMonitor := false
+			//如果设置下载往期剧集，则监控所有剧集。如果没有则监控未上映的剧集，考虑时差等问题留24h余量
+			if in.DownloadHistoryEpisodes {
+				shouldMonitor = true
+			} else {
+				t, err := time.Parse("2006-01-02", ep.AirDate)
+				if err != nil {
+					log.Error("air date not known, will not monitor: %v", ep.AirDate)
+
+				} else {
+					if time.Since(t) < 24*time.Hour { //monitor episode air 24h before now
+						shouldMonitor = true
+					}
+				}
+			}
+
 			epid, err := s.db.SaveEposideDetail(&ent.Episode{
 				SeasonNumber:  seasonId,
 				EpisodeNumber: ep.EpisodeNumber,
 				Title:         ep.Name,
 				Overview:      ep.Overview,
 				AirDate:       ep.AirDate,
+				Monitored:     shouldMonitor,
 			})
 			if err != nil {
 				log.Errorf("save episode info error: %v", err)
@@ -176,6 +193,7 @@ func (s *Server) AddMovie2Watchlist(c *gin.Context) (interface{}, error) {
 		Title:         "dummy episode for movies",
 		Overview:      "dummy episode for movies",
 		AirDate:       detail.ReleaseDate,
+		Monitored:     true,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "add dummy episode")
@@ -249,8 +267,8 @@ func (s *Server) downloadImage(url string, mediaID int, name string) error {

 type MediaWithStatus struct {
 	*ent.Media
-	MonitoredNum  int    `json:"monitored_num"`
-	DownloadedNum int    `json:"downloaded_num"`
+	MonitoredNum  int `json:"monitored_num"`
+	DownloadedNum int `json:"downloaded_num"`
 }

 //missing: episode aired missing
@@ -263,7 +281,7 @@ func (s *Server) GetTvWatchlist(c *gin.Context) (interface{}, error) {
 	res := make([]MediaWithStatus, len(list))
 	for i, item := range list {
 		var ms = MediaWithStatus{
-			Media:      item,
+			Media:         item,
 			MonitoredNum:  0,
 			DownloadedNum: 0,
 		}
@@ -271,30 +289,12 @@ func (s *Server) GetTvWatchlist(c *gin.Context) (interface{}, error) {
 		details := s.db.GetMediaDetails(item.ID)

 		for _, ep := range details.Episodes {
-			monitored := false
-			if ep.SeasonNumber == 0 {
-				continue
-			}
-			if item.DownloadHistoryEpisodes {
-				monitored = true
-			} else {
-				t, err := time.Parse("2006-01-02", ep.AirDate)
-				if err != nil { //airdate not exist, maybe airdate not set yet
-					monitored = true
-				} else {
-					if item.CreatedAt.Sub(t) > 24*time.Hour { //剧集在加入watchlist之前，不去下载
-						continue
-					}
-					monitored = true
-				}
-			}
-			if monitored {
+			if ep.Monitored {
 				ms.MonitoredNum++
-				if ep.Status == episode.StatusDownloaded {
-					ms.DownloadedNum++
-				}
 			}
-
+			if ep.Status == episode.StatusDownloaded {
+				ms.DownloadedNum++
+			}
 		}
 		res[i] = ms
 	}
@@ -306,8 +306,8 @@ func (s *Server) GetMovieWatchlist(c *gin.Context) (interface{}, error) {
 	res := make([]MediaWithStatus, len(list))
 	for i, item := range list {
 		var ms = MediaWithStatus{
-			Media:  item,
-			MonitoredNum: 1,
+			Media:         item,
+			MonitoredNum:  1,
 			DownloadedNum: 0,
 		}
 		dummyEp, err := s.db.GetMovieDummyEpisode(item.ID)