Merge pull request #19 from truewhile/main

拉取最新代码

.github/workflows/Auto-docker-publish.yml

@@ -264,42 +264,3 @@ jobs:
           if [ -f "$TAR" ]; then
             for i in 1 2 3; do gh release upload "$RELEASE_TAG" "$TAR" --clobber && break || sleep 5; done
           fi
-
-  deploy:
-    name: Deploy to Server
-    needs: [version-and-publish]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          password: ${{ secrets.SERVER_PASSWORD }}
-          port: ${{ secrets.SERVER_PORT }}
-          script: |
-            set -e
-            echo "==== 开始部署 MeBox ===="
-            cd /root/dockerData/mebox
-
-            # 判断 compose 命令版本兼容性（docker compose 或 docker-compose）
-            if docker compose version >/dev/null 2>&1; then
-              COMPOSE_CMD="docker compose"
-            elif command -v docker-compose >/dev/null 2>&1; then
-              COMPOSE_CMD="docker-compose"
-            else
-              echo "错误: 未找到 docker compose 或 docker-compose"
-              exit 1
-            fi
-
-            echo "正在拉取最新镜像..."
-            $COMPOSE_CMD pull
-
-            echo "正在重启服务..."
-            $COMPOSE_CMD up -d
-
-            echo "清理旧的无用镜像..."
-            docker image prune -f
-
-            echo "==== 部署完成并已启动 ===="
-

.github/workflows/docker-publish.yml

@@ -61,41 +61,3 @@ jobs:
             VERSION=${{ env.RELEASE_VERSION }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
-  deploy:
-    name: Deploy to Server
-    needs: [docker]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          password: ${{ secrets.SERVER_PASSWORD }}
-          port: ${{ secrets.SERVER_PORT }}
-          script: |
-            set -e
-            echo "==== 开始部署 MeBox ===="
-            cd /root/dockerData/mebox
-
-            if docker compose version >/dev/null 2>&1; then
-              COMPOSE_CMD="docker compose"
-            elif command -v docker-compose >/dev/null 2>&1; then
-              COMPOSE_CMD="docker-compose"
-            else
-              echo "错误: 未找到 docker compose 或 docker-compose"
-              exit 1
-            fi
-
-            echo "正在拉取最新镜像..."
-            $COMPOSE_CMD pull
-
-            echo "正在重启服务..."
-            $COMPOSE_CMD up -d
-
-            echo "清理旧的无用镜像..."
-            docker image prune -f
-
-            echo "==== 部署完成并已启动 ===="
-

VERSION

@@ -1 +1 @@
-0.0.86
+0.0.81

internal/handler/media.go

@@ -452,114 +452,55 @@ func updateMediaMetadataHandler(svc *service.Container) gin.HandlerFunc {
 	}
 }
 
-func paginateSlice[T any](items []T, page, size int) []T {
-	if page < 1 {
-		page = 1
-	}
-	if size <= 0 {
-		size = 50
-	}
-	if len(items) == 0 {
-		return []T{}
-	}
-	start := (page - 1) * size
-	if start >= len(items) {
-		return []T{}
-	}
-	end := start + size
-	if end > len(items) {
-		end = len(items)
-	}
-	return items[start:end]
-}
-
 func searchMediaHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		ctx := c.Request.Context()
 		q := c.Query("q")
-		visibility := mediaVisibilityForRequest(c, svc)
 		groupVersions := c.DefaultQuery("group_versions", "1") != "0"
-
-		fetchRemote := func(limit int) []model.Media {
-			if svc.EmbyRemote == nil || strings.TrimSpace(q) == "" {
-				return nil
-			}
-			remoteItems, _ := svc.EmbyRemote.RemoteSearchMedia(ctx, q, limit, visibility)
-			return remoteItems
-		}
-
 		if c.Query("page") != "" || c.Query("page_size") != "" {
 			page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
 			size, _ := strconv.Atoi(c.DefaultQuery("page_size", "50"))
 			if !groupVersions {
-				localItems, _, err := svc.Media.SearchMediaVisiblePage(ctx, q, 1, 50000, visibility)
+				items, total, err := svc.Media.SearchMediaVisiblePage(c.Request.Context(), q, page, size, mediaVisibilityForRequest(c, svc))
 				if err != nil {
 					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 					return
 				}
-				remoteItems := fetchRemote(size * 2)
-				all := append(localItems, remoteItems...)
-				paged := paginateSlice(all, page, size)
 				c.JSON(http.StatusOK, gin.H{
-					"items":     paged,
-					"total":     len(all),
+					"items":     items,
+					"total":     total,
 					"page":      page,
 					"page_size": size,
 				})
 				return
 			}
-			localItems, err := svc.Media.SearchMediaVisible(ctx, q, 50000, visibility)
+			items, total, err := svc.Media.SearchMediaVisiblePageGrouped(c.Request.Context(), q, page, size, mediaVisibilityForRequest(c, svc))
 			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
-			remoteItems := fetchRemote(size * 2)
-			all := append(localItems, remoteItems...)
-			grouped := service.GroupMediaVersions(all)
-			paged := service.PaginateMediaItems(grouped, page, size)
 			c.JSON(http.StatusOK, gin.H{
-				"items":     paged,
-				"total":     len(grouped),
+				"items":     items,
+				"total":     total,
 				"page":      page,
 				"page_size": size,
 			})
 			return
 		}
-
 		limit, _ := strconv.Atoi(c.DefaultQuery("limit", "50"))
-		if limit <= 0 {
-			limit = 50
-		}
 		if !groupVersions {
-			localItems, err := svc.Media.SearchMediaVisible(ctx, q, limit, visibility)
+			items, err := svc.Media.SearchMediaVisible(c.Request.Context(), q, limit, mediaVisibilityForRequest(c, svc))
 			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				return
 			}
-			remoteItems := fetchRemote(limit)
-			all := append(localItems, remoteItems...)
-			if len(all) > limit {
-				all = all[:limit]
-			}
-			if all == nil {
-				all = []model.Media{}
-			}
-			c.JSON(http.StatusOK, gin.H{"items": all})
+			c.JSON(http.StatusOK, gin.H{"items": items})
 			return
 		}
-
-		localItems, err := svc.Media.SearchMediaVisible(ctx, q, 50000, visibility)
+		items, err := svc.Media.SearchMediaVisibleGrouped(c.Request.Context(), q, limit, mediaVisibilityForRequest(c, svc))
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
-		remoteItems := fetchRemote(limit)
-		all := append(localItems, remoteItems...)
-		grouped := service.GroupMediaVersions(all)
-		items := service.FirstMediaItems(grouped, limit)
-		if items == nil {
-			items = []service.MediaItem{}
-		}
 		c.JSON(http.StatusOK, gin.H{"items": items})
 	}
 }

internal/handler/media_test.go

