fix media organize and subscription workflows

2026-10-10 23:36:37 +08:00 · 2026-06-30 20:18:02 +08:00
parent b41f62d572
commit 941bb273b9
107 changed files with 5420 additions and 526 deletions
@@ -78,6 +78,8 @@ func TestSubscriptionRunOneRSSWashQueuesOnlyBestMovieVariant(t *testing.T) {
 		FeedURL:      rss.URL,
 		Filter:       "Dune 2021",
 		MediaType:    "movie",
+		Resolution:   "2160p",
+		Quality:      "remux",
 		WashEnabled:  true,
 		WashPriority: "resolution",
 		SavePath:     "/downloads/movies",
@@ -100,29 +102,52 @@ func TestSubscriptionRunOneRSSWashQueuesOnlyBestMovieVariant(t *testing.T) {
 	}
 }

-func TestSubscriptionRunOneDoesNotUseDeletedDownloader(t *testing.T) {
+func TestSubscriptionRunOneRSSDefaultQueuesOnlyBestEpisodeVariant(t *testing.T) {
 	rss := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/rss+xml")
 		_, _ = w.Write([]byte(`<?xml version="1.0"?>
 <rss><channel>
  <item>
-    <title>Deleted Downloader Show S01E01 1080p</title>
-    <guid>deleted-downloader-episode-1</guid>
-    <link>magnet:?xt=urn:btih:cccccccccccccccccccccccccccccccccccccccc&amp;dn=Deleted+Downloader+Show+S01E01</link>
+    <title>House of the Dragon S03E01 2160p BluRay H264 AAC</title>
+    <guid>hotd-e01-bluray</guid>
+    <link>magnet:?xt=urn:btih:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&amp;dn=House+of+the+Dragon+S03E01+2160p+BluRay</link>
+  </item>
+  <item>
+    <title>House of the Dragon S03E01 1080p WEB-DL H264 AAC</title>
+    <guid>hotd-e01-webdl</guid>
+    <link>magnet:?xt=urn:btih:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb&amp;dn=House+of+the+Dragon+S03E01+1080p+WEB-DL</link>
+  </item>
+  <item>
+    <title>House of the Dragon S03E01 720p HDTV H264 AAC</title>
+    <guid>hotd-e01-hdtv</guid>
+    <link>magnet:?xt=urn:btih:cccccccccccccccccccccccccccccccccccccccc&amp;dn=House+of+the+Dragon+S03E01+720p+HDTV</link>
  </item>
 </channel></rss>`))
 	}))
 	defer rss.Close()

