feat: improve support for pt

server/core/torrent.go

@@ -77,7 +77,7 @@ func SearchEpisode(db1 *db.Client, seriesId, seasonNum, episodeNum int, checkRes
 	if len(filtered) == 0 {
 		return nil, errors.New("no resource found")
 	}
-
+	filtered = dedup(filtered)
 	return filtered, nil
 
 }
@@ -117,6 +117,7 @@ func SearchMovie(db1 *db.Client, movieId int, checkResolution bool) ([]torznab.R
 	if len(filtered) == 0 {
 		return nil, errors.New("no resource found")
 	}
+	filtered = dedup(filtered)
 
 	return filtered, nil
 
@@ -134,7 +135,7 @@ func searchWithTorznab(db *db.Client, q string) []torznab.Result {
 		go func() {
 			log.Debugf("search torznab %v with %v", tor.Name, q)
 			defer wg.Done()
-			resp, err := torznab.Search(tor.URL, tor.ApiKey, q)
+			resp, err := torznab.Search(tor, tor.ApiKey, q)
 			if err != nil {
 				log.Errorf("search %s error: %v", tor.Name, err)
 				return
@@ -152,11 +153,54 @@ func searchWithTorznab(db *db.Client, q string) []torznab.Result {
 		res = append(res, result...)
 	}
 
-	sort.Slice(res, func(i, j int) bool {
+	//res = dedup(res)
+
+	sort.SliceStable(res, func(i, j int) bool { //先按做种人数排序
 		var s1 = res[i]
 		var s2 = res[j]
 		return s1.Seeders > s2.Seeders
 	})
 
+	sort.SliceStable(res, func(i, j int) bool { //再按优先级排序，优先级高的种子排前面
+		var s1 = res[i]
+		var s2 = res[j]
+		return s1.Priority > s2.Priority
+	})
+
+	//pt资源中，同一indexer内部，优先下载free的资源
+	sort.SliceStable(res, func(i, j int) bool {
+		var s1 = res[i]
+		var s2 = res[j]
+		if s1.IndexerId == s2.IndexerId && s1.IsPrivate { 
+			return s1.DownloadVolumeFactor < s2.DownloadVolumeFactor
+		}
+		return false
+	})
+
+	//同一indexer内部，如果下载消耗一样，则优先下载上传奖励较多的
+	sort.SliceStable(res, func(i, j int) bool { 
+		var s1 = res[i]
+		var s2 = res[j]
+		if s1.IndexerId == s2.IndexerId && s1.IsPrivate && s1.DownloadVolumeFactor == s2.DownloadVolumeFactor{ 
+			return s1.UploadVolumeFactor > s2.UploadVolumeFactor
+		}
+		return false
+	})
+
 	return res
 }
+
+
+func dedup(list []torznab.Result) []torznab.Result {
+	var res = make([]torznab.Result, 0, len(list))
+	seen := make(map[string]bool, 0)
+	for _, r := range list {
+		key := fmt.Sprintf("%s%s%d%d", r.Name, r.Source, r.Seeders,r.Peers)
+		if seen[key] {
+			continue
+		}
+		seen[key] = true
+		res = append(res, r)
+	}
+	return res
+}

server/resources.go

@@ -62,6 +62,7 @@ func (s *Server) downloadSeasonPackage(r1 torznab.Result, seriesId, seasonNum in
 		Size:             r1.Size,
 		Saved:            torrent.Save(),
 		DownloadClientID: dlClient.ID,
+		IndexerID:        r1.IndexerId,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "save record")
@@ -110,6 +111,7 @@ func (s *Server) downloadEpisodeTorrent(r1 torznab.Result, seriesId, seasonNum,
 		Size:             r1.Size,
 		Saved:            torrent.Save(),
 		DownloadClientID: dlc.ID,
+		IndexerID:        r1.IndexerId,
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "save record")
@@ -165,7 +167,7 @@ func (s *Server) SearchAvailableTorrents(c *gin.Context) (interface{}, error) {
 			res, err = core.SearchEpisode(s.db, in.ID, in.Season, in.Episode, false)
 			if err != nil {
 				if err.Error() == "no resource found" {
-					return []TorznabSearchResult{}, nil
+					return gin.H{}, nil
 				}
 				return nil, errors.Wrap(err, "search episode")
 			}
@@ -176,22 +178,12 @@ func (s *Server) SearchAvailableTorrents(c *gin.Context) (interface{}, error) {
 		res, err = core.SearchMovie(s.db, in.ID, false)
 		if err != nil {
 			if err.Error() == "no resource found" {
-				return []TorznabSearchResult{}, nil
+				return gin.H{}, nil
 			}
 			return nil, err
 		}
 	}
-	var searchResults []TorznabSearchResult
-	for _, r := range res {
-		searchResults = append(searchResults, TorznabSearchResult{
-			Name:    r.Name,
-			Size:    r.Size,
-			Seeders: r.Seeders,
-			Peers:   r.Peers,
-			Link:    r.Link,
-		})
-	}
-	return searchResults, nil
+	return res, nil
 }
 
 func (s *Server) SearchTvAndDownload(c *gin.Context) (interface{}, error) {
@@ -223,19 +215,11 @@ func (s *Server) SearchTvAndDownload(c *gin.Context) (interface{}, error) {
 	}, nil
 }
 
-type TorznabSearchResult struct {
-	Name    string `json:"name"`
-	Size    int    `json:"size"`
-	Link    string `json:"link"`
-	Seeders int    `json:"seeders"`
-	Peers   int    `json:"peers"`
-	Source  string `json:"source"`
-}
 type downloadTorrentIn struct {
 	MediaID int `json:"id" binding:"required"`
 	Season  int `json:"season"`
 	Episode int `json:"episode"`
-	TorznabSearchResult
+	torznab.Result
 }
 
 func (s *Server) DownloadTorrent(c *gin.Context) (interface{}, error) {
@@ -263,7 +247,7 @@ func (s *Server) DownloadTorrent(c *gin.Context) (interface{}, error) {
 		if name == "" {
 			name = fmt.Sprintf("%v S%02dE%02d", m.OriginalName, in.Season, in.Episode)
 		}
-		res := torznab.Result{Name: name, Link: in.Link, Size: in.Size}
+		res := torznab.Result{Name: name, Link: in.Link, Size: in.Size, IndexerId: in.IndexerId}
 		return s.downloadEpisodeTorrent(res, in.MediaID, in.Season, in.Episode)
 	} else {
 		//movie
@@ -292,6 +276,7 @@ func (s *Server) DownloadTorrent(c *gin.Context) (interface{}, error) {
 				Size:             in.Size,
 				Saved:            torrent.Save(),
 				DownloadClientID: dlc.ID,
+				IndexerID:        in.IndexerId,
 			})
 			if err != nil {
 				log.Errorf("save history error: %v", err)