@@ -436,180 +436,8 @@ func TestEmptyLibraryListsReturnEmptyArraysNotNull(t *testing.T) {
 		if strings.Contains(body, `"items":null`) {
 			t.Fatalf("%s: empty library returned items:null (crashes frontend): %s", tc.name, body)
 		}
-			if !strings.Contains(body, `"items":[]`) {
-				t.Fatalf("%s: expected items:[] for empty library, got %s", tc.name, body)
-			}
-		}
-	}
-
-func TestSearchMediaHandlerIncludesEmbyRemote(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		q := r.URL.Query()
-		if q.Get("SearchTerm") == "碧蓝之海" {
-			w.Header().Set("Content-Type", "application/json")
-			_ = json.NewEncoder(w).Encode(map[string]any{
-				"TotalRecordCount": 1,
-				"Items": []map[string]any{
-					{
-						"Id":             "156030",
-						"Name":           "碧蓝之海",
-						"Type":           "Series",
-						"ProductionYear": 2018,
-					},
-				},
-			})
-			return
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"TotalRecordCount": 0,
-			"Items":            []map[string]any{},
-		})
-	}))
-	defer server.Close()
-
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.AutoMigrate(&model.Library{}, &model.Media{}, &model.StrmAccount{}, &model.EmbyMount{}, &model.Setting{}, &model.User{}, &model.PlayProfile{}); err != nil {
-		t.Fatal(err)
-	}
-	repos := repository.New(db)
-	adminUser := model.User{
-		Base:     model.Base{ID: "user-1"},
-		Username: "admin",
-		Role:     "admin",
-	}
-	_ = repos.DB.Create(&adminUser).Error
-
-	localLib := model.Library{Name: "本地电影", Path: "/media/movies", Type: "movie", Enabled: true}
-	if err := repos.Library.Create(t.Context(), &localLib); err != nil {
-		t.Fatal(err)
-	}
-	localMedia := model.Media{
-		Base:      model.Base{ID: "local-1"},
-		LibraryID: localLib.ID,
-		Title:     "流浪地球",
-		Year:      2019,
-	}
-	if err := repos.DB.Create(&localMedia).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	rawCfg, _ := json.Marshal(map[string]string{"url": server.URL, "token": "fake-token"})
-	acct := model.StrmAccount{
-		Base:     model.Base{ID: "acct-1"},
-		Name:     "远程Emby",
-		Provider: model.StrmProviderEmbyRemote,
-		Config:   string(rawCfg),
-		Enabled:  true,
-	}
-	if err := repos.StrmAccount.Create(t.Context(), &acct); err != nil {
-		t.Fatal(err)
-	}
-	mount := model.EmbyMount{
-		Base:           model.Base{ID: "mount-1"},
-		AccountID:      acct.ID,
-		RemoteViewID:   "view-1",
-		RemoteViewName: "动漫",
-		CollectionType: "tvshows",
-		Enabled:        true,
-	}
-	if err := repos.EmbyMount.Create(t.Context(), &mount); err != nil {
-		t.Fatal(err)
-	}
-
-	crypto := service.NewCryptoService("", zap.NewNop())
-	remoteSvc := service.NewEmbyRemoteService(&config.Config{}, zap.NewNop(), repos, crypto)
-	mediaSvc := service.NewMediaService(&config.Config{}, zap.NewNop(), repos)
-
-	svc := &service.Container{
-		Repo:       repos,
-		Media:      mediaSvc,
-		EmbyRemote: remoteSvc,
-	}
-
-	// 1. 搜索远程挂载媒体（碧蓝之海）
-	{
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-		c.Set(middleware.CtxUserID, "user-1")
-		c.Set(middleware.CtxUserRole, "admin")
-		c.Request = httptest.NewRequest(http.MethodGet, "/api/media?q=碧蓝之海&limit=8", nil)
-		searchMediaHandler(svc)(c)
-
-		if w.Code != http.StatusOK {
-			t.Fatalf("search status=%d, body=%s", w.Code, w.Body.String())
-		}
-		var res struct {
-			Items []service.MediaItem `json:"items"`
-		}
-		if err := json.Unmarshal(w.Body.Bytes(), &res); err != nil {
-			t.Fatal(err)
-		}
-		if len(res.Items) != 1 {
-			t.Fatalf("expected 1 item, got %d", len(res.Items))
-		}
-		if res.Items[0].Title != "碧蓝之海" {
-			t.Fatalf("expected Title '碧蓝之海', got %q", res.Items[0].Title)
-		}
-		expectedID := service.EncodeEmbyRemoteID("mount-1", "156030")
-		if res.Items[0].ID != expectedID {
-			t.Fatalf("expected ID %q, got %q", expectedID, res.Items[0].ID)
-		}
-	}
-
-	// 2. 搜索本地媒体（流浪地球）
-	{
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-		c.Set(middleware.CtxUserID, "user-1")
-		c.Set(middleware.CtxUserRole, "admin")
-		c.Request = httptest.NewRequest(http.MethodGet, "/api/media?q=流浪地球&limit=8", nil)
-		searchMediaHandler(svc)(c)
-
-		if w.Code != http.StatusOK {
-			t.Fatalf("search status=%d, body=%s", w.Code, w.Body.String())
-		}
-		var res struct {
-			Items []service.MediaItem `json:"items"`
-		}
-		if err := json.Unmarshal(w.Body.Bytes(), &res); err != nil {
-			t.Fatal(err)
-		}
-		if len(res.Items) != 1 {
-			t.Fatalf("expected 1 item, got %d", len(res.Items))
-		}
-		if res.Items[0].Title != "流浪地球" {
-			t.Fatalf("expected Title '流浪地球', got %q", res.Items[0].Title)
-		}
-	}
-
-	// 3. 搜索不存在的媒体
-	{
-		w := httptest.NewRecorder()
-		c, _ := gin.CreateTestContext(w)
-		c.Set(middleware.CtxUserID, "user-1")
-		c.Set(middleware.CtxUserRole, "admin")
-		c.Request = httptest.NewRequest(http.MethodGet, "/api/media?q=不存在的影片&limit=8", nil)
-		searchMediaHandler(svc)(c)
-
-		if w.Code != http.StatusOK {
-			t.Fatalf("search status=%d, body=%s", w.Code, w.Body.String())
-		}
-		var res struct {
-			Items []service.MediaItem `json:"items"`
-		}
-		if err := json.Unmarshal(w.Body.Bytes(), &res); err != nil {
-			t.Fatal(err)
-		}
-		if len(res.Items) != 0 {
-			t.Fatalf("expected 0 items, got %d", len(res.Items))
-		}
-		if strings.Contains(w.Body.String(), `"items":null`) {
-			t.Fatalf("expected items:[], got null: %s", w.Body.String())
+		if !strings.Contains(body, `"items":[]`) {
+			t.Fatalf("%s: expected items:[] for empty library, got %s", tc.name, body)
 		}
 	}
 }

internal/handler/search_extra.go

@@ -7,7 +7,6 @@ package handler
 import (
 	"net/http"
 	"strconv"
-	"strings"
 
 	"github.com/gin-gonic/gin"
 
@@ -17,26 +16,16 @@ import (
 // searchUnifiedHandler is the basic /api/search endpoint.
 func searchUnifiedHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		ctx := c.Request.Context()
 		q := c.Query("q")
 		limit, _ := strconv.Atoi(c.DefaultQuery("limit", "30"))
 		if limit <= 0 || limit > 200 {
 			limit = 30
 		}
-		visibility := mediaVisibilityForRequest(c, svc)
-		items, err := svc.Media.SearchMediaVisible(ctx, q, limit, visibility)
+		items, err := svc.Media.SearchMediaVisible(c.Request.Context(), q, limit, mediaVisibilityForRequest(c, svc))
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
-		if svc.EmbyRemote != nil && strings.TrimSpace(q) != "" {
-			if remoteItems, _ := svc.EmbyRemote.RemoteSearchMedia(ctx, q, limit, visibility); len(remoteItems) > 0 {
-				items = append(items, remoteItems...)
-				if len(items) > limit {
-					items = items[:limit]
-				}
-			}
-		}
 		c.JSON(http.StatusOK, gin.H{"items": items, "total": len(items)})
 	}
 }