-	var qbCalls int32
+	var addCalls int32
+	var addedURLs []string
+	addedHashes := make([]string, 0, 3)
 	qb := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		atomic.AddInt32(&qbCalls, 1)
 		switch r.URL.Path {
 		case "/api/v2/auth/login":
 			_, _ = w.Write([]byte("Ok."))
 		case "/api/v2/torrents/info":
-			_, _ = w.Write([]byte(`[]`))
+			if len(addedHashes) == 0 {
+				_, _ = w.Write([]byte(`[]`))
+				return
+			}
+			var items []string
+			for _, hash := range addedHashes {
+				items = append(items, `{"hash":"`+hash+`","name":"House of the Dragon S03E01","state":"downloading","progress":0.1}`)
+			}
+			_, _ = w.Write([]byte(`[` + strings.Join(items, ",") + `]`))
 		case "/api/v2/torrents/add":
+			call := atomic.AddInt32(&addCalls, 1)
+			_ = r.ParseMultipartForm(10 << 20)
+			addedURLs = append(addedURLs, r.FormValue("urls"))
+			addedHashes = append(addedHashes, strings.Repeat(fmt.Sprintf("%x", call), 40))
 			_, _ = w.Write([]byte("Ok."))
 		default:
 			http.NotFound(w, r)
@@ -132,45 +157,111 @@ func TestSubscriptionRunOneDoesNotUseDeletedDownloader(t *testing.T) {

 	db := newServiceTestDB(t, &model.Subscription{}, &model.Setting{}, &model.DownloadTask{}, &model.Media{}, &model.DownloadClient{})
 	repos := repository.New(db)
-	client := &model.DownloadClient{Name: "qB deleted", Type: "qbittorrent", Host: qb.URL, Username: "admin", Password: "admin", IsDefault: true, Enabled: true}
-	if err := repos.DownloadClient.Create(t.Context(), client); err != nil {
-		t.Fatal(err)
-	}
-	if err := repos.Setting.Set(t.Context(), settingDownloadClientsManaged, "true"); err != nil {
-		t.Fatal(err)
-	}
-	if err := repos.DownloadClient.Delete(t.Context(), client.ID); err != nil {
-		t.Fatal(err)
-	}
-
+	configureTestDefaultQB(t, repos, qb.URL)
 	downloads := NewDownloadService(zap.NewNop(), repos, NewHub(zap.NewNop()), nil)
 	svc := NewSubscriptionService(nil, zap.NewNop(), repos, downloads, nil, NewHub(zap.NewNop()))
+
 	sub := &model.Subscription{
-		Name:      "Deleted Downloader Show 自动订阅",
+		Name:      "House of the Dragon 自动订阅",
 		FeedURL:   rss.URL,
-		Filter:    "Deleted Downloader Show",
+		Filter:    "House of the Dragon",
 		MediaType: "tv",
 		SavePath:  "/downloads/tv",
 	}
 	if err := repos.Subscription.Create(t.Context(), sub); err != nil {
 		t.Fatal(err)
 	}
-
 	queued, err := svc.runOne(t.Context(), sub)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if queued != 0 {
-		t.Fatalf("queued = %d, want 0 when default downloader was deleted", queued)
+	if queued != 1 {
+		t.Fatalf("queued = %d, want one best episode variant", queued)
 	}
-	if got := atomic.LoadInt32(&qbCalls); got != 0 {
-		t.Fatalf("qB calls = %d, want 0 after downloader deletion", got)
+	if got := atomic.LoadInt32(&addCalls); got != 1 {
+		t.Fatalf("qb add calls = %d, want 1", got)
 	}
-	rows, err := repos.Download.List(t.Context())
+	if len(addedURLs) != 1 || !strings.Contains(addedURLs[0], "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb") {
+		t.Fatalf("added %#v, want 1080p WEB-DL variant only", addedURLs)
+	}
+}
+
+func TestSubscriptionRunOneRSSCustomExcludeStillSkipsIncompatibleVariants(t *testing.T) {
+	rss := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "application/rss+xml")
+		_, _ = w.Write([]byte(`<?xml version="1.0"?>
+<rss><channel>
+  <item>
+    <title>House of the Dragon S03E01 2160p WEB-DL HEVC 10bit DoVi Atmos</title>
+    <guid>hotd-e01-dovi</guid>
+    <link>magnet:?xt=urn:btih:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa&amp;dn=House+of+the+Dragon+S03E01+2160p+DoVi</link>
+  </item>
+  <item>
+    <title>House of the Dragon S03E01 1080p WEB-DL H264 AAC</title>
+    <guid>hotd-e01-webdl</guid>
+    <link>magnet:?xt=urn:btih:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb&amp;dn=House+of+the+Dragon+S03E01+1080p+WEB-DL</link>
+  </item>
+</channel></rss>`))
+	}))
+	defer rss.Close()
+
+	var addCalls int32
+	var addedURLs []string
+	addedHashes := make([]string, 0, 2)
+	qb := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case "/api/v2/auth/login":
+			_, _ = w.Write([]byte("Ok."))
+		case "/api/v2/torrents/info":
+			if len(addedHashes) == 0 {
+				_, _ = w.Write([]byte(`[]`))
+				return
+			}
+			var items []string
+			for _, hash := range addedHashes {
+				items = append(items, `{"hash":"`+hash+`","name":"House of the Dragon S03E01","state":"downloading","progress":0.1}`)
+			}
+			_, _ = w.Write([]byte(`[` + strings.Join(items, ",") + `]`))
+		case "/api/v2/torrents/add":
+			call := atomic.AddInt32(&addCalls, 1)
+			_ = r.ParseMultipartForm(10 << 20)
+			addedURLs = append(addedURLs, r.FormValue("urls"))
+			addedHashes = append(addedHashes, strings.Repeat(fmt.Sprintf("%x", call), 40))
+			_, _ = w.Write([]byte("Ok."))
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer qb.Close()
+
+	db := newServiceTestDB(t, &model.Subscription{}, &model.Setting{}, &model.DownloadTask{}, &model.Media{}, &model.DownloadClient{})
+	repos := repository.New(db)
+	configureTestDefaultQB(t, repos, qb.URL)
+	downloads := NewDownloadService(zap.NewNop(), repos, NewHub(zap.NewNop()), nil)
+	svc := NewSubscriptionService(nil, zap.NewNop(), repos, downloads, nil, NewHub(zap.NewNop()))
+
+	sub := &model.Subscription{
+		Name:         "House of the Dragon 自动订阅",
+		FeedURL:      rss.URL,
+		Filter:       "House of the Dragon",
+		MediaType:    "tv",
+		SavePath:     "/downloads/tv",
+		ExcludeWords: "官中,无字幕",
+	}
+	if err := repos.Subscription.Create(t.Context(), sub); err != nil {
+		t.Fatal(err)
+	}
+	queued, err := svc.runOne(t.Context(), sub)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(rows) != 0 {
-		t.Fatalf("download rows = %d, want 0", len(rows))
+	if queued != 1 {
+		t.Fatalf("queued = %d, want one compatible WEB-DL variant", queued)
+	}
+	if got := atomic.LoadInt32(&addCalls); got != 1 {
+		t.Fatalf("qb add calls = %d, want 1", got)
+	}
+	if len(addedURLs) != 1 || !strings.Contains(addedURLs[0], "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb") {
+		t.Fatalf("added %#v, want compatible 1080p WEB-DL only", addedURLs)
 	}
 }