Browse Source

当 Emby 启动时,如果获取到的任务已经被播放过了(且优先级 > 3),那么跳过

Signed-off-by: allan716 <[email protected]>
allan716 3 năm trước cách đây
mục cha
commit
723c6b8d10

+ 17 - 18
internal/logic/emby_helper/embyhelper_test.go

@@ -1,18 +1,13 @@
 package emby_helper
 
 import (
-	embyHelper "github.com/allanpk716/ChineseSubFinder/internal/pkg/emby_api"
-	"github.com/allanpk716/ChineseSubFinder/internal/pkg/log_helper"
 	"github.com/allanpk716/ChineseSubFinder/internal/pkg/settings"
-	"github.com/sirupsen/logrus"
-	"sync"
 	"testing"
-	"time"
 )
 
 var ec = settings.EmbySettings{
-	AddressUrl:            "http://192.168.50.252:xxx",
-	APIKey:                "xxx",
+	AddressUrl:            "http://192.168.50.252:8096",
+	APIKey:                "xxxxx",
 	MaxRequestVideoNumber: 100,
 	MoviePathsMapping: map[string]string{
 		"X:\\电影": "/mnt/share1/电影",
@@ -102,17 +97,21 @@ func TestEmbyHelper_GetPlayedItemsSubtitle(t *testing.T) {
 	//}
 }
 
-func TestEmbyHelper_GetRecentlyAddVideoList1(t *testing.T) {
-
-}
-
 func TestEmbyHelper_IsVideoPlayed(t *testing.T) {
 
-	em := NewEmbyHelper(log_helper.GetLogger4Tester(), *ec)
-	moviePhyFPathMap, seriesPhyFPathMap, err := em.GetPlayedItemsSubtitle()
-	if err != nil {
-		t.Fatal(err)
-	}
-	played, err := ec.IsVideoPlayed(tt.args.videoID)
-
+	////// 95813 -- 命运夜
+	////// 96564 -- The Bad Batch - S01E11
+	////// 108766 -- R&M - S05E06
+	////// 145499 -- R&M - S05E10
+	//tmpSettings := settings.NewSettings()
+	//tmpSettings.EmbySettings = &ec
+	//em := NewEmbyHelper(log_helper.GetLogger4Tester(), tmpSettings)
+	//played, err := em.IsVideoPlayed("145499")
+	//if err != nil {
+	//	t.Fatal(err)
+	//}
+	//
+	//if played == false {
+	//	t.Fatal("need played")
+	//}
 }

+ 2 - 1
internal/pkg/downloader/downloader.go

@@ -190,7 +190,8 @@ func (d *Downloader) QueueDownloader() {
 		return
 	}
 
-	if isPlayed == true {
+	// 如果已经播放过 且 这个任务的优先级 > 3 ,不是很急的那种,说明是可以设置忽略继续下载的
+	if isPlayed == true && oneJob.TaskPriority > task_queue.HighTaskPriorityLevel {
 		// 播放过了,那么就标记 ignore
 		oneJob.JobStatus = taskQueue2.Ignore
 		bok, err = d.downloadQueue.Update(oneJob)