@@ -47,26 +36,16 @@ func searchUnifiedHandler(svc *service.Container) gin.HandlerFunc {
 // them back. This keeps API parity without a giant query builder.
 func searchAdvancedHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		ctx := c.Request.Context()
 		q := c.Query("q")
 		limit, _ := strconv.Atoi(c.DefaultQuery("limit", "30"))
 		if limit <= 0 || limit > 200 {
 			limit = 30
 		}
-		visibility := mediaVisibilityForRequest(c, svc)
-		items, err := svc.Media.SearchMediaVisible(ctx, q, limit, visibility)
+		items, err := svc.Media.SearchMediaVisible(c.Request.Context(), q, limit, mediaVisibilityForRequest(c, svc))
 		if err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
-		if svc.EmbyRemote != nil && strings.TrimSpace(q) != "" {
-			if remoteItems, _ := svc.EmbyRemote.RemoteSearchMedia(ctx, q, limit, visibility); len(remoteItems) > 0 {
-				items = append(items, remoteItems...)
-				if len(items) > limit {
-					items = items[:limit]
-				}
-			}
-		}
 		c.JSON(http.StatusOK, gin.H{
 			"items": items,
 			"filters": gin.H{

internal/handler/system_meta.go

@@ -8,7 +8,6 @@ package handler
 import (
 	"net/http"
 	"runtime"
-	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -23,30 +22,26 @@ import (
 // without threading state through the container.
 var startedAt = time.Now()
 
-	func systemInfoHandler(svc *service.Container) gin.HandlerFunc {
-		return func(c *gin.Context) {
-			directOnly := false
-			if svc.Repo != nil && svc.Repo.Setting != nil {
-				if v, err := svc.Repo.Setting.Get(c.Request.Context(), service.PlaybackDirectOnlySettingKey); err == nil {
-					directOnly = service.ParseBoolSetting(v, false)
-				}
+func systemInfoHandler(svc *service.Container) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		directOnly := false
+		if svc.Repo != nil && svc.Repo.Setting != nil {
+			if v, err := svc.Repo.Setting.Get(c.Request.Context(), service.PlaybackDirectOnlySettingKey); err == nil {
+				directOnly = service.ParseBoolSetting(v, false)
 			}
-			version := svc.Version
-			if strings.TrimSpace(version) == "" {
-				version = "dev"
-			}
-			c.JSON(http.StatusOK, gin.H{
-				"name":             "MeBox",
-				"version":          version,
-				"go":               runtime.Version(),
-				"os":               runtime.GOOS,
-				"arch":             runtime.GOARCH,
-				"data_dir":         svc.Cfg.App.DataDir,
-				"cache_dir":        svc.Cfg.Cache.CacheDir,
-				"direct_play_only": directOnly,
-			})
 		}
+		c.JSON(http.StatusOK, gin.H{
+			"name":             "MeBox",
+			"version":          "0.1.0",
+			"go":               runtime.Version(),
+			"os":               runtime.GOOS,
+			"arch":             runtime.GOARCH,
+			"data_dir":         svc.Cfg.App.DataDir,
+			"cache_dir":        svc.Cfg.Cache.CacheDir,
+			"direct_play_only": directOnly,
+		})
 	}
+}
 
 func systemStatusHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {

internal/service/crypto.go

@@ -77,7 +77,7 @@ func (c *CryptoService) Encrypt(plain string) string {
 // Decrypt returns the plaintext for an encrypted value. Plaintext rows
 // (no prefix) are returned unchanged.
 func (c *CryptoService) Decrypt(value string) string {
-	if c == nil || value == "" || c.aead == nil {
+	if value == "" || c.aead == nil {
 		return value
 	}
 	if !strings.HasPrefix(value, encPrefix) {

internal/service/emby_remote_web.go

@@ -13,7 +13,6 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"go.uber.org/zap"
@@ -301,22 +300,11 @@ func (r *EmbyRemoteService) MapRemoteItemToMedia(ctx context.Context, mount *mod
 		media.SeasonNum = 0
 		media.EpisodeNum = 0
 	}
-		if mount != nil && strings.TrimSpace(mount.RemoteViewID) != "" {
-			libID := EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)
-			media.DisplayLibraryID = libID
-			media.LibraryID = libID
-			libName := strings.TrimSpace(mount.Name)
-			if libName == "" {
-				libName = strings.TrimSpace(mount.RemoteViewName)
-			}
-			if libName == "" && acct != nil {
-				libName = acct.Name
-			} else if acct != nil && acct.Name != "" && !strings.Contains(libName, acct.Name) {
-				libName = acct.Name + " · " + libName
-			}
-			media.LibraryName = libName
-			media.DisplayLibraryName = libName
-		}
+	if mount != nil && strings.TrimSpace(mount.RemoteViewID) != "" {
+		libID := EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)
+		media.DisplayLibraryID = libID
+		media.LibraryID = libID
+	}
 	return media
 }
 
@@ -514,136 +502,10 @@ func (r *EmbyRemoteService) RemoteLatestCards(ctx context.Context, mount *model.
 		m := r.MapRemoteItemToMedia(ctx, mount, acct, cfg, it)
 		cards = append(cards, SeriesCard{Key: m.ID, Rep: m, LinkMedia: m, Count: 0})
 	}
-		if r.cache != nil {
-			r.cache.SetJSON(ctx, cacheKey, cards, r.remoteMediaCacheTTL())
-		}
-		return cards, nil
+	if r.cache != nil {
+		r.cache.SetJSON(ctx, cacheKey, cards, r.remoteMediaCacheTTL())
 	}
-
-// RemoteSearchMedia 在全部启用的挂载库中并发搜索影视条目（Movie,Series），
-// 并将远程结果映射为 model.Media。遵循当前用户的 MediaVisibility 权限规则。
-func (r *EmbyRemoteService) RemoteSearchMedia(ctx context.Context, query string, limit int, visibility MediaVisibility) ([]model.Media, error) {
-	if r == nil {
-		return nil, nil
-	}
-	query = strings.TrimSpace(query)
-	if query == "" {
-		return nil, nil
-	}
-	if limit <= 0 {
-		limit = 50
-	} else if limit > maxMediaSearchLimit {
-		limit = maxMediaSearchLimit
-	}
-
-	mounts, err := r.ListMounts(ctx)
-	if err != nil || len(mounts) == 0 {
-		return nil, err
-	}
-
-	type mountTarget struct {
-		mount model.EmbyMount
-		acct  *model.StrmAccount
-		cfg   *EmbyRemoteConfig
-	}
-	var targets []mountTarget
-	for _, m := range mounts {
-		if !m.Enabled {
-			continue
-		}
-		libID := EncodeEmbyRemoteID(m.ID, m.RemoteViewID)
-		hidden := false
-		for _, hid := range visibility.HiddenLibraryIDs {
-			if hid == libID {
-				hidden = true
-				break
-			}
-		}
-		if hidden {
-			continue
-		}
-		if len(visibility.AllowedLibraryIDs) > 0 {
-			allowed := false
-			for _, aid := range visibility.AllowedLibraryIDs {
-				if aid == libID {
-					allowed = true
-					break
-				}
-			}
-			if !allowed {
-				continue
-			}
-		}
-
-		acct := r.AccountByID(ctx, m.AccountID)
-		if acct == nil {
-			continue
-		}
-		cfg, cfgErr := r.configOf(acct)
-		if cfgErr != nil {
-			continue
-		}
-		targets = append(targets, mountTarget{mount: m, acct: acct, cfg: cfg})
-	}
-	if len(targets) == 0 {
-		return nil, nil
-	}
-
-	searchCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-
-	sem := make(chan struct{}, 6)
-	var wg sync.WaitGroup
-	type searchResult struct {
-		items []model.Media
-	}
-	results := make([]searchResult, len(targets))
-	for i, t := range targets {
-		wg.Add(1)
-		go func(idx int, target mountTarget) {
-			defer wg.Done()
-			select {
-			case sem <- struct{}{}:
-				defer func() { <-sem }()
-			case <-searchCtx.Done():
-				return
-			}
-
-			q := url.Values{}
-			q.Set("ParentId", target.mount.RemoteViewID)
-			q.Set("Recursive", "true")
-			q.Set("SearchTerm", query)
-			q.Set("IncludeItemTypes", "Movie,Series")
-			q.Set("Fields", "Overview,Genres,ProviderIds,Path,SeriesPrimaryImage,MediaStreams,MediaSources,DateCreated,PremiereDate,ProductionYear,CommunityRating,CriticRating")
-			q.Set("Limit", strconv.Itoa(limit))
-			q.Set("StartIndex", "0")
-
-			var body struct {
-				Items []map[string]any `json:"Items"`
-			}
-			if err := r.doGet(searchCtx, target.acct, target.cfg, "/Users/"+url.PathEscape(r.remoteUserID(target.cfg))+"/Items", q, &body); err != nil {
-				if r.log != nil {
-					r.log.Warn("remote search failed",
-						zap.String("mount", target.mount.RemoteViewName), zap.Error(err))
-				}
-				return
-			}
-			medias := make([]model.Media, 0, len(body.Items))
-			for _, it := range body.Items {
-				RewriteEmbyRemoteIDs(it, target.mount.ID)
-				m := r.MapRemoteItemToMedia(searchCtx, &target.mount, target.acct, target.cfg, it)
-				medias = append(medias, m)
-			}
-			results[idx] = searchResult{items: medias}
-		}(i, t)
-	}
-	wg.Wait()
-
-	var out []model.Media
-	for _, res := range results {
-		out = append(out, res.items...)
-	}
-	return out, nil
+	return cards, nil
 }
 
 // WebStreamURL 远程条目的网页播放地址（302 直连远程 Emby 流端点）。

internal/service/emby_remote_web_test.go

@@ -2,17 +2,10 @@ package service
 
 import (
 	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
 	"testing"
 	"time"
 
-	"go.uber.org/zap"
-
-	"github.com/truewhile/MeBox/internal/config"
 	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
 )
 
 func TestMapRemoteItemToMediaSortingFields(t *testing.T) {
@@ -68,116 +61,7 @@ func TestMapRemoteItemToMediaCriticRatingFallback(t *testing.T) {
 	if media.Rating != 9.2 {
 		t.Fatalf("Rating = %f, want 9.2 from CriticRating", media.Rating)
 	}
-		if media.Year != 2022 {
-			t.Fatalf("Year = %d, want 2022 from PremiereDate", media.Year)
-		}
-	}
-
-func TestRemoteSearchMedia(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		q := r.URL.Query()
-		if q.Get("SearchTerm") == "碧蓝之海" {
-			w.Header().Set("Content-Type", "application/json")
-			_ = json.NewEncoder(w).Encode(map[string]any{
-				"TotalRecordCount": 1,
-				"Items": []map[string]any{
-					{
-						"Id":             "156030",
-						"Name":           "碧蓝之海",
-						"Type":           "Series",
-						"ProductionYear": 2018,
-					},
-				},
-			})
-			return
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{
-			"TotalRecordCount": 0,
-			"Items":            []map[string]any{},
-		})
-	}))
-	defer server.Close()
-
-	db := newServiceTestDB(t, &model.StrmAccount{}, &model.EmbyMount{})
-	repos := repository.New(db)
-	svc := NewEmbyRemoteService(&config.Config{}, zap.NewNop(), repos, NewCryptoService("", zap.NewNop()))
-
-	rawConfig, _ := json.Marshal(map[string]string{
-		"url":   server.URL,
-		"token": "fake-token",
-	})
-	acct := &model.StrmAccount{
-		Base:     model.Base{ID: "acct-1"},
-		Name:     "test-emby",
-		Provider: model.StrmProviderEmbyRemote,
-		Config:   string(rawConfig),
-		Enabled:  true,
-	}
-	if err := repos.StrmAccount.Create(t.Context(), acct); err != nil {
-		t.Fatalf("create account: %v", err)
-	}
-
-	mount := &model.EmbyMount{
-		Base:           model.Base{ID: "mount-1"},
-		AccountID:      acct.ID,
-		RemoteViewID:   "view-1",
-		RemoteViewName: "动漫",
-		CollectionType: "tvshows",
-		Enabled:        true,
-	}
-	if err := repos.EmbyMount.Create(t.Context(), mount); err != nil {
-		t.Fatalf("create mount: %v", err)
-	}
-
-	// 1. 正常搜索
-	items, err := svc.RemoteSearchMedia(t.Context(), "碧蓝之海", 10, MediaVisibility{IncludeNSFW: true})
-	if err != nil {
-		t.Fatalf("RemoteSearchMedia failed: %v", err)
-	}
-	if len(items) != 1 {
-		t.Fatalf("expected 1 item, got %d", len(items))
-	}
-	if items[0].Title != "碧蓝之海" {
-		t.Fatalf("expected Title '碧蓝之海', got %q", items[0].Title)
-	}
-	expectedID := EncodeEmbyRemoteID("mount-1", "156030")
-	if items[0].ID != expectedID {
-		t.Fatalf("expected ID %q, got %q", expectedID, items[0].ID)
-	}
-
-	// 2. 搜索不到的内容
-	notFound, err := svc.RemoteSearchMedia(t.Context(), "其它不存在的剧", 10, MediaVisibility{IncludeNSFW: true})
-	if err != nil {
-		t.Fatalf("RemoteSearchMedia failed: %v", err)
-	}
-	if len(notFound) != 0 {
-		t.Fatalf("expected 0 items, got %d", len(notFound))
-	}
-
-	// 3. 白名单过滤：当白名单不包含该挂载虚拟库 ID 时应过滤掉
-	allowedLibID := "local-lib-1"
-	filtered, err := svc.RemoteSearchMedia(t.Context(), "碧蓝之海", 10, MediaVisibility{
-		IncludeNSFW:       true,
-		AllowedLibraryIDs: []string{allowedLibID},
-	})
-	if err != nil {
-		t.Fatalf("RemoteSearchMedia with allowed filter failed: %v", err)
-	}
-	if len(filtered) != 0 {
-		t.Fatalf("expected 0 items due to AllowedLibraryIDs, got %d", len(filtered))
-	}
-
-	// 4. 黑名单过滤：当黑名单包含该挂载虚拟库 ID 时应过滤掉
-	mountLibID := EncodeEmbyRemoteID("mount-1", "view-1")
-	hiddenFiltered, err := svc.RemoteSearchMedia(t.Context(), "碧蓝之海", 10, MediaVisibility{
-		IncludeNSFW:      true,
-		HiddenLibraryIDs: []string{mountLibID},
-	})
-	if err != nil {
-		t.Fatalf("RemoteSearchMedia with hidden filter failed: %v", err)
-	}
-	if len(hiddenFiltered) != 0 {
-		t.Fatalf("expected 0 items due to HiddenLibraryIDs, got %d", len(hiddenFiltered))
+	if media.Year != 2022 {
+		t.Fatalf("Year = %d, want 2022 from PremiereDate", media.Year)
 	}
 }

internal/service/media_versions.go

@@ -44,11 +44,6 @@ func paginateMediaItems(items []MediaItem, page, pageSize int) []MediaItem {
 	return items[start:end]
 }
 
-// PaginateMediaItems 导出分页辅助函数。
-func PaginateMediaItems(items []MediaItem, page, pageSize int) []MediaItem {
-	return paginateMediaItems(items, page, pageSize)
-}
-
 func firstMediaItems(items []MediaItem, limit int) []MediaItem {
 	if len(items) == 0 {
 		return nil
@@ -65,11 +60,6 @@ func firstMediaItems(items []MediaItem, limit int) []MediaItem {
 	return items[:limit]
 }
 
-// FirstMediaItems 导出截取前 N 项辅助函数。
-func FirstMediaItems(items []MediaItem, limit int) []MediaItem {
-	return firstMediaItems(items, limit)
-}
-
 func groupMediaVersions(items []model.Media) []MediaItem {
 	if len(items) == 0 {
 		return nil
@@ -114,17 +104,7 @@ func groupMediaVersions(items []model.Media) []MediaItem {
 	return out
 }
 
-// GroupMediaVersions 导出多版本分组函数。
-func GroupMediaVersions(items []model.Media) []MediaItem {
-	return groupMediaVersions(items)
-}
-
 func mediaVersionGroupKey(m model.Media) string {
-	// 远程 Emby 挂载条目保持独立，不与其它远程条目或本地条目折叠合并。
-	if IsEmbyRemoteID(m.ID) {
-		return fmt.Sprintf("embyremote:%s", m.ID)
-	}
-
 	if m.SeasonNum > 0 || m.EpisodeNum > 0 {
 		switch {
 		case m.TMDbID > 0:
@@ -151,32 +131,14 @@ func mediaVersionGroupKey(m model.Media) string {
 			fmt.Sprintf("%d:%d", m.SeasonNum, m.EpisodeNum),
 		}, "|")
 	}
-
-	libKey := strings.ToLower(strings.TrimSpace(m.LibraryID))
-	if libKey == "" {
-		libKey = strings.ToLower(strings.TrimSpace(m.DisplayLibraryID))
-	}
-
 	switch {
 	case m.TMDbID > 0:
-		if libKey != "" {
-			return fmt.Sprintf("movie:%s:tmdb:%d", libKey, m.TMDbID)
-		}
 		return fmt.Sprintf("tmdb:%d", m.TMDbID)
 	case m.BangumiID > 0:
-		if libKey != "" {
-			return fmt.Sprintf("movie:%s:bangumi:%d", libKey, m.BangumiID)
-		}
 		return fmt.Sprintf("bangumi:%d", m.BangumiID)
 	case strings.TrimSpace(m.DoubanID) != "":
-		if libKey != "" {
-			return fmt.Sprintf("movie:%s:douban:%s", libKey, strings.ToLower(strings.TrimSpace(m.DoubanID)))
-		}
 		return "douban:" + strings.ToLower(strings.TrimSpace(m.DoubanID))
 	case strings.TrimSpace(m.TheTVDBID) != "":
-		if libKey != "" {
-			return fmt.Sprintf("movie:%s:thetvdb:%s", libKey, strings.ToLower(strings.TrimSpace(m.TheTVDBID)))
-		}
 		return "thetvdb:" + strings.ToLower(strings.TrimSpace(m.TheTVDBID))
 	}
 	title := firstNonEmpty(m.OriginalName, m.Title)
@@ -196,9 +158,6 @@ func mediaVersionGroupKey(m model.Media) string {
 	if year <= 0 {
 		_, year = CleanQuery(m.Path)
 	}
-	if libKey != "" {
-		return fmt.Sprintf("movie:%s:%s:%d", libKey, title, year)
-	}
 	return fmt.Sprintf("movie:%s:%d", title, year)
 }
 

internal/service/media_versions_test.go

@@ -218,49 +218,3 @@ func TestSearchMediaVisiblePageGroupedPaginatesAfterVersionGrouping(t *testing.T
 		t.Fatalf("primary version = %q, want %q", page[0].Media.Path, rows[0].Path)
 	}
 }
-
-func TestGroupMediaVersionsDoesNotMergeDifferentRemoteSeries(t *testing.T) {
-	// 模拟来自两个不同挂载库（如 00 新番连载 与 2018 动漫）的同名剧集《碧蓝之海》
-	season1 := model.Media{
-		Base:        model.Base{ID: EncodeEmbyRemoteID("mount-1", "156019")},
-		LibraryID:   EncodeEmbyRemoteID("mount-1", "view-1"),
-		Title:       "碧蓝之海",
-		Year:        2018,
-		LibraryName: "2018 动漫",
-	}
-	season2 := model.Media{
-		Base:        model.Base{ID: EncodeEmbyRemoteID("mount-2", "156030")},
-		LibraryID:   EncodeEmbyRemoteID("mount-2", "view-2"),
-		Title:       "碧蓝之海",
-		Year:        2024,
-		LibraryName: "00 新番连载",
-	}
-
-	grouped := groupMediaVersions([]model.Media{season1, season2})
-	if len(grouped) != 2 {
-		t.Fatalf("expected 2 separate groups for different remote series/libraries, got %d: %#v", len(grouped), grouped)
-	}
-	if grouped[0].Title != "碧蓝之海" || grouped[1].Title != "碧蓝之海" {
-		t.Fatalf("expected both titles to be '碧蓝之海'")
-	}
-}
-
-func TestGroupMediaVersionsDoesNotMergeAcrossDifferentLibrariesForMovies(t *testing.T) {
-	movieLib1 := model.Media{
-		Base:      model.Base{ID: "m-1"},
-		LibraryID: "lib-1",
-		Title:     "碧蓝之海",
-		Year:      2018,
-	}
-	movieLib2 := model.Media{
-		Base:      model.Base{ID: "m-2"},
-		LibraryID: "lib-2",
-		Title:     "碧蓝之海",
-		Year:      2018,
-	}
-
-	grouped := groupMediaVersions([]model.Media{movieLib1, movieLib2})
-	if len(grouped) != 2 {
-		t.Fatalf("expected 2 separate groups for movies in different libraries, got %d", len(grouped))
-	}
-}

internal/service/service.go

@@ -15,7 +15,6 @@ import (
 
 // Container 持有在启动时初始化的每个服务。Handler 接收指向它的指针并选择相关字段。
 type Container struct {
-	Version          string
 	Cfg              *config.Config
 	Log              *zap.Logger
 	Repo             *repository.Container

internal/service/service_builder.go

@@ -27,13 +27,12 @@ func newServiceContainer(cfg *config.Config, log *zap.Logger, repos *repository.
 		cfg:     cfg,
 		log:     log,
 		repos:   repos,
-			version: normalizeSystemUpdateVersion(version),
-			c: &Container{
-				Version: normalizeSystemUpdateVersion(version),
-				Cfg:     cfg,
-				Log:     log,
-				Repo:    repos,
-			},
+		version: normalizeSystemUpdateVersion(version),
+		c: &Container{
+			Cfg:  cfg,
+			Log:  log,
+			Repo: repos,
+		},
 	}
 	builder.startRealtimeServices()
 	builder.initProviderServices()

web/src/components/LayoutHeaderSections.tsx

@@ -239,16 +239,9 @@ function LayoutHeaderSearch() {
                     </div>
 
                     <div className="min-w-0 flex-1">
-                      <div className="flex items-center gap-1.5">
-                        <p className="truncate text-xs font-bold text-[var(--app-text)] group-hover:text-brand-500">
-                          {item.title}
-                        </p>
-                        {(item.display_library_name || item.library_name) && (
-                          <span className="shrink-0 text-[9px] px-1.5 py-0.5 rounded bg-[var(--app-panel-elevated)] border border-[var(--app-border)] text-[var(--app-muted)] max-w-[130px] truncate">
-                            {item.display_library_name || item.library_name}
-                          </span>
-                        )}
-                      </div>
+                      <p className="truncate text-xs font-bold text-[var(--app-text)] group-hover:text-brand-500">
+                        {item.title}
+                      </p>
                       <div className="flex items-center gap-2 text-[10px] text-[var(--app-muted)] mt-0.5">
                         {item.year > 0 && <span>{item.year}</span>}
                         {item.rating > 0 && (

web/src/components/layoutNavigation.ts

@@ -43,9 +43,9 @@ export const LAYOUT_NAV_ITEMS: LayoutNavItem[] = [
   { to: '/queue', label: '任务队列', icon: ListChecks, adminOnly: true },
   { to: '/admin', label: '用户管理', icon: Users, adminOnly: true },
   { to: '/files', label: '文件管理', icon: FolderOpen, adminOnly: true },
+  { to: '/settings', label: '系统设置', icon: Settings, adminOnly: true },
   { to: '/emby-mount', label: 'Emby 挂载', icon: Tv, adminOnly: true },
   { to: '/strm', label: 'STRM 管理', icon: FileOutput, adminOnly: true },
-  { to: '/settings', label: '系统设置', icon: Settings, adminOnly: true },
 ]
 
 /** Media browsing links for the mobile drawer when browsing libraries. */

web/src/pages/AboutSettingsPanel.tsx

@@ -1,330 +0,0 @@
-import { useEffect, useState } from 'react'
-import {
-  BookOpen,
-  Check,
-  Copy,
-  Cpu,
-  Database,
-  ExternalLink,
-  Film,
-  FolderOpen,
-  Github,
-  HardDrive,
-  Info,
-  Layers,
-  ListChecks,
-  MessageSquare,
-  Play,
-  Server,
-  Sparkles,
-  Tag,
-  Tv,
-  Users,
-} from 'lucide-react'
-import toast from 'react-hot-toast'
-
-import { systemAPI } from '../api/system'
-
-type SystemInfo = {
-  name: string
-  version: string
-  go: string
-  os: string
-  arch: string
-  data_dir: string
-  cache_dir: string
-}
-
-const GITHUB_REPO_URL = 'https://github.com/truewhile/MeBox'
-
-const MODULE_GUIDES = [
-  {
-    icon: Film,
-    title: '媒体库管理',
-    badge: '核心存储',
-    description:
-      '支持创建电影、电视剧、动漫、纪录片等多种类型媒体库。支持本地目录与网络挂载路径，集成文件监控（Inotify / 定时轮询），新增与修改文件自动入库。剧集支持智能按季、集归类与多版本合并。',
-  },
-  {
-    icon: Sparkles,
-    title: '智能刮削与元数据',
-    badge: '海报与信息',
-    description:
-      '内置 TMDb、Bangumi、TheTVDB、豆瓣等元数据源。入库时自动识别文件名匹配海报、背景图、演职员及中文简介。支持手动精确搜刮、重命名整理规则、识别词过滤（过滤广告词与压制组标签）及 NFO 本地文件导出。',
-  },
-  {
-    icon: Play,
-    title: '流媒体播放与转码',
-    badge: '播放引擎',
-    description:
-      '现代化 Web 播放器支持原画直连（Direct Play）与 HLS 实时兼容转码。支持 Intel QSV、NVIDIA NVENC、VAAPI 等硬件加速。支持内嵌与外挂字幕（ASS/SRT/VTT）渲染、多音轨切换，并支持一键调用 PotPlayer、VLC、IINA、Infuse 等本地播放器。',
-  },
-  {
-    icon: MessageSquare,
-    title: '实时弹幕系统',
-    badge: '弹幕互动',
-    description:
-      '播放时自动/手动匹配对应剧集的弹幕源。支持设置弹幕字号、滚动速度、透明度、屏幕占比限制（1/4屏、半屏、全屏）及防遮挡字幕开关，打造沉浸式的观影交流体验。',
-  },
-  {
-    icon: Tv,
-    title: 'Emby 挂载与远程同步',
-    badge: '扩展聚合',
-    description:
-      '支持以客户端形式直接挂载远程 Emby 媒体服务器，无需本地下载即可无缝串流播放远程资源，同时保留本地的刮削、播放历史、收藏与弹幕能力，实现多端影视资源大聚合。',
-  },
-  {
-    icon: Layers,
-    title: 'STRM 管理与云盘转存',
-    badge: '海量存储',
-    description:
-      '针对 115、阿里云盘、OpenList 等网盘挂载场景，提供批量的 STRM 索引文件生成与下载队列管理。本地仅占用微量磁盘空间，即可享受数百 TB 云端影视的高速直链秒播。',
-  },
-  {
-    icon: FolderOpen,
-    title: '内置文件管理器',
-    badge: '资源维护',
-    description:
-      '内置可视化文件浏览器，支持对本地媒体目录及云盘目录进行直接浏览、批量移动、重命名及删除操作，方便快速定位未刮削或命名不规范的文件并进行整理。',
-  },
-  {
-    icon: ListChecks,
-    title: '后台任务队列',
-    badge: '异步作业',
-    description:
-      '全生命周期监控媒体扫描、元数据批量刮削、STRM 生成及音视频探测等后台异步任务。实时展示队列进度百分比、执行状态及错误日志，支持手动重试与任务取消。',
-  },
-  {
-    icon: Users,
-    title: '多用户与权限体系',
-    badge: '安全访问',
-    description:
-      '支持管理员与普通用户角色。管理员可精细化控制各账号的访问边界，包括特定媒体库可见性（如敏感/Adult媒体库）、是否允许调用外部播放器、是否允许下载原始文件等。',
-  },
-  {
-    icon: Database,
-    title: '数据库与系统设置',
-    badge: '底层基建',
-    description:
-      '支持轻量级单文件 SQLite 与高并发 PostgreSQL 数据库，并提供一键平滑数据热迁移工具；支持自定义 HTTPS 证书绑定、转码缓存自动清理及实时系统资源监控。',
-  },
-]
-
-export function AboutSettingsPanel() {
-  const [info, setInfo] = useState<SystemInfo | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [copied, setCopied] = useState(false)
-
-  useEffect(() => {
-    systemAPI
-      .info()
-      .then((res) => {
-        setInfo({
-          name: res.name || 'MeBox',
-          version: res.version || '0.1.0',
-          go: res.go || '',
-          os: res.os || '',
-          arch: res.arch || '',
-          data_dir: res.data_dir || '',
-          cache_dir: res.cache_dir || '',
-        })
-      })
-      .catch(() => {
-        setInfo({
-          name: 'MeBox',
-          version: '0.1.0',
-          go: '',
-          os: '',
-          arch: '',
-          data_dir: '',
-          cache_dir: '',
-        })
-      })
-      .finally(() => setLoading(false))
-  }, [])
-
-  const handleCopyGitURL = async () => {
-    try {
-      await navigator.clipboard.writeText(GITHUB_REPO_URL)
-      setCopied(true)
-      toast.success('GitHub 地址已复制到剪贴板')
-      setTimeout(() => setCopied(false), 2000)
-    } catch {
-      toast.error('复制失败，请手动复制')
-    }
-  }
-
-  return (
-    <div className="space-y-6">
-      {/* 顶部概览与项目卡片 */}
-      <div className="glass-panel overflow-hidden p-6 sm:p-8">
-        <div className="flex flex-col gap-6 lg:flex-row lg:items-center lg:justify-between">
-          <div className="space-y-3">
-            <div className="flex flex-wrap items-center gap-3">
-              <h2 className="font-display text-2xl sm:text-3xl font-bold text-ink-600">
-                MeBox 影音管理系统
-              </h2>
-              <span className="inline-flex items-center gap-1.5 rounded-full bg-brand-500/10 px-3 py-1 text-xs font-semibold text-brand-600 border border-brand-500/20">
-                <Tag size={13} />
-                {loading ? '加载中...' : `v${info?.version || '0.1.0'}`}
-              </span>
-            </div>
-            <p className="max-w-2xl text-sm leading-relaxed text-sand-600">
-              MeBox 是一款专为个人与家庭设计的现代化开源媒体库管理与流媒体点播系统。
-              集媒体资源归纳、智能多源刮削、弹幕交互、海量云盘 STRM 转存与多端播放于一体，让观影体验更轻快自由。
-            </p>
-          </div>
-
-          {/* 仓库链接操作区 */}
-          <div className="flex flex-wrap items-center gap-3">
-            <a
-              href={GITHUB_REPO_URL}
-              target="_blank"
-              rel="noreferrer"
-              className="inline-flex items-center gap-2 rounded-xl bg-ink-600 px-4 py-2.5 text-sm font-medium text-white shadow-sm transition hover:bg-ink-700 hover:shadow"
-            >
-              <Github size={16} />
-              <span>访问 GitHub 仓库</span>
-              <ExternalLink size={14} className="opacity-70" />
-            </a>
-            <button
-              type="button"
-              onClick={handleCopyGitURL}
-              className="inline-flex items-center gap-2 rounded-xl border border-gray-200 bg-white/80 px-4 py-2.5 text-sm font-medium text-ink-600 shadow-sm transition hover:bg-white hover:text-brand-600"
-            >
-              {copied ? <Check size={16} className="text-emerald-500" /> : <Copy size={16} />}
-              <span>{copied ? '已复制' : '复制地址'}</span>
-            </button>
-          </div>
-        </div>
-
-        {/* 运行环境规格栏 */}
-        <div className="mt-6 grid grid-cols-2 gap-3 sm:grid-cols-4 border-t border-gray-200/60 pt-6">
-          <div className="rounded-xl bg-sand-100/50 p-3.5">
-            <div className="flex items-center gap-1.5 text-xs text-sand-500">
-              <Tag size={13} />
-              <span>系统版本</span>
-            </div>
-            <p className="mt-1 font-mono text-sm font-semibold text-ink-600">
-              {loading ? '...' : info?.version || '0.1.0'}
-            </p>
-          </div>
-          <div className="rounded-xl bg-sand-100/50 p-3.5">
-            <div className="flex items-center gap-1.5 text-xs text-sand-500">
-              <Server size={13} />
-              <span>运行环境</span>
-            </div>
-            <p className="mt-1 font-mono text-sm font-semibold text-ink-600">
-              {loading ? '...' : `${info?.os || 'linux'} / ${info?.arch || 'amd64'}`}
-            </p>
-          </div>
-          <div className="rounded-xl bg-sand-100/50 p-3.5">
-            <div className="flex items-center gap-1.5 text-xs text-sand-500">
-              <Cpu size={13} />
-              <span>Go 运行时</span>
-            </div>
-            <p className="mt-1 font-mono text-sm font-semibold text-ink-600">
-              {loading ? '...' : info?.go || 'go1.x'}
-            </p>
-          </div>
-          <div className="rounded-xl bg-sand-100/50 p-3.5">
-            <div className="flex items-center gap-1.5 text-xs text-sand-500">
-              <HardDrive size={13} />
-              <span>数据目录</span>
-            </div>
-            <p className="mt-1 truncate font-mono text-xs font-semibold text-ink-600" title={info?.data_dir}>
-              {loading ? '...' : info?.data_dir || './data'}
-            </p>
-          </div>
-        </div>
-      </div>
-
-      {/* 快速入门与使用流程 */}
-      <div className="glass-panel p-6 sm:p-8 space-y-4">
-        <div className="flex items-center gap-2">
-          <BookOpen className="text-brand-500" size={20} />
-          <h3 className="font-display text-lg font-bold text-ink-600">使用说明与快速上手</h3>
-        </div>
-        <div className="grid gap-4 sm:grid-cols-3">
-          <div className="flex flex-col gap-2 rounded-2xl border border-gray-200/80 bg-white/60 p-4 shadow-sm">
-            <div className="flex items-center gap-2">
-              <span className="flex h-6 w-6 items-center justify-center rounded-full bg-brand-500 text-xs font-bold text-white">
-                1
-              </span>
-              <span className="font-semibold text-ink-600 text-sm">创建与关联媒体库</span>
-            </div>
-            <p className="text-xs leading-relaxed text-sand-500">
-              在侧边栏进入「媒体库」，点击添加媒体库。选择媒体类型（电影/电视剧），指定服务器上的实际媒体路径或挂载目录，保存后系统将自动创建索引并监控变动。
-            </p>
-          </div>
-
-          <div className="flex flex-col gap-2 rounded-2xl border border-gray-200/80 bg-white/60 p-4 shadow-sm">
-            <div className="flex items-center gap-2">
-              <span className="flex h-6 w-6 items-center justify-center rounded-full bg-brand-500 text-xs font-bold text-white">
-                2
-              </span>
-              <span className="font-semibold text-ink-600 text-sm">智能识别与刮削</span>
-            </div>
-            <p className="text-xs leading-relaxed text-sand-500">
-              扫描入库后，后台服务会自动提取文件名并通过 TMDb / 豆瓣 / Bangumi 等抓取高清海报、演职员与分集信息；如遇特殊命名，可在详情页中一键进行「手动搜刮」。
-            </p>
-          </div>
-
-          <div className="flex flex-col gap-2 rounded-2xl border border-gray-200/80 bg-white/60 p-4 shadow-sm">
-            <div className="flex items-center gap-2">
-              <span className="flex h-6 w-6 items-center justify-center rounded-full bg-brand-500 text-xs font-bold text-white">
-                3
-              </span>
-              <span className="font-semibold text-ink-600 text-sm">多端随心畅享观影</span>
-            </div>
-            <p className="text-xs leading-relaxed text-sand-500">
-              直接在浏览器中享受原画秒开与实时弹幕互动；对于高码率或特殊封装格式，支持开启 HLS 转码播放或直接一键唤醒本地 PotPlayer、Infuse 等外部播放器。
-            </p>
-          </div>
-        </div>
-      </div>
-
-      {/* 各功能模块详细使用说明 */}
-      <div className="space-y-4">
-        <div className="flex items-center justify-between px-1">
-          <div className="flex items-center gap-2">
-            <Info className="text-brand-500" size={20} />
-            <h3 className="font-display text-lg font-bold text-ink-600">各功能模块详细说明</h3>
-          </div>
-          <span className="text-xs text-sand-500">涵盖系统十大核心子系统</span>
-        </div>
-
-        <div className="grid gap-4 sm:grid-cols-2">
-          {MODULE_GUIDES.map((mod) => {
-            const Icon = mod.icon
-            return (
-              <div
-                key={mod.title}
-                className="group flex flex-col justify-between rounded-2xl border border-gray-200/90 bg-white/70 p-5 shadow-sm transition hover:border-brand-500/40 hover:bg-white hover:shadow-md"
-              >
-                <div className="space-y-2.5">
-                  <div className="flex items-center justify-between">
-                    <div className="flex items-center gap-2.5">
-                      <div className="flex h-9 w-9 items-center justify-center rounded-xl bg-brand-500/10 text-brand-500 transition group-hover:bg-brand-500 group-hover:text-white">
-                        <Icon size={18} />
-                      </div>
-                      <h4 className="font-semibold text-ink-600 text-sm sm:text-base">
-                        {mod.title}
-                      </h4>
-                    </div>
-                    <span className="rounded-md bg-sand-100 px-2 py-0.5 text-[11px] font-medium text-sand-600">
-                      {mod.badge}
-                    </span>
-                  </div>
-                  <p className="text-xs leading-relaxed text-sand-600 sm:text-[13px]">
-                    {mod.description}
-                  </p>
-                </div>
-              </div>
-            )
-          })}
-        </div>
-      </div>
-    </div>
-  )
-}

web/src/pages/MediaDetailPage.tsx

@@ -9,7 +9,6 @@ import {
   MediaDetailMainContent,
   MediaDetailMissing,
 } from './MediaDetailPageSections'
-import { LibrarySeriesEpisodes } from './LibrarySeriesEpisodes'
 import { useMediaDetailPageState } from './useMediaDetailPageState'
 
 export function MediaDetailPage() {
@@ -32,7 +31,6 @@ export function MediaDetailPage() {
         media={media}
         isAdmin={role === 'admin'}
         favourite={detail.favourite}
-        playTargetId={detail.firstPlayableEpisode?.id}
         scrapeEpisodeArtwork={detail.scrapeEpisodeArtwork}
         onToggleFavourite={detail.toggleFavourite}
         onScrapeEpisodeArtworkChange={detail.setScrapeEpisodeArtwork}
@@ -44,21 +42,6 @@ export function MediaDetailPage() {
         onExportNFO={detail.exportNFO}
         onSoftDelete={detail.softDelete}
       />
-
-      {detail.hasEpisodes && (
-        <div className="relative z-10 px-6 pb-8 sm:px-10 space-y-6">
-          <div className="divider border-gray-200/60" />
-          <LibrarySeriesEpisodes
-            loading={detail.loadingEpisodes}
-            selectedEpisodes={detail.seasonGroups}
-            selectedSeason={detail.selectedSeason}
-            visibleEpisodes={detail.visibleEpisodes}
-            playbackFrom={`/media/${media.id}`}
-            onSeasonChange={detail.setSelectedSeason}
-          />
-        </div>
-      )}
-
       <MediaDetailDialogs
         media={media}
         manualScrapeOpen={detail.manualScrapeOpen}

web/src/pages/MediaDetailPageModel.ts

@@ -1,11 +1,13 @@
 import type { Media } from '../types'
+import { mediaLibraryTarget } from '../utils/mediaNavigation'
 
 export function mediaLibraryBackTarget(media: Media): string {
+  const seriesTarget = mediaLibraryTarget(media)
+  if (seriesTarget) return seriesTarget
+
   const libraryID = media.display_library_id || media.library_id
-  if (libraryID) {
-    return `/library/${encodeURIComponent(libraryID)}`
-  }
-  return '/libraries'
+  if (!libraryID) return ''
+  return `/library/${encodeURIComponent(libraryID)}`
 }
 
 export function mediaDetailScrapeMediaType(media: Media): string | undefined {

web/src/pages/MediaDetailPageSections.tsx

@@ -18,7 +18,6 @@ interface MediaDetailPlaybackActionsProps {
   media: Media
   favourite: boolean
   onToggleFavourite: () => void
-  playTargetId?: string
 }
 
 interface MediaDetailMainContentProps extends MediaDetailPlaybackActionsProps {
@@ -94,19 +93,17 @@ export function MediaDetailPlaybackActions({
   media,
   favourite,
   onToggleFavourite,
-  playTargetId,
 }: MediaDetailPlaybackActionsProps) {
-  const targetId = playTargetId || media.id
   return (
     <div className="flex flex-wrap gap-3">
-      <Link to={`/play/${targetId}`} state={{ from: `/media/${media.id}` }} className="btn-primary px-6 py-3.5 shadow-sm">
+      <Link to={`/play/${media.id}`} state={{ from: `/media/${media.id}` }} className="btn-primary px-6 py-3.5 shadow-sm">
         <Play size={16} fill="currentColor" />
         <span>立即播放</span>
       </Link>
 
       {!isDirectStreamMedia(media) && (
         <Link
-        to={`/play/${targetId}?mode=hls`}
+        to={`/play/${media.id}?mode=hls`}
         state={{ from: `/media/${media.id}` }}
         className="btn-outline border-brand-500/30 hover:border-brand-500 text-[#c9954a] hover:bg-brand-50 px-5"
       >
@@ -115,7 +112,7 @@ export function MediaDetailPlaybackActions({
         </Link>
       )}
 
-      <ExternalPlayerButton mediaId={targetId} />
+      <ExternalPlayerButton mediaId={media.id} />
 
       <button
         onClick={onToggleFavourite}
@@ -137,7 +134,6 @@ export function MediaDetailMainContent({
   media,
   isAdmin,
   favourite,
-  playTargetId,
   scrapeEpisodeArtwork,
   onToggleFavourite,
   onScrapeEpisodeArtworkChange,
@@ -157,12 +153,7 @@ export function MediaDetailMainContent({
         <MediaDetailMetadata media={media} />
         <div className="divider border-gray-200/60" />
         <div className="flex flex-col gap-5">
-          <MediaDetailPlaybackActions
-            media={media}
-            favourite={favourite}
-            onToggleFavourite={onToggleFavourite}
-            playTargetId={playTargetId}
-          />
+          <MediaDetailPlaybackActions media={media} favourite={favourite} onToggleFavourite={onToggleFavourite} />
           {isAdmin && (
             <MediaDetailAdminPanel
               media={media}

web/src/pages/SettingsPage.tsx

@@ -8,7 +8,6 @@ import { libraryAPI } from '../api/library'
 import type { Library, Setting } from '../types'
 import { APIConfigsPanel } from '../components/APIConfigsPanel'
 import { FFToolsPanel } from '../components/FFToolsPanel'
-import { AboutSettingsPanel } from './AboutSettingsPanel'
 import { AdultSettingsPanel } from './AdultSettingsPanel'
 import { DatabaseSettingsPanel } from './DatabaseSettingsPanel'
 import { RecognitionWordsPanel } from './RecognitionWordsPanel'
@@ -175,7 +174,6 @@ export function SettingsPage() {
           {group.key === 'recognition-words' && <RecognitionWordsPanel />}
           {group.key === 'adult' && <AdultSettingsPanel />}
           {group.key === 'general' && <FFToolsPanel onInstalled={() => refresh().catch(() => undefined)} />}
-          {group.key === 'about' && <AboutSettingsPanel />}
           {group.key !== 'adult' && group.key !== 'library' && group.items.length > 0 && (
             <form onSubmit={onSave} className="glass-panel space-y-4">
               {group.description && <p className="text-xs text-sand-500">{group.description}</p>}

web/src/pages/settingsGroups.ts

@@ -14,13 +14,6 @@ export const databaseSettingsGroup: SettingGroup = {
   items: [],
 }
 
-export const aboutSettingsGroup: SettingGroup = {
-  key: 'about',
-  label: '关于',
-  description: '项目信息、版本信息与使用指南',
-  items: [],
-}
-
 export const GROUPS: SettingGroup[] = [
   generalSettingsGroup,
   databaseSettingsGroup,
@@ -28,7 +21,6 @@ export const GROUPS: SettingGroup[] = [
   recognitionWordsSettingsGroup,
   danmakuSettingsGroup,
   adultSettingsGroup,
-  aboutSettingsGroup,
 ]
 
 export const ALL_KEYS = new Set(GROUPS.flatMap((group) => group.items.map((item) => item.key)))

web/src/pages/useMediaDetailPageState.ts

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState, type Dispatch, type SetStateAction } from 'react'
+import { useCallback, useEffect, useState, type Dispatch, type SetStateAction } from 'react'
 import type { NavigateFunction } from 'react-router-dom'
 import toast from 'react-hot-toast'
 
@@ -20,8 +20,6 @@ interface MediaDetailRefreshParams {
   setMedia: Dispatch<SetStateAction<Media | null>>
   setFavourite: Dispatch<SetStateAction<boolean>>
   setLoading: Dispatch<SetStateAction<boolean>>
-  setEpisodes: Dispatch<SetStateAction<Media[]>>
-  setLoadingEpisodes: Dispatch<SetStateAction<boolean>>
 }
 
 interface MediaDetailActionsParams {
@@ -36,23 +34,12 @@ export function useMediaDetailPageState({ id, navigate }: MediaDetailPageStatePa
   const [media, setMedia] = useState<Media | null>(null)
   const [favourite, setFavourite] = useState(false)
   const [loading, setLoading] = useState(true)
-  const [episodes, setEpisodes] = useState<Media[]>([])
-  const [loadingEpisodes, setLoadingEpisodes] = useState(false)
-  const [selectedSeason, setSelectedSeason] = useState<number | null>(null)
-
   const [manualScrapeOpen, setManualScrapeOpen] = useState(false)
   const [metadataEditOpen, setMetadataEditOpen] = useState(false)
   const [organizeOpen, setOrganizeOpen] = useState(false)
   const [scrapeEpisodeArtwork, setScrapeEpisodeArtwork] = useState(false)
 
-  const refresh = useMediaDetailRefresh({
-    id,
-    setMedia,
-    setFavourite,
-    setLoading,
-    setEpisodes,
-    setLoadingEpisodes,
-  })
+  const refresh = useMediaDetailRefresh({ id, setMedia, setFavourite, setLoading })
   const actions = useMediaDetailActions({
     media,
     scrapeEpisodeArtwork,
@@ -65,41 +52,6 @@ export function useMediaDetailPageState({ id, navigate }: MediaDetailPageStatePa
     refresh().catch(() => undefined)
   }, [refresh])
 
-  const seasonGroups = useMemo(() => {
-    if (episodes.length === 0) return []
-    const seasons = new Map<number, Media[]>()
-    for (const ep of episodes) {
-      const s = ep.episode_num > 0 ? (ep.season_num ?? 0) : (ep.season_num || 1)
-      if (!seasons.has(s)) seasons.set(s, [])
-      seasons.get(s)!.push(ep)
-    }
-    for (const [, list] of seasons) {
-      list.sort((a, b) => (a.episode_num || 0) - (b.episode_num || 0))
-    }
-    return Array.from(seasons.entries())
-      .sort(([a], [b]) => a - b)
-      .map(([season, list]) => ({ season, episodes: list }))
-  }, [episodes])
-
-  const visibleEpisodes = useMemo(() => {
-    if (selectedSeason == null) return seasonGroups[0]?.episodes ?? []
-    return seasonGroups.find((s) => s.season === selectedSeason)?.episodes ?? []
-  }, [seasonGroups, selectedSeason])
-
-  const hasEpisodes = useMemo(() => {
-    if (episodes.length > 1) return true
-    if (episodes.length === 1 && media) {
-      // 只有单条时，如果明确是集（有 episode_num > 0）或 ID 与自身不同，则按剧集渲染
-      return episodes[0].episode_num > 0 || episodes[0].id !== media.id
-    }
-    return false
-  }, [episodes, media])
-
-  const firstPlayableEpisode = useMemo(() => {
-    if (episodes.length === 0) return null
-    return (visibleEpisodes.length > 0 ? visibleEpisodes[0] : episodes[0]) || null
-  }, [episodes, visibleEpisodes])
-
   const handleMetadataSaved = useCallback(async (next: Media) => {
     setMedia(next)
     await refresh()
@@ -109,14 +61,6 @@ export function useMediaDetailPageState({ id, navigate }: MediaDetailPageStatePa
     media,
     favourite,
     loading,
-    episodes,
-    loadingEpisodes,
-    seasonGroups,
-    selectedSeason,
-    visibleEpisodes,
-    hasEpisodes,
-    firstPlayableEpisode,
-    setSelectedSeason,
     manualScrapeOpen,
     metadataEditOpen,
     organizeOpen,
@@ -136,31 +80,19 @@ function useMediaDetailRefresh({
   setMedia,
   setFavourite,
   setLoading,
-  setEpisodes,
-  setLoadingEpisodes,
 }: MediaDetailRefreshParams): () => Promise<void> {
   return useCallback(async () => {
     if (!id) return
     setLoading(true)
-    setLoadingEpisodes(true)
     try {
       const nextMedia = await mediaAPI.get(id)
       setMedia(nextMedia)
       const favourites = await playbackAPI.listFavourites().catch(() => [])
       setFavourite(favourites.some((item) => item.id === nextMedia.id))
-      // 异步加载分集列表
-      try {
-        const epRes = await mediaAPI.getEpisodes(id)
-        setEpisodes(epRes.items ?? [])
-      } catch {
-        setEpisodes([])
-      } finally {
-        setLoadingEpisodes(false)
-      }
     } finally {
       setLoading(false)
     }
-  }, [id, setFavourite, setLoading, setMedia, setEpisodes, setLoadingEpisodes])
+  }, [id, setFavourite, setLoading, setMedia])
 }
 
 function useMediaDetailActions({
@@ -189,12 +121,10 @@ function useMediaDetailActions({
 }
 
 function goBackFromMediaDetail(media: Media | null, navigate: NavigateFunction, replace = false): void {
-  if (!media) {
-    navigate('/libraries')
-    return
-  }
+  if (!media) return
   const backTarget = mediaLibraryBackTarget(media)
-  navigate(backTarget || '/libraries', replace ? { replace: true } : undefined)
+  if (backTarget) navigate(backTarget, replace ? { replace: true } : undefined)
+  else navigate(-1)
 }
 
 async function toggleMediaFavourite(