优化

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/ulikunitz/xz v0.5.12
 	go.uber.org/zap v1.27.0
 	golang.org/x/crypto v0.49.0
+	golang.org/x/image v0.37.0
 	golang.org/x/sys v0.42.0
 	golang.org/x/time v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -86,7 +87,6 @@ require (
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/arch v0.25.0 // indirect
 	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
-	golang.org/x/image v0.37.0 // indirect
 	golang.org/x/net v0.52.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/text v0.35.0 // indirect

internal/handler/playback_extra_test.go

@@ -1,7 +1,9 @@
 package handler
 
 import (
+	"context"
 	"encoding/json"
+	"errors"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -359,6 +361,7 @@ func newPlaybackScopeTestRouter(t *testing.T) (*gin.Engine, *service.Container,
 		Auth:        auth,
 		Media:       service.NewMediaService(cfg, log, repos),
 		Stream:      service.NewStreamService(cfg, log, repos, nil),
+		Subtitle:    service.NewSubtitleService(cfg, log, repos),
 		Permissions: permissions,
 	}
 	if err := repos.User.Create(t.Context(), &model.User{
@@ -440,6 +443,38 @@ func TestPlaybackInfoForSTRMMediaIncludesHLS(t *testing.T) {
 	}
 }
 
+func TestSubtitleListOnlyProbesEmbeddedTracksForHLS(t *testing.T) {
+	router, svc, secret := newPlaybackScopeTestRouter(t)
+	loginToken := signedTestToken(t, secret)
+	resolveCalls := 0
+	svc.Subtitle.SetStrmPlayTargetResolver(func(context.Context, string) (*service.StrmPlayResult, error) {
+		resolveCalls++
+		return nil, errors.New("probe resolver called")
+	})
+
+	request := func(path string) *httptest.ResponseRecorder {
+		req := httptest.NewRequest(http.MethodGet, "http://nas.local"+path, nil)
+		req.Header.Set("Authorization", "Bearer "+loginToken)
+		w := httptest.NewRecorder()
+		router.ServeHTTP(w, req)
+		return w
+	}
+
+	if w := request("/api/media/media-1/subtitles"); w.Code != http.StatusOK {
+		t.Fatalf("direct subtitle status = %d body=%s", w.Code, w.Body.String())
+	}
+	if resolveCalls != 0 {
+		t.Fatalf("direct subtitle request resolved cloud media %d times, want 0", resolveCalls)
+	}
+
+	if w := request("/api/media/media-1/subtitles?include_embedded=true"); w.Code != http.StatusOK {
+		t.Fatalf("HLS subtitle status = %d body=%s", w.Code, w.Body.String())
+	}
+	if resolveCalls != 1 {
+		t.Fatalf("HLS subtitle request resolved cloud media %d times, want 1", resolveCalls)
+	}
+}
+
 func TestHLSPlaylistForRemoteEmbyMediaDisabled(t *testing.T) {
 	router, svc, secret := newPlaybackScopeTestRouter(t)
 	svc.EmbyRemote = &service.EmbyRemoteService{}

internal/handler/subtitles.go

@@ -16,7 +16,13 @@ func listSubtitlesHandler(svc *service.Container) gin.HandlerFunc {
 			c.JSON(http.StatusOK, gin.H{"tracks": []service.SubtitleTrack{}})
 			return
 		}
-		tracks, err := svc.Subtitle.Discover(c.Request.Context(), id)
+		var tracks []service.SubtitleTrack
+		var err error
+		if c.Query("include_embedded") == "true" {
+			tracks, err = svc.Subtitle.Discover(c.Request.Context(), id)
+		} else {
+			tracks, err = svc.Subtitle.DiscoverExternalOnly(c.Request.Context(), id)
+		}
 		if err != nil {
 			c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
 			return

internal/service/adult_image_crop.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/metatube-community/metatube-sdk-go/detector"
+	_ "golang.org/x/image/webp" // register WebP decoder for AVE covers
 )
 
 const adultPosterRatio = 2.0 / 3.0

internal/service/adult_image_crop_test.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"encoding/base64"
 	"image"
 	"image/color"
 	"image/draw"
@@ -58,6 +59,27 @@ func TestCropAdultCoverPosterWideLandscape(t *testing.T) {
 	}
 }
 
+func TestCropAdultCoverPosterDecodesWebP(t *testing.T) {
+	wideWebP, err := base64.StdEncoding.DecodeString("UklGRjwAAABXRUJQVlA4IDAAAADQAQCdASoJAAYAAUAmJaACdLoB+AADsAD+8ut//NgVzXPv9//S4P0uD9Lg/9KQAAA=")
+	if err != nil {
+		t.Fatal(err)
+	}
+	croppedBytes, ctype, err := CropAdultCoverPoster(wideWebP)
+	if err != nil {
+		t.Fatalf("crop WebP: %v", err)
+	}
+	if ctype != "image/jpeg" {
+		t.Fatalf("cropped WebP type = %q, want image/jpeg", ctype)
+	}
+	cropped, _, err := image.Decode(bytes.NewReader(croppedBytes))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got := float64(cropped.Bounds().Dx()) / float64(cropped.Bounds().Dy()); got < 0.65 || got > 0.68 {
+		t.Fatalf("cropped WebP ratio = %.3f, want 2:3", got)
+	}
+}
+
 func TestCropAdultCoverPosterCentersDetectedFace(t *testing.T) {
 	originalDetector := findPrimaryFaceAxisRatio
 	findPrimaryFaceAxisRatio = func(image.Image, float64, bool) (float64, bool) {

internal/service/external_id_hints.go

@@ -78,6 +78,13 @@ func pathHintMetadata(raw string, seriesLike bool) (*LocalMetadata, mediaExterna
 	title, year := "", 0
 	if seriesLike {
 		title, year = CleanQuery(source)
+	} else if patTheatricalTitle.MatchString(raw) || patTheatricalFolder.MatchString(raw) {
+		base := pathBaseSlash(raw)
+		stem := mediaFileStem(base)
+		if stem == "" {
+			stem = strings.TrimSuffix(base, filepath.Ext(base))
+		}
+		title, year = CleanQuery(stem)
 	} else {
 		title, year = cloudSeriesTitleFromMediaPath(source)
 		if title == "" {

internal/service/image_proxy_paths.go

@@ -73,7 +73,7 @@ func isLocalImagePath(raw string) bool {
 	}
 	ext := strings.ToLower(filepath.Ext(raw))
 	switch ext {
-	case ".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tbn":
+	case ".jpg", ".jpeg", ".png", ".webp", ".gif", ".bmp", ".tbn", ".img":
 		return true
 	default:
 		return false

internal/service/image_proxy_test.go

@@ -13,6 +13,12 @@ import (
 	"github.com/truewhile/MeBox/internal/config"
 )
 
+func TestIsLocalImagePathAcceptsLegacyImgSidecar(t *testing.T) {
+	if !isLocalImagePath(filepath.Join(t.TempDir(), "movie-poster.img")) {
+		t.Fatal("legacy .img sidecar should remain displayable")
+	}
+}
+
 var testJPEG = []byte{
 	0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 'J', 'F', 'I', 'F',
 	0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01,
@@ -117,12 +123,12 @@ func TestIsPrivateHost(t *testing.T) {
 	// Hostnames must NOT be blocked even though GFW DNS poisoning may resolve
 	// them to private/loopback IPs — blocking them broke legitimate posters.
 	allowed := []string{"image.tmdb.org", "lain.bgm.tv", "example.com", "8.8.8.8"}
-		for _, h := range allowed {
-			if isPrivateHost(h) {
-				t.Errorf("isPrivateHost(%q) = true, want false", h)
-			}
+	for _, h := range allowed {
+		if isPrivateHost(h) {
+			t.Errorf("isPrivateHost(%q) = true, want false", h)
 		}
 	}
+}
 
 func TestImageProxyAllowedRemoteHostBypassesPrivateCheck(t *testing.T) {
 	proxy := NewImageProxy(&config.Config{Cache: config.CacheConfig{CacheDir: filepath.Join(t.TempDir(), "cache")}}, zap.NewNop())

internal/service/manual_scrape_search.go

@@ -24,6 +24,13 @@ func (s *ScraperService) ManualSearch(ctx context.Context, media *model.Media, q
 			mediaType = lib.Type
 		}
 	}
+	// Keep manual scraping consistent with automatic scraping for theatrical
+	// features stored inside anime libraries. The UI may pass the library type
+	// ("anime"), which otherwise makes TMDb stop after a TV result and hide the
+	// actual movie candidate.
+	if mediaLooksLikeTheatricalFeature(media) {
+		mediaType = "movie"
+	}
 	mediaType = normalizeMediaType(mediaType, queries[0], "")
 	providers := manualSearchProviderSet(provider)
 	year := mediaYearHint(media)

internal/service/manual_scrape_test.go

@@ -313,6 +313,80 @@ func TestManualSearchReturnsMovieFallbackForTVTypedTMDbSearch(t *testing.T) {
 	}
 }
 
+func TestManualSearchAnimeTheatricalPrefersTMDbMovie(t *testing.T) {
+	var paths []string
+	upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		paths = append(paths, r.URL.Path)
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case "/search/movie":
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"results": []map[string]any{{
+					"id":             635302,
+					"title":          "鬼灭之刃 剧场版 无限列车篇",
+					"original_title": "劇場版「鬼滅の刃」無限列車編",
+					"release_date":   "2020-10-16",
+				}},
+			})
+		case "/search/tv":
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"results": []map[string]any{{
+					"id":             85937,
+					"name":           "鬼灭之刃",
+					"original_name":  "鬼滅の刃",
+					"first_air_date": "2019-04-06",
+				}},
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer upstream.Close()
+
+	db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Library{}, &model.Series{}, &model.Media{}); err != nil {
+		t.Fatal(err)
+	}
+	repos := repository.New(db)
+	cfg := &config.Config{}
+	cfg.Secrets.TMDbAPIKey = "test-key"
+	cfg.Secrets.TMDbAPIProxy = upstream.URL
+	log := zap.NewNop()
+	scraper := NewScraperService(cfg, log, repos, NewTMDbProvider(cfg, log, nil), nil, nil, nil, NewHub(log))
+
+	lib := model.Library{Name: "动漫", Path: `/media/anime`, Type: "anime", Enabled: true}
+	if err := repos.DB.Create(&lib).Error; err != nil {
+		t.Fatal(err)
+	}
+	media := model.Media{
+		LibraryID: lib.ID,
+		Title:     "鬼灭之刃 剧场版 无限列车篇",
+		Path:      `/media/anime/鬼灭之刃/鬼灭之刃 剧场版 无限列车篇.mkv`,
+	}
+	if err := repos.DB.Create(&media).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	results, err := scraper.ManualSearch(t.Context(), &media, media.Title, "tmdb", "anime")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(results) == 0 || results[0].TMDbID != 635302 || results[0].MediaType != "movie" {
+		t.Fatalf("manual theatrical results=%#v, paths=%v", results, paths)
+	}
+	if len(paths) == 0 || paths[0] != "/search/movie" {
+		t.Fatalf("TMDb search paths=%v, want movie first", paths)
+	}
+	for _, path := range paths {
+		if path == "/search/tv" {
+			t.Fatalf("manual theatrical search unexpectedly queried TV after finding movie: paths=%v", paths)
+		}
+	}
+}
+
 func TestManualSearchAllProvidersTMDbNumericIDTriesMovieAndTVNamespaces(t *testing.T) {
 	var paths []string
 	upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

internal/service/media_classifier.go

@@ -62,7 +62,7 @@ func classifyMediaCategory(input mediaClassifyInput, categories map[string]strin
 	isWesternByCategory := containsAnyText(categoryText, "欧美剧", "欧美电视剧", "美剧", "英剧", "欧美电影", "外语电影")
 	isWestern := isWesternByMetadata || (!hasRegionMetadata && isWesternByCategory)
 	isUSAnime := hasAny(countries, "US")
-	hasAnimeText := containsAnyText(contentText, "动画", "动漫", "番剧", "年番", "国漫", "日番", "韩漫", "美漫", "bangumi", "anime", "b-global", "ani-one", "crunchyroll")
+	hasAnimeText := containsAnyText(contentText, "动画", "动漫", "番剧", "年番", "国漫", "日番", "韩漫", "美漫", "bangumi", "anime", "b-global", "ani-one", "crunchyroll", "剧场版", "劇場版", "动画电影", "動畫電影")
 	hasVarietyText := containsAnyText(contentText, "综艺", "真人秀", "脱口秀", "晚会", "春晚", "gala", "festival gala", "reality", "talk show")
 	hasDocumentaryText := containsAnyText(contentText, "纪录", "纪录片", "documentary", "docu", "national geographic", "natgeo")
 	hasConcertText := containsAnyText(contentText, "演唱会", "音乐会", "concert", "live concert")
@@ -191,21 +191,21 @@ func normalizeMediaType(mediaType, title, category string) string {
 		return "adult"
 	case containsAnyText(raw, "综艺", "真人秀"):
 		return "variety"
-	case (containsAnyText(raw, "国漫", "日漫", "日番", "韩漫", "美漫", "欧美动漫", "其他动漫", "动漫", "动画") || classifierAnimeRE.MatchString(raw)) && !containsAnyText(raw, "动画电影"):
-		return "anime"
-	case containsAnyText(raw, "电视剧", "剧集", "连续剧", "短剧", "国产剧", "国剧", "大陆剧", "华语剧", "国产电视剧", "大陆电视剧", "华语电视剧", "欧美剧", "欧美电视剧", "美剧", "英剧", "日韩剧", "日韩电视剧", "日剧", "韩剧", "港剧", "台剧", "港台剧", "泰剧") || classifierTVRE.MatchString(raw):
-		return "tv"
-	case containsAnyText(raw, "电影", "演唱会") || classifierMovieRE.MatchString(raw):
-		return "movie"
-	}
-	text := strings.ToLower(title + " " + category)
-	switch {
-	case strings.Contains(text, "adult") || strings.Contains(text, "nsfw") || strings.Contains(text, "成人") || strings.Contains(text, "番号") || strings.Contains(text, "jav") || strings.Contains(text, "9kg") || classifierJAVCodeRE.MatchString(strings.ToUpper(title+" "+category)):
-		return "adult"
-	case containsAnyText(text, "综艺", "真人秀", "脱口秀", "晚会", "春晚", "gala", "festival gala", "reality", "talk show"):
-		return "variety"
-	case strings.Contains(text, "电影") || classifierMovieRE.MatchString(text):
-		return "movie"
+		case (containsAnyText(raw, "国漫", "日漫", "日番", "韩漫", "美漫", "欧美动漫", "其他动漫", "动漫", "动画") || classifierAnimeRE.MatchString(raw)) && !containsAnyText(raw, "动画电影", "剧场版", "劇場版"):
+			return "anime"
+		case containsAnyText(raw, "电视剧", "剧集", "连续剧", "短剧", "国产剧", "国剧", "大陆剧", "华语剧", "国产电视剧", "大陆电视剧", "华语电视剧", "欧美剧", "欧美电视剧", "美剧", "英剧", "日韩剧", "日韩电视剧", "日剧", "韩剧", "港剧", "台剧", "港台剧", "泰剧") || classifierTVRE.MatchString(raw):
+			return "tv"
+		case containsAnyText(raw, "电影", "演唱会", "剧场版", "劇場版") || classifierMovieRE.MatchString(raw):
+			return "movie"
+		}
+		text := strings.ToLower(title + " " + category)
+		switch {
+		case strings.Contains(text, "adult") || strings.Contains(text, "nsfw") || strings.Contains(text, "成人") || strings.Contains(text, "番号") || strings.Contains(text, "jav") || strings.Contains(text, "9kg") || classifierJAVCodeRE.MatchString(strings.ToUpper(title+" "+category)):
+			return "adult"
+		case containsAnyText(text, "综艺", "真人秀", "脱口秀", "晚会", "春晚", "gala", "festival gala", "reality", "talk show"):
+			return "variety"
+		case containsAnyText(text, "电影", "剧场版", "劇場版") || classifierMovieRE.MatchString(text):
+			return "movie"
 	case classifierAnimeRE.MatchString(text) || strings.Contains(text, "动漫") || strings.Contains(text, "动画"):
 		return "anime"
 	case strings.Contains(text, "variety") || strings.Contains(text, "综艺") || strings.Contains(text, "真人秀"):

internal/service/media_series_key.go

@@ -173,7 +173,7 @@ func seriesTitleFromMediaPath(path string) string {
 	if last := parts[len(parts)-1]; !seriesPathPartLooksLikeFile(last) && !seriesSeasonDirRE.MatchString(filepath.Base(last)) {
 		dirIndex = len(parts) - 1
 	}
-	for dirIndex >= 0 && seriesSeasonDirRE.MatchString(filepath.Base(parts[dirIndex])) {
+	for dirIndex >= 0 && (seriesSeasonDirRE.MatchString(filepath.Base(parts[dirIndex])) || isTheatricalFolder(parts[dirIndex])) {
 		dirIndex--
 	}
 	if dirIndex < 0 {

internal/service/media_series_test.go

@@ -404,6 +404,33 @@ func TestGroupMediaSeriesCardsKeepsMovieVersionsAsOneMovie(t *testing.T) {
 	}
 }
 
+func TestGroupMediaSeriesCardsKeepsTheatricalMovieWithTVSeries(t *testing.T) {
+	episode := model.Media{
+		Base:       model.Base{ID: "episode"},
+		LibraryID:  "anime",
+		Title:      "超人高校生们",
+		Path:       `/media/动漫/超人高校生们/Season 01/超人高校生们.S01E01.mkv`,
+		SeasonNum:  1,
+		EpisodeNum: 1,
+	}
+	theatrical := model.Media{
+		Base:       model.Base{ID: "theatrical"},
+		LibraryID:  "anime",
+		Title:      "超人高校生们",
+		Path:       `/media/动漫/超人高校生们/剧场版/超人高校生们 剧场版.mkv`,
+		SeasonNum:  1,
+		EpisodeNum: 1,
+	}
+
+	cards := groupMediaSeriesCards([]model.Media{episode, theatrical})
+	if len(cards) != 1 {
+		t.Fatalf("cards=%#v, want theatrical movie retained with TV series", cards)
+	}
+	if cards[0].Count != 2 {
+		t.Fatalf("series card count=%d, want TV episode plus theatrical movie", cards[0].Count)
+	}
+}
+
 func TestGroupMediaSeriesCardsDoesNotCollideMovieAndTVExternalIDs(t *testing.T) {
 	movie := model.Media{
 		Base:      model.Base{ID: "movie"},

internal/service/scraper_anime_theatrical_test.go

@@ -0,0 +1,305 @@
+package service
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"go.uber.org/zap"
+
+	"github.com/truewhile/MeBox/internal/config"
+	"github.com/truewhile/MeBox/internal/model"
+)
+
+func TestTheatricalTitleVariants(t *testing.T) {
+	tests := []struct {
+		input string
+		want  []string
+	}{
+		{
+			input: "名侦探柯南 剧场版01 引爆摩天楼",
+			want:  []string{"名侦探柯南 引爆摩天楼", "名侦探柯南 剧场版01 引爆摩天楼"},
+		},
+		{
+			input: "名侦探柯南 剧场版26 黑铁的鱼影",
+			want:  []string{"名侦探柯南 黑铁的鱼影", "名侦探柯南 剧场版26 黑铁的鱼影"},
+		},
+		{
+			input: "鬼灭之刃 剧场版 无限列车篇",
+			want:  []string{"鬼灭之刃 无限列车篇", "鬼灭之刃 剧场版 无限列车篇"},
+		},
+		{
+			input: "航海王 The Movie 黄金之城",
+			want:  []string{"航海王 The Movie 黄金之城"},
+		},
+		{
+			input: "普通动漫 第01集",
+			want:  []string{"普通动漫 第01集"},
+		},
+	}
+
+	for _, tc := range tests {
+		got := theatricalTitleVariants(tc.input)
+		if len(got) != len(tc.want) {
+			t.Fatalf("theatricalTitleVariants(%q) = %v, want %v", tc.input, got, tc.want)
+		}
+		for i := range got {
+			if got[i] != tc.want[i] {
+				t.Fatalf("theatricalTitleVariants(%q)[%d] = %q, want %q", tc.input, i, got[i], tc.want[i])
+			}
+		}
+	}
+}
+
+func TestMetadataMatchCompatibilityForTheatricalFeatures(t *testing.T) {
+	animeMatch := &Match{MediaType: "anime"}
+
+	if metadataMatchCompatibleWithType("movie", animeMatch) {
+		t.Fatal("ordinary movie lookups must not accept anime matches")
+	}
+	if !metadataMatchCompatibleWithTheatrical("movie", true, animeMatch) {
+		t.Fatal("theatrical movie lookup should accept an anime provider match")
+	}
+	if metadataMatchCompatibleWithTheatrical("movie", false, animeMatch) {
+		t.Fatal("non-theatrical movie lookup must not accept an anime provider match")
+	}
+}
+
+func TestMediaLooksLikeTheatricalFeatureIgnoresStaleEpisodeIdentity(t *testing.T) {
+	media := &model.Media{
+		Title:      "未命名",
+		Path:       `/media/anime/超人高校生们/剧场版/超人高校生们 剧场版.mkv`,
+		SeasonNum:  1,
+		EpisodeNum: 1,
+	}
+	if !mediaLooksLikeTheatricalFeature(media) {
+		t.Fatal("theatrical path should override stale persisted season/episode fields")
+	}
+
+	realEpisode := &model.Media{
+		Title:      "剧场版制作幕后",
+		Path:       `/media/anime/超人高校生们/Season 01/超人高校生们.S01E01.mkv`,
+		SeasonNum:  1,
+		EpisodeNum: 1,
+	}
+	if mediaLooksLikeTheatricalFeature(realEpisode) {
+		t.Fatal("an actual episode marker in the path must remain episodic")
+	}
+}
+
+func TestScrapeQueryCandidatesForAnimeTheatricalMix(t *testing.T) {
+	lib := &model.Library{
+		Path: `/media/anime`,
+		Type: "anime",
+	}
+
+	// 1. 同目录下包含剧场版01
+	theatricalMedia := &model.Media{
+		Title: "名侦探柯南 剧场版01 引爆摩天楼",
+		Path:  `/media/anime/名侦探柯南/名侦探柯南 剧场版01 引爆摩天楼.mkv`,
+	}
+	candidates := scrapeQueryCandidates(theatricalMedia, lib)
+	if len(candidates) == 0 {
+		t.Fatal("scrapeQueryCandidates returned no candidates for theatrical media")
+	}
+	if candidates[0] != "名侦探柯南 引爆摩天楼" {
+		t.Fatalf("first candidate for theatrical media = %q, want cleaned movie title '名侦探柯南 引爆摩天楼'; all=%v", candidates[0], candidates)
+	}
+
+	// 2. 剧场版放在以剧场版命名的子目录
+	subfolderTheatricalMedia := &model.Media{
+		Title: "无限列车篇",
+		Path:  `/media/anime/鬼灭之刃/剧场版/无限列车篇.mkv`,
+	}
+	subCandidates := scrapeQueryCandidates(subfolderTheatricalMedia, lib)
+	if len(subCandidates) == 0 {
+		t.Fatal("scrapeQueryCandidates returned no candidates for subfolder theatrical media")
+	}
+	foundCombined := false
+	for _, c := range subCandidates {
+		if c == "鬼灭之刃 无限列车篇" {
+			foundCombined = true
+			break
+		}
+	}
+	if !foundCombined {
+		t.Fatalf("candidates for subfolder theatrical did not contain '鬼灭之刃 无限列车篇': %v", subCandidates)
+	}
+
+	// 3. 混合放置的普通剧集分集不应受剧场版影响
+	episodeMedia := &model.Media{
+		Title:      "名侦探柯南 - S01E01",
+		Path:       `/media/anime/名侦探柯南/名侦探柯南 - S01E01.mp4`,
+		SeasonNum:  1,
+		EpisodeNum: 1,
+	}
+	epCandidates := scrapeQueryCandidates(episodeMedia, lib)
+	if len(epCandidates) == 0 {
+		t.Fatal("scrapeQueryCandidates returned no candidates for episode media")
+	}
+	if epCandidates[0] != "名侦探柯南" {
+		t.Fatalf("first candidate for tv episode = %q, want series folder title '名侦探柯南'", epCandidates[0])
+	}
+}
+
+func TestEnrichOneAnimeMixedEpisodesAndTheatrical(t *testing.T) {
+	upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		switch r.URL.Path {
+		case "/search/tv":
+			q := r.URL.Query().Get("query")
+			if q == "鬼灭之刃" {
+				_ = json.NewEncoder(w).Encode(map[string]any{
+					"results": []map[string]any{{
+						"id":             85937,
+						"name":           "鬼灭之刃",
+						"original_name":  "鬼滅の刃",
+						"overview":       "大正时期、日本...",
+						"first_air_date": "2019-04-06",
+					}},
+				})
+				return
+			}
+			_ = json.NewEncoder(w).Encode(map[string]any{"results": []any{}})
+		case "/search/movie":
+			q := r.URL.Query().Get("query")
+			if q == "鬼灭之刃 无限列车篇" || q == "鬼灭之刃 剧场版 无限列车篇" {
+				_ = json.NewEncoder(w).Encode(map[string]any{
+					"results": []map[string]any{{
+						"id":             635302,
+						"title":          "鬼灭之刃 剧场版 无限列车篇",
+						"original_title": "劇場版「鬼滅の刃」無限列車編",
+						"overview":       "在结束了蝴蝶屋的修业之后...",
+						"release_date":   "2020-10-16",
+					}},
+				})
+				return
+			}
+			_ = json.NewEncoder(w).Encode(map[string]any{"results": []any{}})
+		case "/tv/85937":
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":             85937,
+				"name":           "鬼灭之刃",
+				"original_name":  "鬼滅の刃",
+				"first_air_date": "2019-04-06",
+			})
+		case "/movie/635302":
+			_ = json.NewEncoder(w).Encode(map[string]any{
+				"id":             635302,
+				"title":          "鬼灭之刃 剧场版 无限列车篇",
+				"original_title": "劇場版「鬼滅の刃」無限列車編",
+				"release_date":   "2020-10-16",
+			})
+		default:
+			http.NotFound(w, r)
+		}
+	}))
+	defer upstream.Close()
+
+	repos := newOrganizerTestRepo(t)
+	cfg := &config.Config{}
+	cfg.Secrets.TMDbAPIKey = "test-key"
+	cfg.Secrets.TMDbAPIProxy = upstream.URL
+	log := zap.NewNop()
+	scraper := NewScraperService(cfg, log, repos, NewTMDbProvider(cfg, log, nil), nil, nil, nil, NewHub(log))
+
+	lib := model.Library{Name: "动漫", Path: `/media/anime`, Type: "anime", Enabled: true}
+	if err := repos.DB.Create(&lib).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	// 1. 同一目录下的 TV 剧集
+	tvEpisode := model.Media{
+		LibraryID:    lib.ID,
+		Title:        "鬼灭之刃 S01E01",
+		Path:         `/media/anime/鬼灭之刃/Season 01/鬼灭之刃 - S01E01.mkv`,
+		SeasonNum:    1,
+		EpisodeNum:   1,
+		ScrapeStatus: "pending",
+	}
+	if err := repos.DB.Create(&tvEpisode).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	// 2. 同一目录下的剧场版文件
+	movieMedia := model.Media{
+		LibraryID:    lib.ID,
+		Title:        "鬼灭之刃 剧场版 无限列车篇",
+		Path:         `/media/anime/鬼灭之刃/鬼灭之刃 剧场版 无限列车篇.mkv`,
+		ScrapeStatus: "pending",
+	}
+	if err := repos.DB.Create(&movieMedia).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	// 刮削剧集
+	if err := scraper.EnrichOne(t.Context(), &tvEpisode); err != nil {
+		t.Fatalf("enrich tv episode: %v", err)
+	}
+	gotTV, err := repos.Media.FindByID(t.Context(), tvEpisode.ID)
+	if err != nil || gotTV == nil {
+		t.Fatalf("load tv episode: %v", err)
+	}
+	if gotTV.ScrapeStatus != "matched" || gotTV.TMDbID != 85937 {
+		t.Fatalf("tv episode scrape mismatch: status=%s, tmdb_id=%d", gotTV.ScrapeStatus, gotTV.TMDbID)
+	}
+
+	// 刮削剧场版
+	if err := scraper.EnrichOne(t.Context(), &movieMedia); err != nil {
+		t.Fatalf("enrich movie: %v", err)
+	}
+	gotMovie, err := repos.Media.FindByID(t.Context(), movieMedia.ID)
+	if err != nil || gotMovie == nil {
+		t.Fatalf("load movie: %v", err)
+	}
+	if gotMovie.ScrapeStatus != "matched" || gotMovie.TMDbID != 635302 {
+		t.Fatalf("theatrical movie scrape mismatch: status=%s, tmdb_id=%d, want 635302", gotMovie.ScrapeStatus, gotMovie.TMDbID)
+	}
+	if gotMovie.Title != "鬼灭之刃 剧场版 无限列车篇" {
+		t.Fatalf("theatrical movie title = %q, want '鬼灭之刃 剧场版 无限列车篇'", gotMovie.Title)
+	}
+}
+
+func TestClassifyAnimeTheatricalMovie(t *testing.T) {
+	categories := map[string]string{
+		"animation_movie": "动画电影",
+		"jp_anime":        "日番",
+		"chinese_movie":   "华语电影",
+	}
+	tests := []struct {
+		title     string
+		mediaType string
+		want      string
+	}{
+		{
+			title:     "名侦探柯南 剧场版01 引爆摩天楼",
+			mediaType: "movie",
+			want:      "动画电影",
+		},
+		{
+			title:     "鬼灭之刃 剧场版 无限列车篇",
+			mediaType: "movie",
+			want:      "动画电影",
+		},
+		{
+			title:     "鬼灭之刃 S01E01",
+			mediaType: "tv",
+			want:      "日番",
+		},
+	}
+
+	for _, tc := range tests {
+		input := mediaClassifyInput{
+			MediaType: tc.mediaType,
+			Title:     tc.title,
+			Languages: []string{"JA"},
+			Countries: []string{"JP"},
+			Genres:    []string{"Animation"},
+		}
+		got := classifyMediaCategory(input, categories)
+		if got != tc.want {
+			t.Fatalf("classifyMediaCategory(%q, %q) = %q, want %q", tc.title, tc.mediaType, got, tc.want)
+		}
+	}
+}

internal/service/scraper_candidate_selection.go

@@ -8,6 +8,27 @@ import (
 )
 
 func (s *ScraperService) lookupAutomaticTMDb(ctx context.Context, kind, query string, year int) *Match {
+	if match := s.lookupAutomaticTMDbPrimary(ctx, kind, query, year); match != nil {
+		return match
+	}
+	fallbackKind := ""
+	normalized := normalizeOrganizeMediaType(kind)
+	if normalized == "anime" {
+		if isTVMetadataKind(kind) {
+			fallbackKind = "movie"
+		} else {
+			fallbackKind = "tv"
+		}
+	}
+	if fallbackKind != "" {
+		if fbMatch := s.lookupAutomaticTMDbPrimary(ctx, fallbackKind, query, year); fbMatch != nil {
+			return fbMatch
+		}
+	}
+	return nil
+}
+
+func (s *ScraperService) lookupAutomaticTMDbPrimary(ctx context.Context, kind, query string, year int) *Match {
 	var (
 		candidates []*Match
 		err        error
@@ -175,8 +196,10 @@ func metadataMatchCompatibleWithType(expectedType string, match *Match) bool {
 		return true
 	}
 	switch expectedType {
-	case "tv", "anime", "variety":
+	case "tv", "variety":
 		return matchType == "tv" || matchType == "anime" || matchType == "variety"
+	case "anime":
+		return matchType == "anime" || matchType == "tv" || matchType == "movie" || matchType == "variety"
 	case "movie", "adult":
 		return matchType == "movie" || matchType == "adult"
 	default:
@@ -184,6 +207,16 @@ func metadataMatchCompatibleWithType(expectedType string, match *Match) bool {
 	}
 }
 
+func metadataMatchCompatibleWithTheatrical(expectedType string, isTheatrical bool, match *Match) bool {
+	if isTheatrical &&
+		normalizeOrganizeMediaType(expectedType) == "movie" &&
+		match != nil &&
+		normalizeOrganizeMediaType(match.MediaType) == "anime" {
+		return true
+	}
+	return metadataMatchCompatibleWithType(expectedType, match)
+}
+
 func queryNeedsEnglishTMDbFallback(query string) bool {
 	for _, r := range query {
 		if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {

internal/service/scraper_library.go

@@ -22,7 +22,10 @@ func (s *ScraperService) lookup(ctx context.Context, lib *model.Library, media *
 	// was previously polluted into S01E20x. Do not let the dirty path override
 	// that caller-supplied media type; TV/anime libraries still force TV below.
 	explicitEpisode := media != nil && (media.SeasonNum > 0 || media.EpisodeNum > 0)
-	if (normalizeOrganizeMediaType(kind) != "movie" || explicitEpisode) && mediaIsEpisodic(media, lib) {
+	isTheatrical := mediaLooksLikeTheatricalFeature(media)
+	if isTheatrical {
+		kind = "movie"
+	} else if (normalizeOrganizeMediaType(kind) != "movie" || explicitEpisode) && mediaIsEpisodic(media, lib) {
 		kind = "tv"
 	}
 	if s.tmdb != nil && s.tmdb.Enabled() {
@@ -30,9 +33,15 @@ func (s *ScraperService) lookup(ctx context.Context, lib *model.Library, media *
 			match.Provider = "tmdb"
 			return match
 		}
+		if isTheatrical {
+			if match := s.lookupAutomaticTMDb(ctx, "tv", query, year); match != nil {
+				match.Provider = "tmdb"
+				return match
+			}
+		}
 	}
 	if s.douban != nil && s.douban.Enabled() {
-		if m, err := s.douban.SearchMatch(ctx, query); err == nil && m != nil && metadataMatchCompatibleWithType(kind, m) {
+		if m, err := s.douban.SearchMatch(ctx, query); err == nil && m != nil && metadataMatchCompatibleWithTheatrical(kind, isTheatrical, m) {
 			m.Provider = "douban"
 			return m
 		} else if err != nil {
@@ -40,7 +49,7 @@ func (s *ScraperService) lookup(ctx context.Context, lib *model.Library, media *
 		}
 	}
 	if s.bangumi != nil && s.bangumi.Enabled() {
-		if m, err := s.bangumi.Search(ctx, query); err == nil && m != nil && metadataMatchCompatibleWithType(kind, m) {
+		if m, err := s.bangumi.Search(ctx, query); err == nil && m != nil && metadataMatchCompatibleWithTheatrical(kind, isTheatrical, m) {
 			m.Provider = "bangumi"
 			return m
 		} else if err != nil {

internal/service/scraper_query.go

@@ -15,8 +15,42 @@ var (
 	episodeTitleQueryRE      = regexp.MustCompile(`^\s*第\s*[0-9一二三四五六七八九十百零两]+\s*[集期话話](?:\s*[上下])?\s*[:：].+`)
 	genericEpisodeWordsRE    = regexp.MustCompile(`^\s*第\s*[集期话話]\s*$`)
 	episodeReleaseTitleTagRE = regexp.MustCompile(`(?i)(?:^|[\s._-])s\d{1,2}e\d{1,3}(?:[\s._-]|$)`)
+	patTheatricalTitle       = regexp.MustCompile(`(?i)(?:剧场版|劇場版|动画电影|動畫電影|电影版|電影版|\bthe\s+movie\b|\bmovie\s*\d{1,2}\b)`)
+	patTheatricalFolder      = regexp.MustCompile(`(?i)[\\/](?:剧场版|劇場版|動畫電影|动画电影)[\\/]`)
+	theatricalNoiseRE        = regexp.MustCompile(`(?i)(?:剧场版|劇場版)\s*(?:第?\s*\d{1,3}\s*[部篇]?)?|电影版|電影版|动画电影|動畫電影`)
 )
 
+func theatricalTitleVariants(raw string) []string {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return nil
+	}
+	if !theatricalNoiseRE.MatchString(raw) {
+		return []string{raw}
+	}
+	stripped := theatricalNoiseRE.ReplaceAllString(raw, " ")
+	stripped = strings.Join(strings.Fields(stripped), " ")
+	if stripped != "" && !strings.EqualFold(stripped, raw) {
+		return []string{stripped, raw}
+	}
+	return []string{raw}
+}
+
+func mediaLooksLikeTheatricalFeature(m *model.Media) bool {
+	if m == nil {
+		return false
+	}
+	// Trust an episode marker that is actually present in the path, but do not
+	// trust persisted season/episode fields here. Older scans could incorrectly
+	// assign those fields to a theatrical file, which would permanently prevent
+	// both manual re-scraping and separation from the TV series.
+	if season, ep := ParseEpisode(m.Path); season > 0 || ep > 0 {
+		return false
+	}
+	text := m.Title + " " + pathBaseSlash(m.Path)
+	return patTheatricalTitle.MatchString(text) || patTheatricalFolder.MatchString(m.Path)
+}
+
 func scrapeQueryCandidates(m *model.Media, lib *model.Library) []string {
 	return scrapeQueryCandidatesWithNormalizer(m, lib, func(raw string) (string, int) {
 		return CleanQuery(raw)
@@ -33,31 +67,59 @@ func scrapeQueryCandidatesWithNormalizer(m *model.Media, lib *model.Library, cle
 	seen := map[string]struct{}{}
 	var out []string
 	add := func(raw string) {
-		cleaned, _ := clean(raw)
-		if cleaned == "" {
-			cleaned = strings.TrimSpace(raw)
-		}
-		for _, candidate := range titleCandidates(cleaned) {
-			if unsafeAutomaticEpisodeQuery(candidate) {
-				continue
+		for _, variant := range theatricalTitleVariants(raw) {
+			cleaned, _ := clean(variant)
+			if cleaned == "" {
+				cleaned = strings.TrimSpace(variant)
 			}
-			key := strings.ToLower(candidate)
-			if _, ok := seen[key]; ok || candidate == "" {
-				continue
+			for _, candidate := range titleCandidates(cleaned) {
+				if unsafeAutomaticEpisodeQuery(candidate) {
+					continue
+				}
+				key := strings.ToLower(candidate)
+				if _, ok := seen[key]; ok || candidate == "" {
+					continue
+				}
+				seen[key] = struct{}{}
+				out = append(out, candidate)
 			}
-			seen[key] = struct{}{}
-			out = append(out, candidate)
 		}
 	}
-	episodic := mediaIsEpisodic(m, lib)
-	if lib != nil && episodic {
-		add(seriesFolderTitle(m.Path, lib.Path))
+
+	isTheatrical := mediaLooksLikeTheatricalFeature(m)
+	if isTheatrical {
+		add(m.Title)
+		add(m.Path)
+		if lib != nil {
+			seriesTitle := seriesFolderTitle(m.Path, lib.Path)
+			if seriesTitle != "" {
+				baseName := pathBaseSlash(m.Path)
+				stem := mediaFileStem(baseName)
+				if stem == "" {
+					stem = strings.TrimSuffix(baseName, filepath.Ext(baseName))
+				}
+				cleanStem, _ := clean(stem)
+				if cleanStem == "" {
+					cleanStem = stem
+				}
+				if !strings.Contains(strings.ToLower(cleanStem), strings.ToLower(seriesTitle)) {
+					add(seriesTitle + " " + cleanStem)
+				}
+			}
+			add(mediaFolderTitle(m.Path, lib.Path))
+		}
+	} else {
+		episodic := mediaIsEpisodic(m, lib)
+		if lib != nil && episodic {
+			add(seriesFolderTitle(m.Path, lib.Path))
+		}
+		if lib != nil {
+			add(mediaFolderTitle(m.Path, lib.Path))
+		}
+		add(m.Title)
+		add(m.Path)
 	}
-	if lib != nil {
-		add(mediaFolderTitle(m.Path, lib.Path))
-	}
-	add(m.Title)
-	add(m.Path)
+
 	if len(out) == 0 {
 		base := pathBaseSlash(m.Path)
 		out = append(out, strings.TrimSuffix(base, filepath.Ext(base)))
@@ -106,6 +168,9 @@ func containsCJK(s string) bool {
 }
 
 func mediaIsEpisodic(m *model.Media, lib *model.Library) bool {
+	if m != nil && mediaLooksLikeTheatricalFeature(m) {
+		return false
+	}
 	if m != nil && (m.SeasonNum > 0 || m.EpisodeNum > 0) {
 		return true
 	}

internal/service/scraper_query_paths.go

@@ -13,10 +13,10 @@ func mediaFolderTitle(mediaPath, libraryRoot string) string {
 		if base == "" || base == "." {
 			return ""
 		}
-		if isTechnicalMediaFolder(base) || strictSeasonFolderMatched(base) {
-			dir = parentSlashPath(dir)
-			continue
-		}
+			if isTechnicalMediaFolder(base) || strictSeasonFolderMatched(base) || isTheatricalFolder(base) {
+				dir = parentSlashPath(dir)
+				continue
+			}
 		if isMediaCollectionFolder(base) {
 			dir = parentSlashPath(dir)
 			continue
@@ -104,7 +104,7 @@ func parentSlashPath(value string) string {
 
 func seriesFolderTitle(mediaPath, libraryRoot string) string {
 	dir := parentSlashPath(mediaPath)
-	if strictSeasonFolderMatched(pathBaseSlash(dir)) {
+	if strictSeasonFolderMatched(pathBaseSlash(dir)) || isTheatricalFolder(pathBaseSlash(dir)) {
 		dir = parentSlashPath(dir)
 	}
 	if root := comparableLibraryRoot(libraryRoot); root != "" && sameSlashPath(dir, root) {
@@ -114,12 +114,23 @@ func seriesFolderTitle(mediaPath, libraryRoot string) string {
 	if base == "" || base == "." {
 		return ""
 	}
-	if isGenericMediaCategoryFolder(base) || isTechnicalMediaFolder(base) || strictSeasonFolderMatched(base) {
+	if isGenericMediaCategoryFolder(base) || isTechnicalMediaFolder(base) || strictSeasonFolderMatched(base) || isTheatricalFolder(base) {
 		return ""
 	}
 	return base
 }
 
+func isTheatricalFolder(name string) bool {
+	key := strings.ToLower(strings.TrimSpace(name))
+	key = strings.Trim(key, `\/`)
+	switch key {
+	case "剧场版", "劇場版", "动画电影", "動畫電影", "特别篇", "特別篇", "specials", "sp", "ova", "oad":
+		return true
+	default:
+		return false
+	}
+}
+
 func libraryRootTitle(libraryRoot string) string {
 	base := ""
 	if info, ok := ParseCloudLibraryMount(libraryRoot); ok {

internal/service/scraper_write_metadata_files.go

@@ -91,10 +91,22 @@ func shouldCropAdultPoster(media *model.Media, lib *model.Library) bool {
 // downloadArtworkToPathWithOptions fetches an artwork URL via the image proxy cache and
 // writes it under dir/<name>.<ext>. For adult posters, it crops the right half of the cover.
 func (s *ScraperService) downloadArtworkToPathWithOptions(ctx context.Context, dir, name, raw string, cropAdultPoster bool) string {
-	if !isHTTPish(raw) {
+	var (
+		data  []byte
+		ctype string
+		err   error
+	)
+	switch {
+	case isHTTPish(raw):
+		data, ctype, err = s.images.Fetch(ctx, raw)
+	case isLocalImagePath(raw):
+		data, err = os.ReadFile(sanitizeLocalPath(resolveMappedDestinationPath(raw)))
+		if err == nil {
+			ctype = detectContentType(data)
+		}
+	default:
 		return ""
 	}
-	data, ctype, err := s.images.Fetch(ctx, raw)
 	if err != nil || len(data) == 0 {
 		s.log.Warn("scrape artwork download failed",
 			zap.String("name", name),
@@ -105,6 +117,12 @@ func (s *ScraperService) downloadArtworkToPathWithOptions(ctx context.Context, d
 	if !isImageContentType(ctype) || isTransparentPlaceholderData(data) {
 		return ""
 	}
+	// Upstreams sometimes report non-standard values such as image/jpg.
+	// Use the decoded bytes as the source of truth so sidecars receive a
+	// standard extension instead of the legacy .img fallback.
+	if detected := detectContentType(data); isImageContentType(detected) {
+		ctype = detected
+	}
 	if cropAdultPoster {
 		if cropped, croppedType, err := CropAdultCoverPoster(data); err == nil && len(cropped) > 0 {
 			data = cropped
@@ -166,7 +184,7 @@ func (s *ScraperService) writeArtworkDataToPath(dir, name, ctype string, data []
 // extension that could confuse media players.
 func imageExtForContentType(ctype string) string {
 	switch strings.ToLower(strings.TrimSpace(strings.Split(ctype, ";")[0])) {
-	case "image/jpeg", "image/pjpeg":
+	case "image/jpeg", "image/jpg", "image/pjpeg":
 		return ".jpg"
 	case "image/png", "image/x-png":
 		return ".png"

internal/service/scraper_write_metadata_files_test.go

@@ -88,6 +88,7 @@ func TestShouldCropAdultPosterUsesLibraryType(t *testing.T) {
 func TestImageExtForContentType(t *testing.T) {
 	cases := map[string]string{
 		"image/jpeg":                 ".jpg",
+		"image/jpg":                  ".jpg",
 		"image/pjpeg":                ".jpg",
 		"image/png":                  ".png",
 		"image/webp":                 ".webp",
@@ -103,6 +104,32 @@ func TestImageExtForContentType(t *testing.T) {
 	}
 }
 
+func TestDownloadArtworkMigratesLocalImgToCanonicalCroppedJPEG(t *testing.T) {
+	scraper := &ScraperService{log: zap.NewNop()}
+	dir := t.TempDir()
+	legacy := filepath.Join(dir, "movie-poster.img")
+	wide := createTestImage(900, 600, color.RGBA{R: 255, A: 255}, color.RGBA{B: 255, A: 255})
+	if err := os.WriteFile(legacy, wide, 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	dst := scraper.downloadArtworkToPathWithOptions(t.Context(), dir, "movie-poster", legacy, true)
+	if filepath.Base(dst) != "movie-poster.jpg" {
+		t.Fatalf("destination = %q, want canonical JPEG sidecar", dst)
+	}
+	data, err := os.ReadFile(dst)
+	if err != nil {
+		t.Fatal(err)
+	}
+	cropped, _, err := image.Decode(bytes.NewReader(data))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got := float64(cropped.Bounds().Dx()) / float64(cropped.Bounds().Dy()); got < 0.65 || got > 0.68 {
+		t.Fatalf("migrated poster ratio = %.3f, want 2:3", got)
+	}
+}
+
 // TestWriteMediaArtworkFilesAfterScrapeSkipsCloud verifies that cloud media
 // never has artwork written anywhere.
 func TestWriteMediaArtworkFilesAfterScrapeSkipsCloud(t *testing.T) {

internal/service/subtitle.go

@@ -94,28 +94,28 @@ func (s *SubtitleService) Discover(ctx context.Context, mediaID string) ([]Subti
 // DiscoverExternalOnly 只返回媒体旁边的外挂字幕文件，不含容器内嵌字幕轨。
 // Emby 字幕接口（/Videos/:id/Subtitles/...）用。
 func (s *SubtitleService) DiscoverExternalOnly(ctx context.Context, mediaID string) ([]SubtitleTrack, error) {
-	tracks, err := s.discover(ctx, mediaID)
+	cacheKey := "external:" + mediaID
+	if tracks, ok := s.cachedDiscovery(cacheKey); ok {
+		return tracks, nil
+	}
+	tracks, err := s.discoverExternalUncached(ctx, mediaID)
 	if err != nil {
 		return nil, err
 	}
-	out := make([]SubtitleTrack, 0, len(tracks))
-	for _, track := range tracks {
-		if track.Source != "embedded" {
-			out = append(out, track)
-		}
-	}
-	return out, nil
+	s.rememberDiscovery(cacheKey, tracks)
+	return tracks, nil
 }
 
 func (s *SubtitleService) discover(ctx context.Context, mediaID string) ([]SubtitleTrack, error) {
-	if tracks, ok := s.cachedDiscovery(mediaID); ok {
+	cacheKey := "all:" + mediaID
+	if tracks, ok := s.cachedDiscovery(cacheKey); ok {
 		return tracks, nil
 	}
 	tracks, err := s.discoverUncached(ctx, mediaID)
 	if err != nil {
 		return nil, err
 	}
-	s.rememberDiscovery(mediaID, tracks)
+	s.rememberDiscovery(cacheKey, tracks)
 	return tracks, nil
 }
 
@@ -159,6 +159,30 @@ func (s *SubtitleService) discoverUncached(ctx context.Context, mediaID string)
 	if m == nil {
 		return nil, errors.New("media not found")
 	}
+	tracks := discoverExternalSubtitleTracks(m)
+	embedded, err := s.discoverEmbedded(ctx, m)
+	if err != nil {
+		if s.log != nil {
+			s.log.Debug("discover embedded subtitles failed", zap.String("media_id", mediaID), zap.Error(err))
+		}
+	} else {
+		tracks = append(tracks, embedded...)
+	}
+	return tracks, nil
+}
+
+func (s *SubtitleService) discoverExternalUncached(ctx context.Context, mediaID string) ([]SubtitleTrack, error) {
+	m, err := s.repo.Media.FindByID(ctx, mediaID)
+	if err != nil {
+		return nil, err
+	}
+	if m == nil {
+		return nil, errors.New("media not found")
+	}
+	return discoverExternalSubtitleTracks(m), nil
+}
+
+func discoverExternalSubtitleTracks(m *model.Media) []SubtitleTrack {
 	dir := filepath.Dir(m.Path)
 	bases := mediaSidecarBaseVariants(m.Path)
 	if len(bases) == 0 {
@@ -214,15 +238,7 @@ func (s *SubtitleService) discoverUncached(ctx context.Context, mediaID string)
 			})
 		}
 	}
-	embedded, err := s.discoverEmbedded(ctx, m)
-	if err != nil {
-		if s.log != nil {
-			s.log.Debug("discover embedded subtitles failed", zap.String("media_id", mediaID), zap.Error(err))
-		}
-	} else {
-		tracks = append(tracks, embedded...)
-	}
-	return tracks, nil
+	return tracks
 }
 
 type embeddedSubtitleProbe struct {

internal/service/subtitle_test.go

@@ -2,7 +2,9 @@ package service
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
@@ -48,6 +50,43 @@ func TestSubtitleDiscoverNoTracksReturnsEmptySlice(t *testing.T) {
 	}
 }
 
+func TestDiscoverExternalOnlyDoesNotResolveOrProbeCloudMedia(t *testing.T) {
+	db, err := gorm.Open(sqlite.Open("file::memory:?cache=shared"), &gorm.Config{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := db.AutoMigrate(&model.Library{}, &model.Media{}); err != nil {
+		t.Fatal(err)
+	}
+
+	media := model.Media{
+		Title:   "Cloud Media",
+		Path:    "cloud://115/example/video.mkv",
+		STRMURL: "cloud://115/example/video.mkv",
+	}
+	if err := db.Create(&media).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	svc := NewSubtitleService(&config.Config{}, zap.NewNop(), repository.New(db))
+	resolveCalls := 0
+	svc.SetStrmPlayTargetResolver(func(context.Context, string) (*StrmPlayResult, error) {
+		resolveCalls++
+		return nil, errors.New("resolver must not be called")
+	})
+
+	tracks, err := svc.DiscoverExternalOnly(t.Context(), media.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if resolveCalls != 0 {
+		t.Fatalf("STRM resolver called %d times, want 0", resolveCalls)
+	}
+	if len(tracks) != 0 {
+		t.Fatalf("len(tracks) = %d, want 0", len(tracks))
+	}
+}
+
 func TestEmbeddedSubtitleProbeClassifiesTextAndBitmapTracks(t *testing.T) {
 	var probe embeddedSubtitleProbe
 	raw := []byte(`{"streams":[

web/src/api/subtitles.ts

@@ -13,9 +13,11 @@ export interface SubtitleTrack {
 }
 
 export const subtitlesAPI = {
-  list: (mediaId: string) =>
+  list: (mediaId: string, includeEmbedded = false) =>
     api
-      .get<{ tracks: SubtitleTrack[] | null }>(`/media/${mediaId}/subtitles`)
+      .get<{ tracks: SubtitleTrack[] | null }>(`/media/${mediaId}/subtitles`, {
+        params: includeEmbedded ? { include_embedded: 'true' } : undefined,
+      })
       .then((r) => r.data.tracks ?? []),
 
   url: (mediaId: string, path: string) => {

web/src/components/MediaVersionSwitcher.tsx

@@ -1,8 +1,8 @@
-import { Layers } from 'lucide-react'
+import { Cloud, Layers } from 'lucide-react'
 import { Link } from 'react-router-dom'
 
 import type { Media } from '../types'
-import { mediaVersionLabel, mediaVersionsOf } from '../utils/mediaVersion'
+import { isStrmMedia, mediaVersionLabel, mediaVersionsOf } from '../utils/mediaVersion'
 
 type MediaVersionSwitcherProps = {
   media: Media
@@ -31,14 +31,30 @@ export function MediaVersionSwitcher({
       <div className="flex flex-wrap gap-2">
         {versions.map((version) => {
           const active = version.id === media.id
+          const isStrm = isStrmMedia(version)
           const label = mediaVersionLabel(version)
-          const className = dark
+          const btnClass = dark
             ? active
-              ? 'border-white/40 bg-white/20 text-white'
-              : 'border-white/15 bg-white/5 text-white/80 hover:bg-white/15'
+              ? 'border-white/50 bg-white/20 text-white shadow-sm ring-1 ring-white/20'
+              : 'border-white/15 bg-white/5 text-white/80 hover:bg-white/15 hover:text-white'
             : active
-              ? 'border-brand-500/40 bg-brand-50 text-[#b07d35]'
+              ? 'border-brand-500/40 bg-brand-50 text-[#b07d35] font-bold shadow-sm'
               : 'border-gray-200 bg-white text-ink-100 hover:border-brand-500/30 hover:bg-brand-50/40'
+
+          const content = (
+            <span className="inline-flex items-center gap-1.5">
+              {isStrm && (
+                <Cloud
+                  size={12}
+                  className={dark ? (active ? 'text-brand-300' : 'text-white/60') : (active ? 'text-brand-500' : 'text-sand-400')}
+                  aria-label="云端 / STRM"
+                />
+              )}
+              <span>{label}</span>
+              {!dark && active ? <span className="opacity-75">· 当前</span> : null}
+            </span>
+          )
+
           if (mode === 'player') {
             return (
               <button
@@ -46,10 +62,10 @@ export function MediaVersionSwitcher({
                 type="button"
                 disabled={active}
                 onClick={() => onSelect?.(version)}
-                className={`rounded-xl border px-3 py-1.5 text-xs font-semibold transition disabled:cursor-default ${className}`}
-                title={version.path}
+                className={`rounded-xl border px-3 py-1.5 text-xs font-semibold transition disabled:cursor-default ${btnClass}`}
+                title={version.path || version.strm_url}
               >
-                {label}
+                {content}
               </button>
             )
           }
@@ -58,11 +74,10 @@ export function MediaVersionSwitcher({
               key={version.id}
               to={`/play/${version.id}`}
               state={{ from: `/media/${media.id}` }}
-              className={`rounded-xl border px-3 py-1.5 text-xs font-semibold transition ${className}`}
-              title={version.path}
+              className={`rounded-xl border px-3 py-1.5 text-xs font-semibold transition ${btnClass}`}
+              title={version.path || version.strm_url}
             >
-              {label}
-              {active ? ' · 当前' : ''}
+              {content}
             </Link>
           )
         })}

web/src/pages/LibraryPage.tsx

@@ -5,7 +5,7 @@ import { motion } from 'framer-motion'
 import { historyAPI } from '../api/history'
 import type { Media } from '../types'
 import { useAuthStore } from '../stores/auth'
-import type { SeriesCard } from '../utils/groupSeries'
+import { isTheatricalFeature, type SeriesCard } from '../utils/groupSeries'
 import {
   sortMediaList,
   sortSeriesList,
@@ -150,6 +150,9 @@ export function LibraryPage() {
     setSelectedSeason,
     onClearSeriesState: () => setSeriesMetadataEditOpen(false),
   })
+  const selectedSeriesScrapeMedia = selectedSeriesEpisodes.find((media) => !isTheatricalFeature(media))
+    ?? selectedSeries?.rep
+    ?? null
 
   const {
     scraping,
@@ -287,6 +290,7 @@ export function LibraryPage() {
         onOrganize={handleSeriesOrganize}
         onDelete={handleSeriesDelete}
         onSeasonChange={setSelectedSeason}
+        onManualScrapeMedia={setManualMovie}
       />
 
       <LibraryPageDialogs
@@ -296,6 +300,7 @@ export function LibraryPage() {
         seriesMetadataEditOpen={seriesMetadataEditOpen}
         manualMovie={manualMovie}
         selectedSeries={selectedSeries}
+        selectedSeriesScrapeMedia={selectedSeriesScrapeMedia}
         selectedSeriesMediaIDs={selectedSeriesMediaIDs}
         libraryType={library?.type}
         scrapeEpisodeArtwork={scrapeEpisodeArtwork}

web/src/pages/LibraryPageDialogs.tsx

@@ -2,7 +2,7 @@ import { ManualScrapeDialog } from '../components/ManualScrapeDialog'
 import { MetadataEditDialog } from '../components/MetadataEditDialog'
 import { ScrapeMetadataDialog } from '../components/ScrapeMetadataDialog'
 import type { Library, Media } from '../types'
-import { seriesTitle, type SeriesCard } from '../utils/groupSeries'
+import { isTheatricalFeature, seriesTitle, type SeriesCard } from '../utils/groupSeries'
 
 type LibraryPageDialogsProps = {
   scrapeDialogOpen: boolean
@@ -11,6 +11,7 @@ type LibraryPageDialogsProps = {
   seriesMetadataEditOpen: boolean
   manualMovie: Media | null
   selectedSeries: SeriesCard | null
+  selectedSeriesScrapeMedia: Media | null
   selectedSeriesMediaIDs: string[]
   libraryType?: string
   scrapeEpisodeArtwork: boolean
@@ -29,6 +30,7 @@ export function LibraryPageDialogs({
   seriesMetadataEditOpen,
   manualMovie,
   selectedSeries,
+  selectedSeriesScrapeMedia,
   selectedSeriesMediaIDs,
   libraryType,
   scrapeEpisodeArtwork,
@@ -53,10 +55,10 @@ export function LibraryPageDialogs({
       />
       <ManualScrapeDialog
         open={manualSeriesScrapeOpen}
-        media={selectedSeries?.rep ?? null}
+        media={selectedSeriesScrapeMedia}
         mediaIds={selectedSeriesMediaIDs}
         defaultQuery={selectedSeriesTitle}
-        mediaType={selectedSeries ? scrapeMediaType(libraryType, selectedSeries.rep) : 'tv'}
+        mediaType="tv"
         scopeLabel={selectedSeriesTitle || '当前剧集'}
         episodeArtwork={scrapeEpisodeArtwork}
         onClose={onCloseManualSeriesScrape}
@@ -86,6 +88,9 @@ export function LibraryPageDialogs({
 }
 
 function scrapeMediaType(libraryType: string | undefined, media: Media): string {
+  if (isTheatricalFeature(media)) {
+    return 'movie'
+  }
   if ((media.season_num ?? 0) > 0 || (media.episode_num ?? 0) > 0) {
     return 'tv'
   }

web/src/pages/LibrarySeriesDetailHeader.tsx

@@ -6,11 +6,10 @@ import { imageURL } from '../api/client'
 import { ExternalPlayerButton } from '../components/ExternalPlayerButton'
 import { MediaFavouriteButton } from '../components/MediaFavouriteButton'
 import type { Media } from '../types'
-import { seriesTitle, type SeriesCard } from '../utils/groupSeries'
+import { isTheatricalFeature, seriesTitle, type SeriesCard } from '../utils/groupSeries'
 
 type LibrarySeriesDetailHeaderProps = {
   series: SeriesCard
-  visibleEpisodes: Media[]
   allEpisodes: Media[]
   playbackFrom: string
   isAdmin: boolean
@@ -31,7 +30,6 @@ type LibrarySeriesDetailHeaderProps = {
 
 export function LibrarySeriesDetailHeader({
   series,
-  visibleEpisodes,
   allEpisodes,
   playbackFrom,
   isAdmin,
@@ -49,7 +47,9 @@ export function LibrarySeriesDetailHeader({
   onOrganize,
   onDelete,
 }: LibrarySeriesDetailHeaderProps) {
-  const firstEpisode = firstPlayableEpisode(visibleEpisodes.length > 0 ? visibleEpisodes : allEpisodes)
+  const tvEpisodes = allEpisodes.filter((media) => !isTheatricalFeature(media))
+  const theatricalCount = allEpisodes.length - tvEpisodes.length
+  const firstEpisode = firstPlayableEpisode(tvEpisodes)
 
   return (
     <>
@@ -61,7 +61,9 @@ export function LibrarySeriesDetailHeader({
         <h2 className="truncate font-display text-2xl font-bold text-ink-600">
           {seriesTitle(series.rep)}
         </h2>
-        <span className="text-sm text-sand-500">共 {series.count} 集</span>
+        <span className="text-sm text-sand-500">
+          共 {tvEpisodes.length} 集{theatricalCount > 0 ? ` · ${theatricalCount} 部剧场版` : ''}
+        </span>
       </div>
 
       <div className="flex flex-col gap-6 sm:flex-row">
@@ -115,7 +117,7 @@ export function LibrarySeriesDetailHeader({
                 </button>
                 <button onClick={onManualScrape} disabled={!!seriesToolBusy} className="btn-outline px-3.5 py-2 text-xs gap-1.5">
                   <Search size={13} className="text-[#c9954a]" />
-                  <span>手动匹配整剧</span>
+                  <span>{theatricalCount > 0 ? '手动匹配 TV 版' : '手动匹配整剧'}</span>
                 </button>
                 <button onClick={onMetadataEdit} disabled={!!seriesToolBusy} className="btn-outline px-3.5 py-2 text-xs gap-1.5">
                   <Pencil size={13} />

web/src/pages/LibrarySeriesDetailSection.tsx

@@ -33,6 +33,7 @@ type LibrarySeriesDetailSectionProps = {
   onOrganize: () => void
   onDelete: () => void
   onSeasonChange: (season: number) => void
+  onManualScrapeMedia: (media: Media) => void
 }
 
 export function LibrarySeriesDetailSection({
@@ -58,6 +59,7 @@ export function LibrarySeriesDetailSection({
   onOrganize,
   onDelete,
   onSeasonChange,
+  onManualScrapeMedia,
 }: LibrarySeriesDetailSectionProps) {
   return (
     <AnimatePresence mode="wait">
@@ -70,7 +72,6 @@ export function LibrarySeriesDetailSection({
         >
           <LibrarySeriesDetailHeader
             series={selectedSeries}
-            visibleEpisodes={visibleEpisodes}
             allEpisodes={allEpisodes}
             playbackFrom={playbackFrom}
             isAdmin={isAdmin}
@@ -95,7 +96,9 @@ export function LibrarySeriesDetailSection({
             selectedSeason={selectedSeason}
             visibleEpisodes={visibleEpisodes}
             playbackFrom={playbackFrom}
+            isAdmin={isAdmin}
             onSeasonChange={onSeasonChange}
+            onManualScrape={onManualScrapeMedia}
           />
         </motion.div>
       )}
@@ -109,7 +112,9 @@ type LibrarySeriesEpisodesPanelProps = {
   selectedSeason: number | null
   visibleEpisodes: Media[]
   playbackFrom: string
+  isAdmin: boolean
   onSeasonChange: (season: number) => void
+  onManualScrape: (media: Media) => void
 }
 
 function LibrarySeriesEpisodesPanel({
@@ -118,7 +123,9 @@ function LibrarySeriesEpisodesPanel({
   selectedSeason,
   visibleEpisodes,
   playbackFrom,
+  isAdmin,
   onSeasonChange,
+  onManualScrape,
 }: LibrarySeriesEpisodesPanelProps) {
   return (
     <div className="space-y-6">
@@ -128,7 +135,9 @@ function LibrarySeriesEpisodesPanel({
         selectedSeason={selectedSeason}
         visibleEpisodes={visibleEpisodes}
         playbackFrom={playbackFrom}
+        isAdmin={isAdmin}
         onSeasonChange={onSeasonChange}
+        onManualScrape={onManualScrape}
       />
     </div>
   )

web/src/pages/LibrarySeriesEpisodes.tsx

@@ -1,10 +1,10 @@
 import { Link } from 'react-router-dom'
-import { Play } from 'lucide-react'
+import { Play, Search } from 'lucide-react'
 
 import { imageURL } from '../api/client'
 import { ExternalPlayerButton } from '../components/ExternalPlayerButton'
 import type { Media } from '../types'
-import { seriesTitleFromPath } from '../utils/groupSeries'
+import { isTheatricalFeature, seriesTitleFromPath, THEATRICAL_SEASON } from '../utils/groupSeries'
 import { formatSize } from './libraryPageModel'
 
 type SeasonGroup = {
@@ -18,7 +18,9 @@ type LibrarySeriesEpisodesProps = {
   selectedSeason: number | null
   visibleEpisodes: Media[]
   playbackFrom: string
+  isAdmin?: boolean
   onSeasonChange: (season: number) => void
+  onManualScrape?: (media: Media) => void
 }
 
 export function LibrarySeriesEpisodes({
@@ -27,7 +29,9 @@ export function LibrarySeriesEpisodes({
   selectedSeason,
   visibleEpisodes,
   playbackFrom,
+  isAdmin = false,
   onSeasonChange,
+  onManualScrape,
 }: LibrarySeriesEpisodesProps) {
   if (loading) {
     return (
@@ -53,14 +57,14 @@ export function LibrarySeriesEpisodes({
                 : 'border-sand-200 bg-white text-ink-100 hover:border-brand-200 hover:text-brand-600')
             }
           >
-            {season === 0 ? '特别篇' : `第 ${season} 季`} · {episodes.length} 集
+            {seasonLabel(season)} · {episodes.length} {season === THEATRICAL_SEASON ? '部' : '集'}
           </button>
         ))}
       </div>
 
       <div>
         <h3 className="mb-3 font-display text-lg font-semibold text-ink-600">
-          {displaySeason === 0 ? '特别篇' : `第 ${displaySeason} 季`}
+          {seasonLabel(displaySeason)}
         </h3>
         <div className="grid grid-cols-1 gap-2.5 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
           {visibleEpisodes.map((ep) => {
@@ -107,7 +111,20 @@ export function LibrarySeriesEpisodes({
                     </p>
                   </div>
                 </Link>
-                <ExternalPlayerButton mediaId={ep.id} label="外部" compact />
+                <div className="flex shrink-0 items-center gap-1">
+                  {isAdmin && onManualScrape && isTheatricalFeature(ep) && (
+                    <button
+                      type="button"
+                      onClick={() => onManualScrape(ep)}
+                      className="btn-outline !px-2 !py-1.5 text-[11px]"
+                      title="手动匹配剧场版"
+                    >
+                      <Search size={12} />
+                      匹配
+                    </button>
+                  )}
+                  <ExternalPlayerButton mediaId={ep.id} label="外部" compact />
+                </div>
               </div>
             )
           })}
@@ -117,6 +134,12 @@ export function LibrarySeriesEpisodes({
   )
 }
 
+function seasonLabel(season: number): string {
+  if (season === 0) return '特别篇'
+  if (season === THEATRICAL_SEASON) return '剧场版'
+  return `第 ${season} 季`
+}
+
 function episodeDisplayTitle(ep: Media, siblings: Media[]): string {
   let mainTitle = ''
   const epTitle = ep.episode_title?.trim()

web/src/pages/PlayerPage.tsx

@@ -237,8 +237,22 @@ export function PlayerPage() {
         // 404 / 无权限等：给出可见错误提示，避免永久「加载中」
         setLoadError(`无法加载该媒体：${apiErrorMessage(err)}`)
       })
+    return () => {
+      cancelled = true
+    }
+  }, [id, modeParam, directOnly])
+
+  // Wire up the actual <video> element when we know the mode.
+  // Depend on media.id (not the media object): refreshing duration after
+  // MANIFEST_PARSED must not remount HLS or it storms EnsureJob / DELETE.
+  const mediaId = media?.id
+
+  // 直连播放只发现外挂字幕；只有 HLS 模式需要探测可烧录的内嵌字幕。
+  useEffect(() => {
+    if (!mediaId) return
+    let cancelled = false
     subtitlesAPI
-      .list(id)
+      .list(mediaId, mode === 'hls')
       .then((tracks) => {
         if (cancelled) return
         const list = tracks ?? []
@@ -249,16 +263,13 @@ export function PlayerPage() {
       .catch(() => {
         if (cancelled) return
         setSubs([])
+        setSubtitleIndex(-1)
       })
     return () => {
       cancelled = true
     }
-  }, [id, modeParam, directOnly])
+  }, [mediaId, mode])
 
-  // Wire up the actual <video> element when we know the mode.
-  // Depend on media.id (not the media object): refreshing duration after
-  // MANIFEST_PARSED must not remount HLS or it storms EnsureJob / DELETE.
-  const mediaId = media?.id
   const selectedSubtitle = subtitleIndex >= 0 ? subs[subtitleIndex] : undefined
   const burnedSubtitleStream =
     selectedSubtitle?.delivery === 'burn' ? selectedSubtitle.stream_index : undefined

web/src/pages/useLibrarySeriesSelection.ts

@@ -1,7 +1,7 @@
 import { useEffect, useMemo } from 'react'
 
 import type { Media } from '../types'
-import { getSeriesKey, type SeriesCard } from '../utils/groupSeries'
+import { getSeriesKey, isTheatricalFeature, THEATRICAL_SEASON, type SeriesCard } from '../utils/groupSeries'
 
 type SeasonEpisodes = {
   season: number
@@ -47,7 +47,9 @@ export function useLibrarySeriesSelection({
       : sourceItems.filter((m) => getSeriesKey(m) === selectedSeries.key)
     const seasons = new Map<number, Media[]>()
     for (const ep of eps) {
-      const s = ep.episode_num > 0 ? (ep.season_num ?? 0) : (ep.season_num || 1)
+      const s = isTheatricalFeature(ep)
+        ? THEATRICAL_SEASON
+        : ep.episode_num > 0 ? (ep.season_num ?? 0) : (ep.season_num || 1)
       if (!seasons.has(s)) seasons.set(s, [])
       seasons.get(s)!.push(ep)
     }
@@ -55,7 +57,7 @@ export function useLibrarySeriesSelection({
       list.sort((a, b) => (a.episode_num || 0) - (b.episode_num || 0))
     }
     return Array.from(seasons.entries())
-      .sort(([a], [b]) => a - b)
+      .sort(([a], [b]) => seasonSortOrder(a) - seasonSortOrder(b))
       .map(([season, episodes]) => ({ season, episodes }))
   }, [isSeriesLibrary, selectedSeries, items, seriesEpisodeItems])
 
@@ -70,7 +72,7 @@ export function useLibrarySeriesSelection({
   )
 
   const selectedSeriesMediaIDs = useMemo(
-    () => selectedSeriesEpisodes.map((ep) => ep.id),
+    () => selectedSeriesEpisodes.filter((ep) => !isTheatricalFeature(ep)).map((ep) => ep.id),
     [selectedSeriesEpisodes],
   )
 
@@ -128,3 +130,9 @@ export function useLibrarySeriesSelection({
     clearSelectedSeries,
   }
 }
+
+function seasonSortOrder(season: number): number {
+  if (season === 0) return -2
+  if (season === THEATRICAL_SEASON) return -1
+  return season
+}

web/src/utils/groupSeries.ts

@@ -38,6 +38,8 @@ export type SeriesCard = {
   last_added_at?: string
 }
 
+export const THEATRICAL_SEASON = -1
+
 export function getSeriesKey(media: Media): string {
   return compactSeriesKey(getSeriesRawKey(media))
 }
@@ -92,14 +94,26 @@ export function isEpisodeLike(media: Media): boolean {
 const EPISODIC_PATH_RE =
   /[\\/](?:电视剧|剧集|连续剧|短剧|国产剧|国剧|大陆剧|华语剧|国产电视剧|大陆电视剧|华语电视剧|欧美剧|欧美电视剧|美剧|英剧|日韩剧|日韩电视剧|日剧|韩剧|港剧|台剧|港台剧|泰剧|综艺|纪录片|儿童|动漫|番剧|国漫|日番|韩漫|美漫|欧美动漫|欧美动画|其他动漫|anime|tv|series|shows?|season[\s._-]*\d|s\d{1,2}(?:[\s._-]|[\\/])|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)[\\/]/i
 
+const THEATRICAL_TITLE_RE =
+  /(?:剧场版|劇場版|动画电影|動畫電影|电影版|電影版|\bthe\s+movie\b|\bmovie\s*\d{1,2}\b)/i
+
+const THEATRICAL_FOLDER_RE =
+  /[\\/](?:剧场版|劇場版|动画电影|動畫電影)[\\/]/
+
 const SEASON_FOLDER_RE =
-  /^(?:s\d{1,2}|season[\s._-]*\d{1,2}|第\s*[0-9一二三四五六七八九十百零两]+\s*季|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)$/i
+  /^(?:s\d{1,2}|season[\s._-]*\d{1,2}|第\s*[0-9一二三四五六七八九十百零两]+\s*季|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇|剧场版|劇場版|动画电影|動畫電影)$/i
 
 export function pathLooksEpisodic(media: Media): boolean {
   const path = (media.path || media.display_library_path || media.library_path || '')
   return EPISODIC_PATH_RE.test(path)
 }
 
+export function isTheatricalFeature(media: Media): boolean {
+  const path = media.path || ''
+  if (SERIES_FILE_EPISODE_RE.test(path)) return false
+  return THEATRICAL_TITLE_RE.test(`${media.title || ''} ${path}`) || THEATRICAL_FOLDER_RE.test(path)
+}
+
 export function isSeriesCard(card: SeriesCard): boolean {
   return (
     card.count > 1 ||

web/src/utils/mediaVersion.ts

@@ -1,33 +1,62 @@
 import type { Media } from '../types'
 
-/** 从路径 / strm URL 推断容器扩展名（mkv/mp4…）。 */
+const VIDEO_EXTENSIONS = new Set([
+  'mkv', 'mp4', 'm4v', 'avi', 'mov', 'webm', 'flv', 'wmv', 'ts', 'm2ts', 'mts', 'vob', 'rmvb', 'rm', 'iso',
+])
+
+export function isStrmMedia(media?: Media | null): boolean {
+  if (!media) return false
+  const path = (media.path || '').toLowerCase()
+  const strmUrl = (media.strm_url || '').toLowerCase()
+  return path.endsWith('.strm') || path.startsWith('cloud://') || Boolean(strmUrl.trim())
+}
+
+/** 从路径 / strm URL 推断真实视频容器扩展名（mkv/mp4…）。 */
 export function mediaVersionContainer(media: Media): string {
+  const explicit = (media.container || '').trim().toLowerCase().replace(/^\./, '')
+  if (explicit && explicit !== 'strm' && VIDEO_EXTENSIONS.has(explicit)) {
+    return explicit
+  }
+
   const path = (media.path || '').replace(/\\/g, '/')
   const base = path.split('/').pop() || ''
   const ext = base.includes('.') ? base.slice(base.lastIndexOf('.')).toLowerCase() : ''
-  let name = ext ? base.slice(0, -ext.length) : base
+  const name = ext ? base.slice(0, -ext.length) : base
+
   if (ext === '.strm') {
-    const second = name.includes('.') ? name.slice(name.lastIndexOf('.')).toLowerCase() : ''
-    if (second && second !== '.strm') {
-      return second.replace(/^\./, '')
+    const second = name.includes('.') ? name.slice(name.lastIndexOf('.')).toLowerCase().replace(/^\./, '') : ''
+    if (second && VIDEO_EXTENSIONS.has(second)) {
+      return second
     }
+
     const strm = (media.strm_url || '').toLowerCase()
-    const marker = '/video.'
-    const idx = strm.lastIndexOf(marker)
-    if (idx >= 0) {
-      let rest = strm.slice(idx + marker.length)
-      const end = rest.search(/[?#&/]/)
-      if (end >= 0) rest = rest.slice(0, end)
-      rest = rest.replace(/^\./, '').trim()
-      if (rest) return rest
+    if (strm) {
+      // 1. /video.mkv 或 /video.mp4 模式
+      const marker = '/video.'
+      const idx = strm.lastIndexOf(marker)
+      if (idx >= 0) {
+        let rest = strm.slice(idx + marker.length)
+        const end = rest.search(/[?#&/]/)
+        if (end >= 0) rest = rest.slice(0, end)
+        rest = rest.replace(/^\./, '').trim()
+        if (rest && VIDEO_EXTENSIONS.has(rest)) return rest
+      }
+
+      // 2. 从 query 参数（如 ref=/movies/abc.mkv 或 path=...）或 pathname 里匹配扩展名
+      const match = strm.match(/\.(mkv|mp4|m4v|avi|mov|webm|flv|wmv|ts|m2ts|iso)(?=[?#&/]|$)/i)
+      if (match?.[1]) {
+        return match[1].toLowerCase()
+      }
     }
     return 'strm'
   }
-  return ext.replace(/^\./, '')
+
+  const cleanExt = ext.replace(/^\./, '')
+  return VIDEO_EXTENSIONS.has(cleanExt) ? cleanExt : cleanExt
 }
 
 function formatSize(bytes: number): string {
-  if (!bytes || bytes < 1024) return bytes ? `${bytes} B` : ''
+  if (!bytes || bytes < 1024) return ''
   const units = ['KB', 'MB', 'GB', 'TB']
   let value = bytes
   let unit = -1
@@ -38,19 +67,99 @@ function formatSize(bytes: number): string {
   return `${value.toFixed(1)} ${units[unit]}`
 }
 
-/** 版本切换展示名：分辨率 · 容器 · 编码 · 体积，缺省回退文件名。 */
+/** 从文件名/路径中提取质量或规格标签（如 4K, 2160p, REMUX, HDR, 1080p, 60fps 等） */
+function extractQualityKeywords(text: string): string[] {
+  const result: string[] = []
+  const upper = text.toUpperCase()
+
+  // 分辨率
+  if (/\b(4K|2160P|UHD)\b/i.test(upper)) result.push('4K')
+  else if (/\b(1080P|FHD)\b/i.test(upper)) result.push('1080p')
+  else if (/\b(720P|HD)\b/i.test(upper)) result.push('720p')
+
+  // 格式/版本规格
+  if (/\bREMUX\b/i.test(upper)) result.push('REMUX')
+  else if (/\b(BLURAY|BLU-RAY|BD)\b/i.test(upper)) result.push('BluRay')
+  else if (/\b(WEB-?DL|WEBRIP)\b/i.test(upper)) result.push('WEB-DL')
+
+  // 动态范围/画质技术
+  if (/\b(DV|DOVI|DOLBY[\s._-]?VISION)\b/i.test(upper)) result.push('DV')
+  if (/\b(HDR10\+|HDR10PLUS)\b/i.test(upper)) result.push('HDR10+')
+  else if (/\bHDR\b/i.test(upper) && !result.includes('DV')) result.push('HDR')
+
+  // 帧率
+  if (/\b(60FPS|120FPS)\b/i.test(upper)) {
+    const fpsMatch = upper.match(/\b(60FPS|120FPS)\b/i)
+    if (fpsMatch) result.push(fpsMatch[1])
+  }
+
+  return result
+}
+
+/** 清理文件名以用作干净的兜底展示 */
+function cleanFallbackFilename(raw: string): string {
+  let name = raw.replace(/\\/g, '/').split('/').pop() || ''
+  // 去除 .strm 及前缀扩展名
+  name = name.replace(/\.strm$/i, '')
+  name = name.replace(/\.(mkv|mp4|m4v|avi|mov|webm|flv|wmv|ts|iso)$/i, '')
+  // 替换连续的点或下划线为空格
+  name = name.replace(/[._]+/g, ' ').trim()
+  return name
+}
+
+/** 版本切换展示名：分辨率 · 容器 · 编码 · 体积 / 规格 / 来源标签。 */
 export function mediaVersionLabel(media: Media): string {
+  const isStrm = isStrmMedia(media)
   const parts: string[] = []
-  if (media.height > 0) parts.push(`${media.height}p`)
-  else if (media.width > 0) parts.push(`${media.width}w`)
+
+  // 1. 分辨率（优先从媒体元数据获取，其次从路径中提取）
+  if (media.height > 0) {
+    if (media.height >= 2100) parts.push('4K')
+    else parts.push(`${media.height}p`)
+  } else if (media.width > 0) {
+    if (media.width >= 3800) parts.push('4K')
+    else parts.push(`${media.width}w`)
+  }
+
+  // 2. 容器
   const container = mediaVersionContainer(media)
-  if (container && container !== 'strm') parts.push(container.toUpperCase())
-  if (media.video_codec?.trim()) parts.push(media.video_codec.trim().toUpperCase())
-  const size = formatSize(media.size_bytes)
-  if (size) parts.push(size)
-  if (parts.length > 0) return parts.join(' · ')
-  const base = (media.path || '').replace(/\\/g, '/').split('/').pop()
-  return base || media.title || media.id
+  if (container && container !== 'strm') {
+    parts.push(container.toUpperCase())
+  }
+
+  // 3. 视频编码
+  if (media.video_codec?.trim()) {
+    parts.push(media.video_codec.trim().toUpperCase())
+  }
+
+  // 4. 从文件名/路径补充规格特征（针对 STRM 缺乏探测数据时的关键画质提示）
+  const pathKeywords = extractQualityKeywords(`${media.path || ''} ${media.strm_url || ''}`)
+  for (const kw of pathKeywords) {
+    // 避免重复（如已经有了 4K / 1080p）
+    if (!parts.some((p) => p.toUpperCase() === kw.toUpperCase())) {
+      parts.push(kw)
+    }
+  }
+
+  // 5. 文件大小：过滤掉本地 STRM 占位小文件（< 1MB 的 STRM 索引通常不是真实视频大小）
+  const isPlaceholderSize = isStrm && media.size_bytes > 0 && media.size_bytes < 1024 * 1024
+  if (media.size_bytes > 0 && !isPlaceholderSize) {
+    const size = formatSize(media.size_bytes)
+    if (size) parts.push(size)
+  }
+
+  // 6. 如果仍然没有解析出足够特征，标记来源（云盘 / STRM）
+  if (isStrm && !parts.some((p) => ['4K', '1080P', '720P', 'REMUX', 'WEB-DL', 'MKV', 'MP4'].includes(p.toUpperCase()))) {
+    parts.push('云端直链')
+  }
+
+  if (parts.length > 0) {
+    return parts.join(' · ')
+  }
+
+  // 兜底：使用清理后的文件名
+  const cleaned = cleanFallbackFilename(media.path || '')
+  return cleaned || media.title || media.id
 }
 
 export function mediaVersionsOf(media: Media | null | undefined): Media[] {