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 "==== 部署完成并已启动 ===="
-

README.md

@@ -51,7 +51,7 @@
 | **网盘与 STRM** | OpenList、CloudDrive2、115、WebDAV 等；STRM 同步、上传/下载队列、直链/302 播放 |
 | **下载与整理** | qBittorrent 接入、站点搜索与订阅、下载后自动整理、文件管理器（复制/移动/硬链/软链） |
 | **用户与权限** | 管理员/普通用户、有效期、成人内容开关、播放配置 PIN、细粒度操作权限 |
-| **运维能力** | 统一任务队列、存储统计、DLNA 投屏、系统设置与日志 |
+| **运维能力** | 统一任务队列、回收站、存储统计、DLNA 投屏、系统设置与日志 |
 
 ### 技术栈
 

README_EN.md

@@ -50,7 +50,7 @@ In practice, MeBox gives you:
 | **Cloud & STRM** | OpenList, CloudDrive2, 115, WebDAV; STRM sync; upload/download queues; direct or 302 playback |
 | **Downloads & organize** | qBittorrent, site search/subscriptions, post-download organization, file manager |
 | **Users & permissions** | Admin/regular users, expiry, NSFW toggle, play-profile PIN, granular permissions |
-| **Operations** | Unified task queue, storage stats, DLNA casting, settings and logs |
+| **Operations** | Unified task queue, recycle bin, storage stats, DLNA casting, settings and logs |
 
 ### Tech stack
 

VERSION

@@ -1 +1 @@
-0.0.106
+0.0.81

cmd/server/main.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/truewhile/MeBox/internal/config"
 	"github.com/truewhile/MeBox/internal/database"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 	"github.com/truewhile/MeBox/internal/service"
 )
@@ -122,7 +121,7 @@ func main() {
 			)
 		}
 	}()
-	helper.Go(logger, "services.boot", services.Boot)
+	go services.Boot()
 
 	// Graceful shutdown.
 	stop := make(chan os.Signal, 1)

cmd/server/router.go

@@ -53,7 +53,6 @@ func buildRouter(cfg *config.Config, logger *zap.Logger, svc *service.Container)
 // comes from root, which is either the compiled-in SPA or an on-disk web dir.
 func serveSPA(r *gin.Engine, root fs.FS) {
 	assets := r.Group("/assets")
-	assets.Use(middleware.GzipStatic())
 	assets.Use(func(c *gin.Context) {
 		c.Header("Cache-Control", "public, max-age=31536000, immutable")
 		c.Next()
@@ -70,7 +69,7 @@ func serveSPA(r *gin.Engine, root fs.FS) {
 		r.GET(rootFile, serveFSFile(root, name))
 		r.HEAD(rootFile, serveFSFile(root, name))
 	}
-	r.NoRoute(middleware.GzipStatic(), func(c *gin.Context) {
+	r.NoRoute(func(c *gin.Context) {
 		path := c.Request.URL.Path
 		if shouldBypassSPAFallback(path) {
 			c.Status(http.StatusNotFound)

go.mod

@@ -5,8 +5,7 @@ go 1.25.0
 require (
 	github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.5.2
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/gin-contrib/gzip v1.2.6
-	github.com/gin-gonic/gin v1.12.0
+	github.com/gin-gonic/gin v1.9.1
 	github.com/glebarez/sqlite v1.11.0
 	github.com/golang-jwt/jwt/v5 v5.2.0
 	github.com/google/uuid v1.6.0
@@ -14,11 +13,11 @@ require (
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/viper v1.18.2
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.9.0
 	github.com/ulikunitz/xz v0.5.12
 	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.48.0
-	golang.org/x/sys v0.41.0
+	golang.org/x/crypto v0.21.0
+	golang.org/x/sys v0.20.0
 	golang.org/x/time v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/postgres v1.5.7
@@ -26,23 +25,20 @@ require (
 )
 
 require (
-	github.com/bytedance/gopkg v0.1.3 // indirect
-	github.com/bytedance/sonic v1.15.0 // indirect
-	github.com/bytedance/sonic/loader v0.5.0 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cloudwego/base64x v0.1.6 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
-	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.30.1 // indirect
-	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/goccy/go-yaml v1.19.2 // indirect
+	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
@@ -50,19 +46,17 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
-	github.com/quic-go/quic-go v0.59.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -75,15 +69,14 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.3.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.mongodb.org/mongo-driver/v2 v2.5.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/arch v0.22.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.51.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/text v0.20.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	modernc.org/libc v1.22.5 // indirect
 	modernc.org/mathutil v1.5.0 // indirect

go.sum

@@ -4,16 +4,14 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
-github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
-github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
-github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
-github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
-github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
-github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -26,14 +24,12 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
-github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
-github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
-github.com/gin-contrib/gzip v1.2.6 h1:OtN8DplD5DNZCSLAnQ5HxRkD2qZ5VU+JhOrcfJrcRvg=
-github.com/gin-contrib/gzip v1.2.6/go.mod h1:BQy8/+JApnRjAVUplSGZiVtD2k8GmIE2e9rYu/hLzzU=
-github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
-github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
-github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8=
-github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
 github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
 github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
@@ -46,17 +42,17 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w=
-github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
-github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
-github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
-github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
+github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
 github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
@@ -78,20 +74,21 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -99,24 +96,20 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
-github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
-github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
-github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
 github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
 github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -140,15 +133,15 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -157,44 +150,43 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F
 github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=
-github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
-go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
-go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI=
-golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
-golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
-google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -215,3 +207,4 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
 modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
 modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

internal/config/config_test.go

@@ -43,8 +43,8 @@ func TestLoadDefaults(t *testing.T) {
 	if cfg.Cache.RedisPrefix != "mebox" {
 		t.Fatalf("expected default redis prefix, got %q", cfg.Cache.RedisPrefix)
 	}
-	if cfg.Cache.MediaTTLSeconds != 90 {
-		t.Fatalf("expected default media cache ttl 90, got %d", cfg.Cache.MediaTTLSeconds)
+	if cfg.Cache.MediaTTLSeconds != 15 {
+		t.Fatalf("expected default media cache ttl 15, got %d", cfg.Cache.MediaTTLSeconds)
 	}
 	if cfg.Search.Index != "mebox_media" {
 		t.Fatalf("expected default search index, got %q", cfg.Search.Index)

internal/config/defaults.go

@@ -47,7 +47,7 @@ func setDefaults(v *viper.Viper) {
 	v.SetDefault("cache.cleanup_interval_min", 60)
 	v.SetDefault("cache.redis_url", "")
 	v.SetDefault("cache.redis_prefix", "mebox")
-	v.SetDefault("cache.media_ttl_seconds", 90)
+	v.SetDefault("cache.media_ttl_seconds", 15)
 
 	v.SetDefault("search.backend", "")
 	v.SetDefault("search.opensearch_url", "")

internal/config/normalize.go

@@ -51,7 +51,7 @@ func (c *Config) normalize() error {
 		c.Cache.RedisPrefix = "mebox"
 	}
 	if c.Cache.MediaTTLSeconds < 1 {
-		c.Cache.MediaTTLSeconds = 90
+		c.Cache.MediaTTLSeconds = 15
 	}
 	c.Search.Backend = strings.ToLower(strings.TrimSpace(c.Search.Backend))
 	if c.Search.Index == "" {

internal/database/schema_migration.go

@@ -8,11 +8,6 @@ import (
 
 // AutoMigrate creates tables for every model registered in the model package.
 func AutoMigrate(db *gorm.DB) error {
-	// 必须先于 AutoMigrate：旧库中可能已有重复的 (user_id, media_id) 历史行，
-	// 不去重会导致唯一索引 uniq_user_history 创建失败。
-	if err := dedupePlaybackHistories(db); err != nil {
-		return err
-	}
 	if err := db.AutoMigrate(model.AllModels()...); err != nil {
 		return err
 	}
@@ -42,27 +37,6 @@ func ensureSQLiteQueryOptimizer(db *gorm.DB) error {
 	return db.Exec("ANALYZE").Error
 }
 
-// dedupePlaybackHistories removes duplicate (user_id, media_id) rows left by
-// the former read-then-write upsert, so the uniq_user_history composite unique
-// index can be created on existing databases. Keeps the most recent row per
-// pair, preferring live rows over soft-deleted ones.
-func dedupePlaybackHistories(db *gorm.DB) error {
-	if !db.Migrator().HasTable("playback_histories") {
-		return nil
-	}
-	return db.Exec(`
-DELETE FROM playback_histories WHERE id IN (
-	SELECT id FROM (
-		SELECT id, ROW_NUMBER() OVER (
-			PARTITION BY user_id, media_id
-			ORDER BY deleted_at IS NULL DESC, watched_at DESC, id DESC
-		) AS rn
-		FROM playback_histories
-	) ranked
-	WHERE ranked.rn > 1
-)`).Error
-}
-
 func ensurePostgresColumnCompatibility(db *gorm.DB) error {
 	if !isPostgres(db) {
 		return nil
@@ -86,16 +60,8 @@ func ensurePostgresColumnCompatibility(db *gorm.DB) error {
 
 func ensurePerformanceIndexes(db *gorm.DB) error {
 	statements := []string{
-		// 完整多级排序索引：媒体库分页与首页预览的 ORDER BY
-		// (release_date, year, updated_at, created_at, id) DESC 与索引列完全一致，
-		// LIMIT 分页沿索引顺序直取，免去对整库行做临时 B-tree 排序。
-		`CREATE INDEX IF NOT EXISTS idx_media_library_recent_active ON media(library_id, release_date DESC, year DESC, updated_at DESC, created_at DESC, id DESC) WHERE deleted_at IS NULL`,
-		// 计数覆盖索引：首页 CountByLibraries 的 GROUP BY library_id + nsfw 谓词
-		// 全部落在索引键/部分索引条件上，纯索引扫描即可完成，不回表。
-		`CREATE INDEX IF NOT EXISTS idx_media_library_nsfw_active ON media(library_id, nsfw) WHERE deleted_at IS NULL`,
-		// 旧的两键前缀索引被上面的完整排序索引完全覆盖，删除以降低写放大。
-		`DROP INDEX IF EXISTS idx_media_library_release_active`,
 		`CREATE INDEX IF NOT EXISTS idx_media_library_created_active ON media(library_id, created_at DESC) WHERE deleted_at IS NULL`,
+		`CREATE INDEX IF NOT EXISTS idx_media_library_release_active ON media(library_id, release_date DESC, year DESC) WHERE deleted_at IS NULL`,
 		`CREATE INDEX IF NOT EXISTS idx_media_library_episode_active ON media(library_id, season_num, episode_num, created_at DESC) WHERE deleted_at IS NULL`,
 		`CREATE INDEX IF NOT EXISTS idx_media_library_root_active ON media(library_id, library_root_id) WHERE deleted_at IS NULL`,
 		`CREATE INDEX IF NOT EXISTS idx_media_series_active ON media(series_id, season_num, episode_num) WHERE deleted_at IS NULL`,

internal/database/schema_migration_history_test.go

@@ -1,84 +0,0 @@
-package database
-
-import (
-	"testing"
-	"time"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-)
-
-// TestAutoMigrateDedupesPlaybackHistories reproduces the upgrade path: a legacy
-// database contains duplicate (user_id, media_id) history rows created by the
-// old read-then-write upsert. AutoMigrate must merge them before creating the
-// uniq_user_history composite unique index, otherwise the upgrade fails.
-func TestAutoMigrateDedupesPlaybackHistories(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	// 旧 schema：无 uniq_user_history 唯一索引。
-	if err := db.Exec(`CREATE TABLE playback_histories (
-		id varchar(36) PRIMARY KEY,
-		created_at datetime,
-		updated_at datetime,
-		deleted_at datetime,
-		user_id varchar(36) NOT NULL,
-		media_id varchar(128) NOT NULL,
-		position_ms integer,
-		duration_ms integer,
-		watched_at datetime,
-		completed numeric
-	)`).Error; err != nil {
-		t.Fatal(err)
-	}
-	base := time.Now()
-	rows := []struct {
-		id        string
-		position  int64
-		watchedAt time.Time
-	}{
-		{"h-old", 1_000, base.Add(-2 * time.Hour)},
-		{"h-mid", 2_000, base.Add(-1 * time.Hour)},
-		{"h-new", 3_000, base},
-	}
-	for _, r := range rows {
-		if err := db.Exec(
-			`INSERT INTO playback_histories (id, user_id, media_id, position_ms, watched_at, created_at, updated_at)
-			 VALUES (?, 'u-1', 'm-1', ?, ?, ?, ?)`,
-			r.id, r.position, r.watchedAt, r.watchedAt, r.watchedAt,
-		).Error; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if err := AutoMigrate(db); err != nil {
-		t.Fatalf("auto migrate with duplicate histories: %v", err)
-	}
-
-	var count int64
-	if err := db.Table("playback_histories").Where("user_id = ? AND media_id = ?", "u-1", "m-1").Count(&count).Error; err != nil {
-		t.Fatal(err)
-	}
-	if count != 1 {
-		t.Fatalf("expected duplicate rows merged to 1, got %d", count)
-	}
-	var position int64
-	if err := db.Table("playback_histories").
-		Where("user_id = ? AND media_id = ?", "u-1", "m-1").
-		Select("position_ms").Scan(&position).Error; err != nil {
-		t.Fatal(err)
-	}
-	if position != 3_000 {
-		t.Fatalf("dedupe should keep the most recent row, got position_ms=%d", position)
-	}
-
-	// 唯一索引存在时，重复插入同一 (user_id, media_id) 应触发冲突而非新增行。
-	if err := db.Exec(
-		`INSERT INTO playback_histories (id, user_id, media_id, position_ms, watched_at, created_at, updated_at)
-		 VALUES ('h-dup', 'u-1', 'm-1', 4_000, ?, ?, ?)`,
-		base, base, base,
-	).Error; err == nil {
-		t.Fatal("insert violating uniq_user_history should fail")
-	}
-}

internal/handler/handler.go

@@ -9,14 +9,12 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/middleware"
 	"github.com/truewhile/MeBox/internal/service"
 )
 
 // Register attaches every API route to the engine.
 func Register(r *gin.Engine, cfg *config.Config, log *zap.Logger, svc *service.Container) {
 	api := r.Group("/api")
-	api.Use(middleware.GzipAPI())
 	{
 		api.GET("/health", healthCheck)
 		api.GET("/version", versionInfo)

internal/handler/media.go

@@ -11,10 +11,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/middleware"
 	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
 	"github.com/truewhile/MeBox/internal/service"
 )
 
@@ -60,37 +58,17 @@ func listLibrariesHandler(svc *service.Container) gin.HandlerFunc {
 		}
 		role, _ := c.Get(middleware.CtxUserRole)
 		includeHidden := role == "admin" && (c.Query("include_hidden") == "1" || c.Query("include_hidden") == "true" || c.Query("all") == "1")
-			if !includeHidden {
-				libs = service.FilterDisplayCloudLibraries(ctx, svc.Repo, libs)
-				visibility := mediaVisibilityForRequest(c, svc)
-				filtered := libs[:0]
-				for _, lib := range libs {
-					if service.LibraryVisibleForUser(ctx, svc.Repo, lib, visibility) {
-						filtered = append(filtered, lib)
-					}
-				}
-				libs = filtered
-			}
-			rawIDs := strings.TrimSpace(c.Query("ids"))
-			var targetSet map[string]struct{}
-			if rawIDs != "" {
-				targetSet = make(map[string]struct{})
-				for _, id := range strings.Split(rawIDs, ",") {
-					id = strings.TrimSpace(id)
-					if id != "" {
-						targetSet[id] = struct{}{}
-					}
+		if !includeHidden {
+			libs = service.FilterDisplayCloudLibraries(ctx, svc.Repo, libs)
+			visibility := mediaVisibilityForRequest(c, svc)
+			filtered := libs[:0]
+			for _, lib := range libs {
+				if service.LibraryVisibleForUser(ctx, svc.Repo, lib, visibility) {
+					filtered = append(filtered, lib)
 				}
 			}
-			if len(targetSet) > 0 {
-				filtered := libs[:0]
-				for _, lib := range libs {
-					if _, ok := targetSet[lib.ID]; ok {
-						filtered = append(filtered, lib)
-					}
-				}
-				libs = filtered
-			}
+			libs = filtered
+		}
 		withPreview := c.Query("with_preview") == "1" || c.Query("with_preview") == "true"
 		limit := 10
 		if withPreview {
@@ -111,50 +89,23 @@ func listLibrariesHandler(svc *service.Container) gin.HandlerFunc {
 			for _, p := range previews {
 				out = append(out, webLibraryPayload{Library: p.Library, Total: p.Total, Cards: p.Cards})
 			}
-			} else {
-				visibility := mediaVisibilityForRequest(c, svc)
-				libIDs := make([]string, len(libs))
-				for i, l := range libs {
-					libIDs[i] = l.ID
-				}
-				counts, _ := svc.Repo.Media.CountByLibraries(ctx, libIDs, repository.MediaQueryFilter{
-					IncludeNSFW:       visibility.IncludeNSFW,
-					AllowedLibraryIDs: visibility.AllowedLibraryIDs,
-					HiddenLibraryIDs:  visibility.HiddenLibraryIDs,
-				})
-				for _, l := range libs {
-					var total int64
-					if counts != nil {
-						total = counts[l.ID]
-					}
-					out = append(out, webLibraryPayload{Library: l, Total: total})
-				}
+		} else {
+			for _, l := range libs {
+				out = append(out, webLibraryPayload{Library: l})
 			}
-		// 远程 Emby 挂载库追加在本地库之后（非管理员视图仍受 allowed_library_ids 约束）。
+		}
+		// 远程 Emby 挂载库追加在本地库之后。
 		if svc.EmbyRemote != nil {
 			if views, err := svc.EmbyRemote.RemoteLibraries(ctx); err == nil {
-					visibility := mediaVisibilityForRequest(c, svc)
-					allowedViews := make([]service.RemoteLibraryView, 0, len(views))
-					for _, v := range views {
-						if !includeHidden && !service.LibraryVisibleForUser(ctx, svc.Repo, v.Library, visibility) {
-							continue
-						}
-						if len(targetSet) > 0 {
-							if _, ok := targetSet[v.Library.ID]; !ok {
-								continue
-							}
-						}
-						allowedViews = append(allowedViews, v)
-					}
-				remotePayloads := make([]webLibraryPayload, len(allowedViews))
-				for i, v := range allowedViews {
+				remotePayloads := make([]webLibraryPayload, len(views))
+				for i, v := range views {
 					remotePayloads[i] = webLibraryPayload{Library: v.Library, IsRemoteEmby: true, RemoteSource: v.AccountName}
 				}
-				if withPreview && len(allowedViews) > 0 {
+				if withPreview && len(views) > 0 {
 					const maxRemotePreviewWorkers = 6
 					sem := make(chan struct{}, maxRemotePreviewWorkers)
 					var wg sync.WaitGroup
-					for i, v := range allowedViews {
+					for i, v := range views {
 						i, v := i, v
 						wg.Add(1)
 						go func() {
@@ -165,20 +116,18 @@ func listLibrariesHandler(svc *service.Container) gin.HandlerFunc {
 							case <-ctx.Done():
 								return
 							}
-							helper.Run(svc.Log, "media.remotePreview", func() {
-								acct := svc.EmbyRemote.AccountByID(ctx, v.AccountID)
-								if acct == nil {
-									return
-								}
-								tmpMount := &model.EmbyMount{Base: model.Base{ID: v.MountID}}
-								itemTypes := remoteLibraryItemTypes(v.CollectionType)
-								if _, total, err := svc.EmbyRemote.RemoteLibraryMedia(ctx, tmpMount, acct, v.RemoteID, itemTypes, 0, 1); err == nil {
-									remotePayloads[i].Total = total
-								}
-								if cards, err := svc.EmbyRemote.RemoteLatestCards(ctx, tmpMount, acct, v.RemoteID, limit); err == nil {
-									remotePayloads[i].Cards = cards
-								}
-							})
+							acct := svc.EmbyRemote.AccountByID(ctx, v.AccountID)
+							if acct == nil {
+								return
+							}
+							tmpMount := &model.EmbyMount{Base: model.Base{ID: v.MountID}}
+							itemTypes := remoteLibraryItemTypes(v.CollectionType)
+							if _, total, err := svc.EmbyRemote.RemoteLibraryMedia(ctx, tmpMount, acct, v.RemoteID, itemTypes, 0, 1); err == nil {
+								remotePayloads[i].Total = total
+							}
+							if cards, err := svc.EmbyRemote.RemoteLatestCards(ctx, tmpMount, acct, v.RemoteID, limit); err == nil {
+								remotePayloads[i].Cards = cards
+							}
 						}()
 					}
 					wg.Wait()
@@ -202,12 +151,6 @@ func getLibraryHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			role, _ := c.Get(middleware.CtxUserRole)
-			includeHidden := role == "admin" && (c.Query("include_hidden") == "1" || c.Query("include_hidden") == "true" || c.Query("all") == "1")
-			if !includeHidden && !service.LibraryVisibleForUser(ctx, svc.Repo, view.Library, mediaVisibilityForRequest(c, svc)) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			c.JSON(http.StatusOK, webLibraryPayload{Library: view.Library, IsRemoteEmby: true, RemoteSource: view.AccountName})
 			return
 		}
@@ -387,10 +330,6 @@ func listMediaHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			itemTypes := ""
 			if view, err := svc.EmbyRemote.RemoteLibraryByID(ctx, mountID, remoteID); err == nil && view != nil {
 				itemTypes = remoteLibraryItemTypes(view.CollectionType)
@@ -458,10 +397,6 @@ func getMediaHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			m, err := svc.EmbyRemote.RemoteMediaDetail(ctx, mount, acct, remoteID)
 			if err != nil {
 				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
@@ -517,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})
 	}
 }
@@ -644,10 +520,6 @@ func streamHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			if mount.ProxyPlay {
 				if err := svc.Emby.ProxyRemoteVideoStream(ctx, c.Writer, c.Request, mountID, remoteID); err != nil {
 					if !c.Writer.Written() {

internal/handler/media_delete.go

@@ -1,35 +0,0 @@
-// Package handler — media delete endpoint.
-package handler
-
-import (
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-
-	"github.com/truewhile/MeBox/internal/service"
-)
-
-func deleteMediaHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		deleteFiles := parseDeleteFilesQuery(c.Query("delete_files"))
-		if err := svc.Media.DeleteMedia(c.Request.Context(), c.Param("id"), deleteFiles); err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.Status(http.StatusNoContent)
-	}
-}
-
-func parseDeleteFilesQuery(raw string) bool {
-	raw = strings.TrimSpace(strings.ToLower(raw))
-	if raw == "" {
-		return false
-	}
-	if raw == "1" || raw == "true" || raw == "yes" {
-		return true
-	}
-	v, err := strconv.ParseBool(raw)
-	return err == nil && v
-}

internal/handler/media_delete_test.go

@@ -1,23 +0,0 @@
-package handler
-
-import "testing"
-
-func TestParseDeleteFilesQuery(t *testing.T) {
-	cases := []struct {
-		raw  string
-		want bool
-	}{
-		{"", false},
-		{"0", false},
-		{"false", false},
-		{"1", true},
-		{"true", true},
-		{"TRUE", true},
-		{"yes", true},
-	}
-	for _, tc := range cases {
-		if got := parseDeleteFilesQuery(tc.raw); got != tc.want {
-			t.Fatalf("parseDeleteFilesQuery(%q)=%v, want %v", tc.raw, got, tc.want)
-		}
-	}
-}

internal/handler/media_favorite.go

@@ -13,6 +13,7 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/truewhile/MeBox/internal/middleware"
+	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/service"
 )
 
@@ -22,18 +23,18 @@ import (
 func addMediaFavoriteHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		uid, _ := c.Get(middleware.CtxUserID)
-		userID := toString(uid)
-		mediaID := c.Param("id")
-		favorite, err := service.IsUserFavorite(c.Request.Context(), svc.Repo, userID, mediaID)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		if favorite {
+		// Check current state.
+		var existing model.Favorite
+		err := svc.Repo.DB.WithContext(c.Request.Context()).
+			Where("user_id = ? AND media_id = ?", uid, c.Param("id")).
+			First(&existing).Error
+		if err == nil {
 			c.JSON(http.StatusOK, gin.H{"favourite": true})
 			return
 		}
-		if err := svc.Playback.SetFavourite(c.Request.Context(), userID, mediaID, true); err != nil {
+		// Otherwise create.
+		fav := &model.Favorite{UserID: toString(uid), MediaID: c.Param("id")}
+		if err := svc.Repo.DB.WithContext(c.Request.Context()).Create(fav).Error; err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
@@ -45,7 +46,9 @@ func addMediaFavoriteHandler(svc *service.Container) gin.HandlerFunc {
 func removeMediaFavoriteHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		uid, _ := c.Get(middleware.CtxUserID)
-		if err := svc.Playback.SetFavourite(c.Request.Context(), toString(uid), c.Param("id"), false); err != nil {
+		if err := svc.Repo.DB.WithContext(c.Request.Context()).
+			Where("user_id = ? AND media_id = ?", uid, c.Param("id")).
+			Delete(&model.Favorite{}).Error; err != nil {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
@@ -57,12 +60,12 @@ func removeMediaFavoriteHandler(svc *service.Container) gin.HandlerFunc {
 func getMediaFavoriteStatusHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		uid, _ := c.Get(middleware.CtxUserID)
-		favorite, err := service.IsUserFavorite(c.Request.Context(), svc.Repo, toString(uid), c.Param("id"))
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"favourite": favorite})
+		var n int64
+		_ = svc.Repo.DB.WithContext(c.Request.Context()).
+			Model(&model.Favorite{}).
+			Where("user_id = ? AND media_id = ?", uid, c.Param("id")).
+			Count(&n).Error
+		c.JSON(http.StatusOK, gin.H{"favourite": n > 0})
 	}
 }
 

internal/handler/media_scan.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/service"
 )
 
@@ -42,11 +41,7 @@ func scanLibraryHandler(svc *service.Container) gin.HandlerFunc {
 		task := startScanHTTPTask(svc, "手动扫描入库", lib.Name, lib.Path)
 		go func(libraryID string, task *service.TaskHandle, finish func()) {
 			defer finish()
-			var res *service.ScanResult
-			var err error
-			helper.Run(svc.Log, "scan.library", func() {
-				res, err = svc.Scan.ScanLibrary(context.Background(), libraryID)
-			})
+			res, err := svc.Scan.ScanLibrary(context.Background(), libraryID)
 			if err != nil {
 				finishHTTPTask(task, err, "scan", "手动扫描入库失败", scanTaskMetrics(res), scanTaskDetails(res, 20))
 				return
@@ -80,11 +75,7 @@ func scanLibraryRootHandler(svc *service.Container) gin.HandlerFunc {
 		task := startScanHTTPTask(svc, "手动扫描媒体库路径", id, rootID)
 		go func(libraryID, libraryRootID string, task *service.TaskHandle, finish func()) {
 			defer finish()
-			var res *service.ScanResult
-			var err error
-			helper.Run(svc.Log, "scan.libraryRoot", func() {
-				res, err = svc.Scan.ScanLibraryRoot(context.Background(), libraryID, libraryRootID)
-			})
+			res, err := svc.Scan.ScanLibraryRoot(context.Background(), libraryID, libraryRootID)
 			if err != nil {
 				finishHTTPTask(task, err, "scan", "手动扫描路径失败", scanTaskMetrics(res), scanTaskDetails(res, 20))
 				return
@@ -119,13 +110,11 @@ func queueLibraryRootScan(svc *service.Container, libraryID, rootID string) {
 	}
 	go func() {
 		defer finish()
-		helper.Run(svc.Log, "scan.queuedRoot", func() {
-			if strings.TrimSpace(rootID) == "" {
-				_, _ = svc.Scan.ScanLibrary(context.Background(), libraryID)
-				return
-			}
-			_, _ = svc.Scan.ScanLibraryRoot(context.Background(), libraryID, rootID)
-		})
+		if strings.TrimSpace(rootID) == "" {
+			_, _ = svc.Scan.ScanLibrary(context.Background(), libraryID)
+			return
+		}
+		_, _ = svc.Scan.ScanLibraryRoot(context.Background(), libraryID, rootID)
 	}()
 }
 

internal/handler/media_test.go

@@ -104,16 +104,11 @@ func TestListLibrariesHidesAdultDirectoriesUnlessAdminRequestsAll(t *testing.T)
 		t.Fatalf("watching library list should hide adult directories, got %#v", visible)
 	}
 
-		all := requestLibraries(t, svc, viewer.ID, "admin", "/api/libraries?include_hidden=1")
-		if len(all) != 2 {
-			t.Fatalf("admin include_hidden list should keep management access, got %#v", all)
-		}
-
-		filtered := requestLibraries(t, svc, viewer.ID, "admin", "/api/libraries?include_hidden=1&ids="+safe.ID)
-		if len(filtered) != 1 || filtered[0].ID != safe.ID {
-			t.Fatalf("ids filter should return only requested library, got %#v", filtered)
-		}
+	all := requestLibraries(t, svc, viewer.ID, "admin", "/api/libraries?include_hidden=1")
+	if len(all) != 2 {
+		t.Fatalf("admin include_hidden list should keep management access, got %#v", all)
 	}
+}
 
 func TestGetLibraryAllowsEmptyLibrary(t *testing.T) {
 	gin.SetMode(gin.TestMode)
@@ -441,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/pinned_libraries.go

@@ -1,49 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-
-	"github.com/truewhile/MeBox/internal/middleware"
-	"github.com/truewhile/MeBox/internal/service"
-)
-
-type pinnedLibrariesReq struct {
-	LibraryIDs []string `json:"library_ids"`
-}
-
-func getPinnedLibrariesHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		uid, _ := c.Get(middleware.CtxUserID)
-		ids, err := svc.Profile.GetPinnedLibraryIDs(c.Request.Context(), uid.(string))
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-			return
-		}
-		if ids == nil {
-			ids = []string{}
-		}
-		c.JSON(http.StatusOK, gin.H{"library_ids": ids})
-	}
-}
-
-func setPinnedLibrariesHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		var req pinnedLibrariesReq
-		if err := c.ShouldBindJSON(&req); err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-			return
-		}
-		uid, _ := c.Get(middleware.CtxUserID)
-		ids, err := svc.Profile.SetPinnedLibraryIDs(c.Request.Context(), uid.(string), req.LibraryIDs)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-			return
-		}
-		if ids == nil {
-			ids = []string{}
-		}
-		c.JSON(http.StatusOK, gin.H{"library_ids": ids})
-	}
-}

internal/handler/recycle.go

@@ -0,0 +1,40 @@
+// Package handler — recycle bin endpoints.
+package handler
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/truewhile/MeBox/internal/service"
+)
+
+func deleteMediaHandler(svc *service.Container) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if err := svc.Media.SoftDelete(c.Request.Context(), c.Param("id")); err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.Status(http.StatusNoContent)
+	}
+}
+
+func restoreMediaHandler(svc *service.Container) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if err := svc.Media.RestoreDeleted(c.Request.Context(), c.Param("id")); err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.Status(http.StatusNoContent)
+	}
+}
+
+func purgeMediaHandler(svc *service.Container) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		if err := svc.Media.PurgeDeleted(c.Request.Context(), c.Param("id")); err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.Status(http.StatusNoContent)
+	}
+}

internal/handler/routes_admin.go

@@ -37,7 +37,6 @@ func registerAdminScraperRoutes(admin *gin.RouterGroup, svc *service.Container)
 	admin.POST("/scraper/queue/clear-done", clearDoneScrapeTasksHandler(svc))
 	admin.POST("/scraper/queue/clear-finished", clearFinishedScrapeTasksHandler(svc))
 	admin.POST("/scraper/queue/clear-canceled", clearCanceledScrapeTasksHandler(svc))
-	admin.POST("/scraper/queue/clear-failed", clearFailedScrapeTasksHandler(svc))
 	admin.POST("/scraper/queue/retry-failed", retryAllFailedScrapeTasksHandler(svc))
 	admin.POST("/scraper/queue/cancel-pending", cancelPendingScrapeTasksHandler(svc))
 	admin.POST("/scraper/queue/enqueue-library/:id", enqueueLibraryScrapeHandler(svc))
@@ -88,7 +87,6 @@ func registerAdminStrmRoutes(admin *gin.RouterGroup, svc *service.Container) {
 	admin.POST("/strm/downloads/clear-done", clearDoneDownloadsHandler(svc))
 	admin.POST("/strm/downloads/clear-finished", clearFinishedDownloadsHandler(svc))
 	admin.POST("/strm/downloads/clear-canceled", clearCanceledDownloadsHandler(svc))
-	admin.POST("/strm/downloads/clear-failed", clearFailedDownloadsHandler(svc))
 	admin.POST("/strm/downloads/retry-failed", retryAllFailedDownloadsHandler(svc))
 	admin.POST("/strm/downloads/cancel-pending", cancelPendingDownloadsHandler(svc))
 	admin.GET("/strm/uploads", uploadQueueHandler(svc))
@@ -99,7 +97,6 @@ func registerAdminStrmRoutes(admin *gin.RouterGroup, svc *service.Container) {
 	admin.POST("/strm/uploads/clear-done", clearDoneUploadsHandler(svc))
 	admin.POST("/strm/uploads/clear-finished", clearFinishedUploadsHandler(svc))
 	admin.POST("/strm/uploads/clear-canceled", clearCanceledUploadsHandler(svc))
-	admin.POST("/strm/uploads/clear-failed", clearFailedUploadsHandler(svc))
 	admin.POST("/strm/uploads/retry-failed", retryAllFailedUploadsHandler(svc))
 	admin.POST("/strm/uploads/cancel-pending", cancelPendingUploadsHandler(svc))
 }

internal/handler/routes_authenticated.go

@@ -21,7 +21,7 @@ func registerAuthenticatedRoutes(api *gin.RouterGroup, cfg *config.Config, svc *
 	registerAuthedCollectionRoutes(authed, svc)
 	registerAuthedFileRoutes(authed, svc)
 	registerAuthedDLNARoutes(authed, svc)
-	registerAuthedRealtimeRoutes(authed, svc)
+	registerAuthedRecycleAndRealtimeRoutes(authed, svc)
 	registerAuthedUISurfaceRoutes(authed, svc)
 	registerAuthedSearchRoutes(authed, svc)
 	registerAuthedSystemExtraRoutes(authed, svc)

internal/handler/routes_authenticated_core.go

@@ -10,8 +10,6 @@ import (
 func registerAuthedUserAndLicenseRoutes(authed *gin.RouterGroup, svc *service.Container) {
 	authed.GET("/me", meHandler(svc))
 	authed.PATCH("/me", updateProfileHandler(svc))
-	authed.GET("/me/pinned-libraries", getPinnedLibrariesHandler(svc))
-	authed.PUT("/me/pinned-libraries", setPinnedLibrariesHandler(svc))
 	authed.POST("/me/password", changePasswordHandler(svc))
 	authed.POST("/me/logout", logoutHandler(svc))
 
@@ -50,6 +48,8 @@ func registerAuthedMediaRoutes(authed *gin.RouterGroup, svc *service.Container)
 	authed.POST("/media/scrape/apply", middleware.AdminRequired(), manualScrapeApplyBatchHandler(svc))
 	authed.POST("/media/:id/probe", middleware.AdminRequired(), reprobeHandler(svc))
 	authed.DELETE("/media/:id", middleware.AdminRequired(), deleteMediaHandler(svc))
+	authed.POST("/media/:id/restore", middleware.AdminRequired(), restoreMediaHandler(svc))
+	authed.DELETE("/media/:id/purge", middleware.AdminRequired(), purgeMediaHandler(svc))
 	authed.GET("/media/:id/subtitles", listSubtitlesHandler(svc))
 	authed.GET("/subtitles/:id", serveSubtitleHandler(svc))
 	authed.POST("/media/:id/nfo", middleware.AdminRequired(), exportNFOHandler(svc))

internal/handler/routes_authenticated_features.go

@@ -20,7 +20,7 @@ func registerAuthedDLNARoutes(authed *gin.RouterGroup, svc *service.Container) {
 	authed.POST("/dlna/cast", dlnaCastHandler(svc))
 }
 
-func registerAuthedRealtimeRoutes(authed *gin.RouterGroup, svc *service.Container) {
+func registerAuthedRecycleAndRealtimeRoutes(authed *gin.RouterGroup, svc *service.Container) {
 	authed.GET("/ws", wsHandler(svc))
 	authed.GET("/events", sseHandler(svc))
 }

internal/handler/routes_authenticated_test.go

@@ -25,8 +25,6 @@ func TestAuthenticatedRouteSurfacesAreRegistered(t *testing.T) {
 
 	for _, want := range []string{
 		"GET /api/me",
-		"GET /api/me/pinned-libraries",
-		"PUT /api/me/pinned-libraries",
 		"GET /api/auth/permissions",
 		"GET /api/libraries",
 		"GET /api/media",

internal/handler/scraper_queue.go

@@ -101,17 +101,6 @@ func clearCanceledScrapeTasksHandler(svc *service.Container) gin.HandlerFunc {
 	}
 }
 
-func clearFailedScrapeTasksHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		n, err := svc.Scraper.ClearFailedScrapeTasks(c.Request.Context())
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"deleted": n})
-	}
-}
-
 func retryAllFailedScrapeTasksHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		n, err := svc.Scraper.RetryAllFailedScrapeTasks(c.Request.Context())

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/series.go

@@ -74,10 +74,6 @@ func listLibrarySeriesHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			cards, err := svc.EmbyRemote.RemoteSeriesCards(ctx, mount, acct, remoteID)
 			if err != nil {
 				writeInternalOrCanceled(c, err)
@@ -169,10 +165,6 @@ func listLibrarySeriesEpisodesHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			items, err := svc.EmbyRemote.RemoteEpisodes(ctx, mount, acct, remoteSeriesID)
 			if err != nil {
 				writeInternalOrCanceled(c, err)
@@ -215,10 +207,6 @@ func listMediaEpisodesHandler(svc *service.Container) gin.HandlerFunc {
 				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
 				return
 			}
-			if !service.EmbyMountLibraryAllowed(mediaVisibilityForRequest(c, svc), mount) {
-				c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
-				return
-			}
 			items, err := svc.EmbyRemote.RemoteEpisodes(ctx, mount, acct, remoteID)
 			if err != nil {
 				writeInternalOrCanceled(c, err)

internal/handler/strm.go

@@ -526,17 +526,6 @@ func clearCanceledDownloadsHandler(svc *service.Container) gin.HandlerFunc {
 	}
 }
 
-func clearFailedDownloadsHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		n, err := svc.Strm.ClearFailedDownloadTasks(c.Request.Context())
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"deleted": n})
-	}
-}
-
 func clearCanceledUploadsHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		n, err := svc.Strm.ClearCanceledUploadTasks(c.Request.Context())
@@ -548,17 +537,6 @@ func clearCanceledUploadsHandler(svc *service.Container) gin.HandlerFunc {
 	}
 }
 
-func clearFailedUploadsHandler(svc *service.Container) gin.HandlerFunc {
-	return func(c *gin.Context) {
-		n, err := svc.Strm.ClearFailedUploadTasks(c.Request.Context())
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"deleted": n})
-	}
-}
-
 func clearDoneUploadsHandler(svc *service.Container) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		n, err := svc.Strm.ClearDoneUploadTasks(c.Request.Context())

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/helper/goroutine.go

@@ -1,53 +0,0 @@
-// Package helper provides shared utilities.
-package helper
-
-import (
-	"fmt"
-	"os"
-	"runtime/debug"
-
-	"go.uber.org/zap"
-)
-
-// Go runs fn in a new goroutine and recovers from panics so that a failure in
-// a background task (scraper parsing remote responses, cloud-drive sync, ...)
-// is logged instead of crashing the whole process. log may be nil.
-func Go(log *zap.Logger, name string, fn func()) {
-	go Run(log, name, fn)
-}
-
-// Run executes fn and recovers from panics, logging the task name and stack.
-// Use it as the first statement inside goroutines spawned elsewhere, or wrap
-// loop bodies so one bad iteration cannot kill a long-running worker.
-func Run(log *zap.Logger, name string, fn func()) {
-	defer func() {
-		if r := recover(); r != nil {
-			logPanic(log, name, r)
-		}
-	}()
-	fn()
-}
-
-// Recover runs fn and converts a panic into an error so callers can run their
-// own deferred cleanup (releasing locks, updating job state) before unwinding.
-func Recover(log *zap.Logger, name string, fn func() error) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			logPanic(log, name, r)
-			err = fmt.Errorf("%s panicked: %v", name, r)
-		}
-	}()
-	return fn()
-}
-
-func logPanic(log *zap.Logger, name string, r any) {
-	if log == nil {
-		fmt.Fprintf(os.Stderr, "background task panicked: task=%s panic=%v\n%s\n", name, r, debug.Stack())
-		return
-	}
-	log.Error("background task panicked",
-		zap.String("task", name),
-		zap.Any("panic", r),
-		zap.ByteString("stack", debug.Stack()),
-	)
-}

internal/helper/goroutine_test.go

@@ -1,95 +0,0 @@
-package helper
-
-import (
-	"errors"
-	"strings"
-	"testing"
-	"time"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest/observer"
-)
-
-func newObservedLogger(t *testing.T) (*zap.Logger, *observer.ObservedLogs) {
-	t.Helper()
-	core, logs := observer.New(zap.ErrorLevel)
-	return zap.New(core), logs
-}
-
-func waitForLogs(t *testing.T, logs *observer.ObservedLogs, n int) []observer.LoggedEntry {
-	t.Helper()
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if entries := logs.All(); len(entries) >= n {
-			return entries
-		}
-		time.Sleep(5 * time.Millisecond)
-	}
-	t.Fatalf("timed out waiting for %d log entries, got %d", n, logs.Len())
-	return nil
-}
-
-func TestRunRecoversPanic(t *testing.T) {
-	log, logs := newObservedLogger(t)
-	ran := false
-	Run(log, "unit.panic", func() {
-		ran = true
-		panic("boom")
-	})
-	if !ran {
-		t.Fatal("fn should have run before panicking")
-	}
-	entries := waitForLogs(t, logs, 1)
-	if entries[0].Message != "background task panicked" {
-		t.Fatalf("unexpected message: %s", entries[0].Message)
-	}
-	found := false
-	for _, f := range entries[0].Context {
-		if f.Key == "task" && f.String == "unit.panic" {
-			found = true
-		}
-	}
-	if !found {
-		t.Fatalf("expected task name in log context: %v", entries[0].Context)
-	}
-}
-
-func TestRunNoPanicNoLog(t *testing.T) {
-	log, logs := newObservedLogger(t)
-	Run(log, "unit.ok", func() {})
-	time.Sleep(10 * time.Millisecond)
-	if logs.Len() != 0 {
-		t.Fatalf("expected no error log, got %d", logs.Len())
-	}
-}
-
-func TestRecoverConvertsPanicToError(t *testing.T) {
-	log, _ := newObservedLogger(t)
-	err := Recover(log, "unit.recover", func() error {
-		panic("kaboom")
-	})
-	if err == nil {
-		t.Fatal("expected error from recovered panic")
-	}
-	if !strings.Contains(err.Error(), "kaboom") {
-		t.Fatalf("panic value should be in error: %v", err)
-	}
-}
-
-func TestRecoverReturnsFnError(t *testing.T) {
-	sentinel := errors.New("plain failure")
-	err := Recover(nil, "unit.err", func() error { return sentinel })
-	if !errors.Is(err, sentinel) {
-		t.Fatalf("expected fn error, got %v", err)
-	}
-}
-
-func TestRunWithNilLoggerDoesNotCrash(t *testing.T) {
-	Run(nil, "unit.nillog", func() { panic("still caught") })
-}
-
-func TestGoLogsPanicFromSpawnedGoroutine(t *testing.T) {
-	log, logs := newObservedLogger(t)
-	Go(log, "unit.go", func() { panic("async boom") })
-	waitForLogs(t, logs, 1)
-}

internal/middleware/gzip.go

@@ -1,47 +0,0 @@
-package middleware
-
-import (
-	"github.com/gin-contrib/gzip"
-	"github.com/gin-gonic/gin"
-)
-
-// gzipExcludedExtensions 已经是压缩格式（图片/字体/媒体/归档）的响应体，
-// 再 gzip 只浪费 CPU 不省流量。
-var gzipExcludedExtensions = []string{
-	".png", ".gif", ".jpeg", ".jpg", ".webp", ".avif", ".ico", ".svg",
-	".woff", ".woff2", ".ttf", ".otf",
-	".mp4", ".mkv", ".webm", ".ts", ".m4s", ".m3u8",
-	".mp3", ".flac", ".aac", ".ogg",
-	".zip", ".gz", ".xz", ".7z", ".rar",
-}
-
-// apiGzipExcludedPrefixes 大文件流式传输（Range 语义）与 WS/SSE 长连接
-// 不参与 gzip：压缩会破坏 Range / 逐块推送语义。
-var apiGzipExcludedPrefixes = []string{
-	"/api/stream/",
-	"/api/hls/",
-	"/api/img",
-	"/api/subtitles/",
-	"/api/strm/play/",
-	"/api/ws",
-	"/api/events",
-}
-
-// GzipAPI 压缩 /api 下的 JSON 响应（媒体列表动辄数 MB，压缩率 85%+）。
-// gin-contrib/gzip 的路径排除是前缀匹配，且会自动校验 Accept-Encoding
-// 与 Connection: Upgrade（WebSocket 安全）。
-func GzipAPI() gin.HandlerFunc {
-	return gzip.Gzip(
-		gzip.DefaultCompression,
-		gzip.WithExcludedExtensions(gzipExcludedExtensions),
-		gzip.WithExcludedPaths(apiGzipExcludedPrefixes),
-	)
-}
-
-// GzipStatic 压缩 SPA 静态资源（JS/CSS/HTML 是构建产物的大头）。
-func GzipStatic() gin.HandlerFunc {
-	return gzip.Gzip(
-		gzip.DefaultCompression,
-		gzip.WithExcludedExtensions(gzipExcludedExtensions),
-	)
-}

internal/middleware/gzip_test.go

@@ -1,84 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/gin-gonic/gin"
-)
-
-func newGzipTestRouter() *gin.Engine {
-	gin.SetMode(gin.TestMode)
-	router := gin.New()
-	api := router.Group("/api")
-	api.Use(GzipAPI())
-	api.GET("/libraries", func(c *gin.Context) {
-		c.JSON(http.StatusOK, gin.H{"items": strings.Repeat("mebox", 200)})
-	})
-	api.GET("/stream/:id", func(c *gin.Context) {
-		c.String(http.StatusOK, strings.Repeat("video-bytes", 200))
-	})
-	router.GET("/assets/app.js", GzipStatic(), func(c *gin.Context) {
-		c.Data(http.StatusOK, "text/javascript", []byte(strings.Repeat("console.log(1);", 200)))
-	})
-	return router
-}
-
-func TestGzipAPICompressesJSONWhenAccepted(t *testing.T) {
-	router := newGzipTestRouter()
-
-	req := httptest.NewRequest(http.MethodGet, "/api/libraries", nil)
-	req.Header.Set("Accept-Encoding", "gzip")
-	w := httptest.NewRecorder()
-	router.ServeHTTP(w, req)
-
-	if w.Code != http.StatusOK {
-		t.Fatalf("status = %d, want 200", w.Code)
-	}
-	if got := w.Header().Get("Content-Encoding"); got != "gzip" {
-		t.Fatalf("Content-Encoding = %q, want gzip", got)
-	}
-	if raw := strings.Repeat("mebox", 200); w.Body.Len() >= len(raw) {
-		t.Fatalf("body not compressed: len = %d, raw = %d", w.Body.Len(), len(raw))
-	}
-}
-
-func TestGzipAPISkipsWhenNotAccepted(t *testing.T) {
-	router := newGzipTestRouter()
-
-	req := httptest.NewRequest(http.MethodGet, "/api/libraries", nil)
-	w := httptest.NewRecorder()
-	router.ServeHTTP(w, req)
-
-	if got := w.Header().Get("Content-Encoding"); got == "gzip" {
-		t.Fatal("Content-Encoding should not be gzip without Accept-Encoding")
-	}
-}
-
-func TestGzipAPIExcludesStreamPath(t *testing.T) {
-	router := newGzipTestRouter()
-
-	req := httptest.NewRequest(http.MethodGet, "/api/stream/abc", nil)
-	req.Header.Set("Accept-Encoding", "gzip")
-	w := httptest.NewRecorder()
-	router.ServeHTTP(w, req)
-
-	if got := w.Header().Get("Content-Encoding"); got == "gzip" {
-		t.Fatal("stream path must not be gzipped (Range semantics)")
-	}
-}
-
-func TestGzipStaticCompressesAssets(t *testing.T) {
-	router := newGzipTestRouter()
-
-	req := httptest.NewRequest(http.MethodGet, "/assets/app.js", nil)
-	req.Header.Set("Accept-Encoding", "gzip")
-	w := httptest.NewRecorder()
-	router.ServeHTTP(w, req)
-
-	if got := w.Header().Get("Content-Encoding"); got != "gzip" {
-		t.Fatalf("Content-Encoding = %q, want gzip for static assets", got)
-	}
-}

internal/model/playback_collection.go

@@ -3,12 +3,10 @@ package model
 import "time"
 
 // PlaybackHistory 记录当前播放位置以支持续播。
-// (user_id, media_id) 唯一：播放进度每几秒上报一次，唯一索引保证并发上报
-// 不会插入重复行（否则续播列表会出现重复卡片），也让 upsert 单语句完成。
 type PlaybackHistory struct {
 	Base
-	UserID     string    `gorm:"index;size:36;not null;uniqueIndex:uniq_user_history" json:"user_id"`
-	MediaID    string    `gorm:"index;size:128;not null;uniqueIndex:uniq_user_history" json:"media_id"`
+	UserID     string    `gorm:"index;size:36;not null" json:"user_id"`
+	MediaID    string    `gorm:"index;size:128;not null" json:"media_id"`
 	PositionMs int64     `json:"position_ms"`
 	DurationMs int64     `json:"duration_ms"`
 	WatchedAt  time.Time `json:"watched_at"`

internal/model/user.go

@@ -25,9 +25,6 @@ type User struct {
 	// 为空时代表不限制（全库可访问）。
 	AllowedLibraryIDs  string   `gorm:"type:text" json:"-"`
 	AllowedLibraryList []string `gorm:"-" json:"allowed_library_ids,omitempty"`
-	// PinnedLibraryIDs 存储用户置顶的媒体库 ID 列表（JSON 字符串），顺序即置顶优先级。
-	PinnedLibraryIDs  string   `gorm:"type:text" json:"-"`
-	PinnedLibraryList []string `gorm:"-" json:"pinned_library_ids,omitempty"`
 	// ExpiredAt is the account expiry time. Nil means the account never
 	// expires. When set and in the past, the account is treated as expired
 	// (login blocked) until an admin or a redemption code renews it.
@@ -62,30 +59,10 @@ func (u *User) DecodeAllowedLibraryIDs() []string {
 	return out
 }
 
-// DecodePinnedLibraryIDs 解析 PinnedLibraryIDs 字段。
-func (u *User) DecodePinnedLibraryIDs() []string {
-	if u == nil || strings.TrimSpace(u.PinnedLibraryIDs) == "" {
-		return nil
-	}
-	var ids []string
-	if err := json.Unmarshal([]byte(u.PinnedLibraryIDs), &ids); err != nil {
-		return nil
-	}
-	var out []string
-	for _, id := range ids {
-		trimmed := strings.TrimSpace(id)
-		if trimmed != "" {
-			out = append(out, trimmed)
-		}
-	}
-	return out
-}
-
 // PopulateComputedFields 填充非 DB 虚拟计算字段（如 AllowedLibraryList）。
 func (u *User) PopulateComputedFields() {
 	if u == nil {
 		return
 	}
 	u.AllowedLibraryList = u.DecodeAllowedLibraryIDs()
-	u.PinnedLibraryList = u.DecodePinnedLibraryIDs()
 }

internal/repository/history_repository.go

@@ -2,9 +2,9 @@ package repository
 
 import (
 	"context"
+	"errors"
 
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 
 	"github.com/truewhile/MeBox/internal/model"
 )
@@ -13,24 +13,25 @@ import (
 // upserts on (UserID, MediaID) so resume always reads the latest position.
 type HistoryRepository struct{ db *gorm.DB }
 
-// Upsert atomically inserts/updates the resume position in a single statement,
-// relying on the uniq_user_history composite unique index. Concurrent progress
-// reports for the same (user, media) can no longer double-insert.
+// Upsert atomically inserts/updates the resume position.
 func (r *HistoryRepository) Upsert(ctx context.Context, h *model.PlaybackHistory) error {
-	return r.db.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns: []clause.Column{{Name: "user_id"}, {Name: "media_id"}},
-		DoUpdates: clause.Assignments(map[string]any{
-			"position_ms": h.PositionMs,
-			// 沿用旧语义：未知时长（0）不覆盖已记录的时长。
-			"duration_ms": gorm.Expr(
-				"CASE WHEN ? > 0 THEN ? ELSE playback_histories.duration_ms END",
-				h.DurationMs, h.DurationMs,
-			),
-			"watched_at": h.WatchedAt,
-			"completed":  h.Completed,
-			"deleted_at": nil,
-		}),
-	}).Create(h).Error
+	var existing model.PlaybackHistory
+	err := r.db.WithContext(ctx).
+		Where("user_id = ? AND media_id = ?", h.UserID, h.MediaID).
+		First(&existing).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return r.db.WithContext(ctx).Create(h).Error
+	}
+	if err != nil {
+		return err
+	}
+	existing.PositionMs = h.PositionMs
+	if h.DurationMs > 0 {
+		existing.DurationMs = h.DurationMs
+	}
+	existing.WatchedAt = h.WatchedAt
+	existing.Completed = h.Completed
+	return r.db.WithContext(ctx).Save(&existing).Error
 }
 
 // ListByUser returns the most recent history rows for the user.

internal/repository/history_repository_test.go

@@ -1,79 +0,0 @@
-package repository
-
-import (
-	"testing"
-	"time"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/database"
-	"github.com/truewhile/MeBox/internal/model"
-)
-
-func TestHistoryUpsertSingleRowPerUserMedia(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := database.AutoMigrate(db); err != nil {
-		t.Fatalf("migrate: %v", err)
-	}
-	repos := New(db)
-	ctx := t.Context()
-	watched := time.Now()
-
-	first := &model.PlaybackHistory{UserID: "u-1", MediaID: "m-1", PositionMs: 30_000, DurationMs: 0, WatchedAt: watched, Completed: false}
-	if err := repos.History.Upsert(ctx, first); err != nil {
-		t.Fatalf("first upsert: %v", err)
-	}
-	second := &model.PlaybackHistory{UserID: "u-1", MediaID: "m-1", PositionMs: 90_000, DurationMs: 120_000, WatchedAt: watched.Add(time.Minute), Completed: true}
-	if err := repos.History.Upsert(ctx, second); err != nil {
-		t.Fatalf("second upsert: %v", err)
-	}
-
-	var count int64
-	if err := db.Model(&model.PlaybackHistory{}).Where("user_id = ? AND media_id = ?", "u-1", "m-1").Count(&count).Error; err != nil {
-		t.Fatal(err)
-	}
-	if count != 1 {
-		t.Fatalf("expected 1 history row after upserts, got %d", count)
-	}
-	var got model.PlaybackHistory
-	if err := db.Where("user_id = ? AND media_id = ?", "u-1", "m-1").First(&got).Error; err != nil {
-		t.Fatal(err)
-	}
-	if got.PositionMs != 90_000 || !got.Completed {
-		t.Fatalf("position/completion not updated: %#v", got)
-	}
-	if got.DurationMs != 120_000 {
-		t.Fatalf("duration should update when known, got %d", got.DurationMs)
-	}
-}
-
-func TestHistoryUpsertKeepsDurationWhenUnknown(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := database.AutoMigrate(db); err != nil {
-		t.Fatalf("migrate: %v", err)
-	}
-	repos := New(db)
-	ctx := t.Context()
-	watched := time.Now()
-
-	if err := repos.History.Upsert(ctx, &model.PlaybackHistory{UserID: "u-1", MediaID: "m-2", PositionMs: 10, DurationMs: 600_000, WatchedAt: watched}); err != nil {
-		t.Fatal(err)
-	}
-	if err := repos.History.Upsert(ctx, &model.PlaybackHistory{UserID: "u-1", MediaID: "m-2", PositionMs: 20, DurationMs: 0, WatchedAt: watched.Add(time.Second)}); err != nil {
-		t.Fatal(err)
-	}
-	var got model.PlaybackHistory
-	if err := db.Where("user_id = ? AND media_id = ?", "u-1", "m-2").First(&got).Error; err != nil {
-		t.Fatal(err)
-	}
-	if got.DurationMs != 600_000 {
-		t.Fatalf("duration_ms=0 upsert must not clear stored duration, got %d", got.DurationMs)
-	}
-}

internal/repository/media_repository.go

@@ -240,8 +240,8 @@ func (r *MediaRepository) DeleteByLibraryRoot(ctx context.Context, libraryID, ro
 		Delete(&model.Media{}).Error
 }
 
-// PurgeByLibrary permanently removes media tied to a library. Used when
-// removing a library or virtual mount so indexed rows are dropped immediately.
+// PurgeByLibrary permanently removes media tied to a library. Used for virtual
+// cloud mounts where "remove mount" must not populate the recycle bin.
 func (r *MediaRepository) PurgeByLibrary(ctx context.Context, libraryID string) error {
 	return r.db.WithContext(ctx).Unscoped().Where("library_id = ?", libraryID).Delete(&model.Media{}).Error
 }

internal/repository/media_repository_upsert.go

@@ -23,34 +23,12 @@ import (
 //     永远捞不到数据。
 func (r *MediaRepository) Upsert(ctx context.Context, m *model.Media) error {
 	return withSQLiteBusyRetry(ctx, func() error {
-		return r.upsertWithDB(ctx, r.db, m)
+		return r.upsert(ctx, m)
 	})
 }
 
-// UpsertBatch 在单个事务里逐条执行 Upsert：扫描一批只提交（fsync）一次，
-// 而不是每条一个隐式事务。任一条目落库失败不影响批内已成功的条目——
-// 事务回滚后由调用方退回逐条 Upsert 兜底。
-func (r *MediaRepository) UpsertBatch(ctx context.Context, items []*model.Media) error {
-	if len(items) == 0 {
-		return nil
-	}
-	return withSQLiteBusyRetry(ctx, func() error {
-		return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-			for _, m := range items {
-				if m == nil {
-					continue
-				}
-				if err := r.upsertWithDB(ctx, tx, m); err != nil {
-					return err
-				}
-			}
-			return nil
-		})
-	})
-}
-
-func (r *MediaRepository) upsertWithDB(ctx context.Context, db *gorm.DB, m *model.Media) error {
-	existing, created, err := r.findOrCreateMediaByPath(ctx, db, m)
+func (r *MediaRepository) upsert(ctx context.Context, m *model.Media) error {
+	existing, created, err := r.findOrCreateMediaByPath(ctx, m)
 	if err != nil {
 		return err
 	}
@@ -60,20 +38,20 @@ func (r *MediaRepository) upsertWithDB(ctx context.Context, db *gorm.DB, m *mode
 	}
 
 	updates := mediaUpsertUpdates(existing, *m)
-	return r.applyMediaUpsertUpdates(ctx, db, m, existing, updates)
+	return r.applyMediaUpsertUpdates(ctx, m, existing, updates)
 }
 
-func (r *MediaRepository) findOrCreateMediaByPath(ctx context.Context, db *gorm.DB, m *model.Media) (model.Media, bool, error) {
+func (r *MediaRepository) findOrCreateMediaByPath(ctx context.Context, m *model.Media) (model.Media, bool, error) {
 	var existing model.Media
-	err := db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error
+	err := r.db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		// 新行：保证 scrape_status 走 GORM default:pending（即留空让数据库填）。
 		if m.ScrapeStatus == "" {
 			m.ScrapeStatus = "pending"
 		}
-		if createErr := db.WithContext(ctx).Create(m).Error; createErr == nil {
+		if createErr := r.db.WithContext(ctx).Create(m).Error; createErr == nil {
 			return *m, true, nil
-		} else if retryErr := db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error; retryErr != nil {
+		} else if retryErr := r.db.WithContext(ctx).Unscoped().Where("path = ?", m.Path).First(&existing).Error; retryErr != nil {
 			return model.Media{}, false, createErr
 		}
 	}
@@ -259,12 +237,12 @@ func setNonEmptyMediaString(updates map[string]any, key, current, next string) {
 	}
 }
 
-func (r *MediaRepository) applyMediaUpsertUpdates(ctx context.Context, db *gorm.DB, m *model.Media, existing model.Media, updates map[string]any) error {
+func (r *MediaRepository) applyMediaUpsertUpdates(ctx context.Context, m *model.Media, existing model.Media, updates map[string]any) error {
 	if len(updates) == 0 {
 		*m = existing
 		return nil
 	}
-	if err := db.WithContext(ctx).Unscoped().Model(&model.Media{}).
+	if err := r.db.WithContext(ctx).Unscoped().Model(&model.Media{}).
 		Where("id = ?", existing.ID).Updates(updates).Error; err != nil {
 		return err
 	}

internal/repository/scrape_task_repository.go

@@ -236,16 +236,6 @@ func (r *ScrapeTaskRepository) ClearCanceled(ctx context.Context) (int64, error)
 	return count, err
 }
 
-func (r *ScrapeTaskRepository) ClearFailed(ctx context.Context) (int64, error) {
-	var count int64
-	err := withSQLiteBusyRetry(ctx, func() error {
-		res := r.db.WithContext(ctx).Unscoped().Where("status = ?", model.ScrapeTaskFailed).Delete(&model.ScrapeTask{})
-		count = res.RowsAffected
-		return res.Error
-	})
-	return count, err
-}
-
 func (r *ScrapeTaskRepository) RetryAllFailed(ctx context.Context) (int64, error) {
 	var count int64
 	err := withSQLiteBusyRetry(ctx, func() error {

internal/repository/strm_repository.go

@@ -402,17 +402,6 @@ func (r *StrmDownloadTaskRepository) ClearCanceled(ctx context.Context) (int64,
 	return count, err
 }
 
-// ClearFailed 清空全部已失败下载任务。
-func (r *StrmDownloadTaskRepository) ClearFailed(ctx context.Context) (int64, error) {
-	var count int64
-	err := withSQLiteBusyRetry(ctx, func() error {
-		res := r.db.WithContext(ctx).Unscoped().Where("status = ?", model.StrmTaskFailed).Delete(&model.StrmDownloadTask{})
-		count = res.RowsAffected
-		return res.Error
-	})
-	return count, err
-}
-
 // RetryAllFailed 把所有失败任务重置回待处理，清空错误与重试计数。
 func (r *StrmDownloadTaskRepository) RetryAllFailed(ctx context.Context) (int64, error) {
 	var count int64
@@ -720,17 +709,6 @@ func (r *StrmUploadTaskRepository) ClearCanceled(ctx context.Context) (int64, er
 	return count, err
 }
 
-// ClearFailed 清空全部已失败上传任务。
-func (r *StrmUploadTaskRepository) ClearFailed(ctx context.Context) (int64, error) {
-	var count int64
-	err := withSQLiteBusyRetry(ctx, func() error {
-		res := r.db.WithContext(ctx).Unscoped().Where("status = ?", model.StrmTaskFailed).Delete(&model.StrmUploadTask{})
-		count = res.RowsAffected
-		return res.Error
-	})
-	return count, err
-}
-
 // RetryAllFailed 把所有失败任务重置回待处理，清空错误与重试计数。
 func (r *StrmUploadTaskRepository) RetryAllFailed(ctx context.Context) (int64, error) {
 	var count int64

internal/service/audit.go

@@ -12,7 +12,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
 )
@@ -51,8 +50,6 @@ func (a *AuditService) RecordBestEffort(userID, action, target, ip, detail strin
 	go func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel()
-		helper.Run(a.log, "audit.record", func() {
-			a.Record(ctx, userID, action, target, ip, detail)
-		})
+		a.Record(ctx, userID, action, target, ip, detail)
 	}()
 }

internal/service/auth.go

@@ -13,7 +13,6 @@ import (
 	"golang.org/x/crypto/bcrypt"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
 )
@@ -177,11 +176,9 @@ func (s *AuthService) touchLoginBestEffort(userID string) {
 	go func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel()
-		helper.Run(s.log, "auth.touchLogin", func() {
-			if err := s.repo.User.TouchLogin(ctx, userID); err != nil && s.log != nil {
-				s.log.Debug("touch login delayed", zap.String("user_id", userID), zap.Error(err))
-			}
-		})
+		if err := s.repo.User.TouchLogin(ctx, userID); err != nil && s.log != nil {
+			s.log.Debug("touch login delayed", zap.String("user_id", userID), zap.Error(err))
+		}
 	}()
 }
 

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_compat.go

@@ -148,17 +148,11 @@ func (e *EmbyService) Items(ctx context.Context, p ItemsParams) (map[string]any,
 	if e.remote != nil {
 		// 远程目录浏览：ParentId 带远程前缀 → 完整转发给远程 Emby 承接分页。
 		if IsEmbyRemoteID(p.ParentID) {
-			if containsEmbyFilter(p.Filters, "IsFavorite") {
-				return e.favoriteItems(ctx, p)
-			}
 			mountID, _, _ := DecodeEmbyRemoteID(p.ParentID)
 			mount, acct, _ := e.remote.ResolveMount(ctx, mountID)
 			if mount == nil || acct == nil {
 				return emptyItemsEnvelope(p.StartIndex), nil
 			}
-			if !EmbyMountLibraryAllowed(e.mediaVisibility(ctx, p.UserID), mount) {
-				return emptyItemsEnvelope(p.StartIndex), nil
-			}
 			out, err := e.remote.RemoteItems(ctx, mount, acct, p)
 			if err != nil {
 				return nil, err
@@ -177,9 +171,6 @@ func (e *EmbyService) Items(ctx context.Context, p ItemsParams) (map[string]any,
 	if containsEmbyFilter(p.Filters, "IsResumable") {
 		return e.resumableItems(ctx, p)
 	}
-	if containsEmbyFilter(p.Filters, "IsFavorite") {
-		return e.favoriteItems(ctx, p)
-	}
 
 	if len(p.IDs) > 0 {
 		items := make([]map[string]any, 0, len(p.IDs))
@@ -278,9 +269,6 @@ func (e *EmbyService) aggregatedSearch(ctx context.Context, p ItemsParams) (map[
 			if !m.Enabled {
 				continue
 			}
-			if !EmbyMountLibraryAllowed(e.mediaVisibility(ctx, p.UserID), &m) {
-				continue
-			}
 			acct := e.remote.AccountByID(ctx, m.AccountID)
 			if acct == nil {
 				continue

internal/service/emby_counts.go

@@ -54,7 +54,7 @@ func (e *EmbyService) countVisibleSeries(ctx context.Context, userID string) (in
 		for i := range rows {
 			key := strings.TrimSpace(rows[i].SeriesID)
 			if key == "" {
-				key = stableEmbyID(embyVirtualSeriesPrefix, rows[i].LibraryID, e.seriesNameForMedia(ctx, &rows[i]))
+				key = stableEmbyID(embyVirtualSeriesPrefix, rows[i].LibraryID, e.seriesNameForMedia(&rows[i]))
 			}
 			seen[key] = struct{}{}
 		}

internal/service/emby_items_cache.go

@@ -49,7 +49,7 @@ func (e *EmbyService) embyLatestCacheKey(userID, parentID string, limit int) str
 
 func (e *EmbyService) mediaCacheTTLSeconds() int {
 	if e == nil || e.cfg == nil || e.cfg.Cache.MediaTTLSeconds < 1 {
-		return 90
+		return 15
 	}
 	return e.cfg.Cache.MediaTTLSeconds
 }

internal/service/emby_items_detail.go

@@ -21,9 +21,6 @@ func (e *EmbyService) Item(ctx context.Context, mediaID, userID string) (map[str
 		if mount == nil || acct == nil {
 			return nil, nil
 		}
-		if !EmbyMountLibraryAllowed(e.mediaVisibility(ctx, userID), mount) {
-			return nil, nil
-		}
 		out, err := e.remote.RemoteItem(ctx, mount, acct, remoteID)
 		if err != nil || out == nil {
 			return out, err
@@ -31,14 +28,6 @@ func (e *EmbyService) Item(ctx context.Context, mediaID, userID string) (map[str
 		if err := e.mergeRemoteUserData(ctx, userID, out); err != nil {
 			return nil, err
 		}
-		if favorite, _ := IsUserFavorite(ctx, e.repo, userID, mediaID); favorite {
-			userData, _ := out["UserData"].(map[string]any)
-			if userData == nil {
-				userData = map[string]any{}
-				out["UserData"] = userData
-			}
-			userData["IsFavorite"] = true
-		}
 		return out, nil
 	}
 	if lib, err := e.repo.Library.FindByID(ctx, mediaID); err != nil {
@@ -98,8 +87,7 @@ func (e *EmbyService) Item(ctx context.Context, mediaID, userID string) (map[str
 			pos = h.PositionMs
 		}
 	}
-	// 单条目 payload 内部对库类型/series 标题有多次查找，挂请求级缓存合并。
-	return e.itemPayload(e.withPayloadCache(ctx), m, fav, pos), nil
+	return e.itemPayload(ctx, m, fav, pos), nil
 }
 
 // LatestItems 最近添加，全库或指定库。远程媒体库(parentID 带前缀)直接透传远程。
@@ -113,9 +101,6 @@ func (e *EmbyService) LatestItems(ctx context.Context, userID, parentID string,
 		if mount == nil || acct == nil {
 			return nil, nil
 		}
-		if !EmbyMountLibraryAllowed(e.mediaVisibility(ctx, userID), mount) {
-			return nil, nil
-		}
 		out, err := e.remote.RemoteLatest(ctx, mount, acct, remoteParent, limit)
 		if err != nil {
 			return nil, err
@@ -178,7 +163,7 @@ func (e *EmbyService) latestSeriesItemsForLibrary(ctx context.Context, userID, l
 	if err := q.Order(mediaReleaseOrderSQL(true)).Limit(embySeriesGroupingLimit).Find(&rows).Error; err != nil {
 		return nil, err
 	}
-	groups := e.seriesGroupsFromMedia(ctx, rows)
+	groups := e.seriesGroupsFromMedia(rows)
 	sortSeriesGroups(groups, ItemsParams{SortBy: "premieredate", SortOrder: "Descending"})
 	if len(groups) > limit {
 		groups = groups[:limit]
@@ -195,137 +180,6 @@ func (e *EmbyService) ResumeItems(ctx context.Context, userID string, limit int)
 	return e.resumableItems(ctx, ItemsParams{UserID: userID, Limit: limit})
 }
 
-// favoriteItems returns favourited media for Emby clients, including mounted
-// remote items stored only in the local favourites table.
-func (e *EmbyService) favoriteItems(ctx context.Context, p ItemsParams) (map[string]any, error) {
-	if p.Limit <= 0 || p.Limit > 500 {
-		p.Limit = 50
-	}
-	if p.StartIndex < 0 {
-		p.StartIndex = 0
-	}
-	if strings.TrimSpace(p.UserID) == "" {
-		return map[string]any{"Items": []any{}, "TotalRecordCount": int64(0), "StartIndex": p.StartIndex}, nil
-	}
-
-	var favs []model.Favorite
-	if err := e.repo.DB.WithContext(ctx).
-		Where("user_id = ?", p.UserID).
-		Order("created_at desc").
-		Find(&favs).Error; err != nil {
-		return nil, err
-	}
-	if len(favs) == 0 {
-		return map[string]any{"Items": []any{}, "TotalRecordCount": int64(0), "StartIndex": p.StartIndex}, nil
-	}
-
-	localIDs := make([]string, 0, len(favs))
-	for _, fav := range favs {
-		if !IsEmbyRemoteID(fav.MediaID) {
-			localIDs = append(localIDs, fav.MediaID)
-		}
-	}
-	byID := map[string]*model.Media{}
-	if len(localIDs) > 0 {
-		var medias []model.Media
-		q := e.repo.DB.WithContext(ctx).Where("id IN ?", localIDs)
-		q = e.applyUserMediaVisibility(ctx, q, p.UserID)
-		if err := q.Find(&medias).Error; err != nil {
-			return nil, err
-		}
-		for i := range medias {
-			byID[medias[i].ID] = &medias[i]
-		}
-	}
-
-	items := make([]map[string]any, 0, len(favs))
-	for _, fav := range favs {
-		if m, ok := byID[fav.MediaID]; ok {
-			if !favoriteMatchesParent(ctx, e, p.ParentID, fav.MediaID, m.LibraryID, m.SeriesID, nil) {
-				continue
-			}
-			if p.SearchTerm != "" {
-				needle := strings.ToLower(p.SearchTerm)
-				if !strings.Contains(strings.ToLower(m.Title), needle) &&
-					!strings.Contains(strings.ToLower(m.OriginalName), needle) {
-					continue
-				}
-			}
-			items = append(items, e.itemPayload(ctx, m, true, 0))
-			continue
-		}
-		if e.remote == nil || !IsEmbyRemoteID(fav.MediaID) {
-			continue
-		}
-		mountID, remoteID, _ := DecodeEmbyRemoteID(fav.MediaID)
-		mount, acct, err := e.remote.ResolveMount(ctx, mountID)
-		if err != nil || mount == nil || acct == nil {
-			continue
-		}
-		item, err := e.remote.RemoteItem(ctx, mount, acct, remoteID)
-		if err != nil || item == nil {
-			continue
-		}
-		if !favoriteMatchesParent(ctx, e, p.ParentID, fav.MediaID, "", "", item) {
-			continue
-		}
-		if p.SearchTerm != "" {
-			needle := strings.ToLower(p.SearchTerm)
-			name, _ := item["Name"].(string)
-			orig, _ := item["OriginalTitle"].(string)
-			if !strings.Contains(strings.ToLower(name), needle) &&
-				!strings.Contains(strings.ToLower(orig), needle) {
-				continue
-			}
-		}
-		userData, _ := item["UserData"].(map[string]any)
-		if userData == nil {
-			userData = map[string]any{}
-			item["UserData"] = userData
-		}
-		userData["IsFavorite"] = true
-		items = append(items, item)
-	}
-
-	total := int64(len(items))
-	if p.StartIndex >= len(items) {
-		return map[string]any{"Items": []map[string]any{}, "TotalRecordCount": total, "StartIndex": p.StartIndex}, nil
-	}
-	end := minInt(p.StartIndex+p.Limit, len(items))
-	return map[string]any{"Items": items[p.StartIndex:end], "TotalRecordCount": total, "StartIndex": p.StartIndex}, nil
-}
-
-func favoriteMatchesParent(ctx context.Context, e *EmbyService, parentID, mediaID, libraryID, seriesID string, remoteItem map[string]any) bool {
-	if parentID == "" {
-		return true
-	}
-	if libraryID != "" {
-		if libraryID == parentID || seriesID == parentID {
-			return true
-		}
-		for _, id := range e.mergedLibraryIDs(ctx, parentID) {
-			if id == libraryID {
-				return true
-			}
-		}
-		return false
-	}
-	if remoteItem == nil {
-		return false
-	}
-	itemParent, _ := remoteItem["ParentId"].(string)
-	itemSeries, _ := remoteItem["SeriesId"].(string)
-	if itemParent == parentID || itemSeries == parentID || mediaID == parentID {
-		return true
-	}
-	if !IsEmbyRemoteID(parentID) {
-		return false
-	}
-	wantMountID, _, _ := DecodeEmbyRemoteID(parentID)
-	gotMountID, _, _ := DecodeEmbyRemoteID(mediaID)
-	return wantMountID != "" && gotMountID == wantMountID
-}
-
 // resumableItems 返回未完成播放进度的媒体（包含本地媒体与挂载的远程媒体），支持分页。
 func (e *EmbyService) resumableItems(ctx context.Context, p ItemsParams) (map[string]any, error) {
 	if p.Limit <= 0 || p.Limit > 100 {
@@ -416,9 +270,9 @@ func (e *EmbyService) itemPayload(ctx context.Context, m *model.Media, fav bool,
 	seasonID := ""
 	if e.mediaShouldBeEpisode(ctx, m) {
 		itemType = "Episode"
-		seriesID = e.seriesIDForMedia(ctx, m)
-		seriesName = e.seriesNameForMedia(ctx, m)
-		seasonID = e.seasonIDForMedia(ctx, m)
+		seriesID = e.seriesIDForMedia(m)
+		seriesName = e.seriesNameForMedia(m)
+		seasonID = e.seasonIDForMedia(m)
 		parentID = seasonID
 		episodeTitle := strings.TrimSpace(m.EpisodeTitle)
 		if episodeTitle != "" {

internal/service/emby_items_list.go

@@ -149,9 +149,6 @@ func (e *EmbyService) episodeItems(ctx context.Context, rows []model.Media, p It
 }
 
 func (e *EmbyService) payloadsForMedia(ctx context.Context, rows []model.Media, userID string) ([]map[string]any, error) {
-	// 请求级缓存：库类型与 series 标题整页只查一次，消除逐条目 N+1。
-	ctx = e.withPayloadCache(ctx)
-	e.prefetchPayloadCache(ctx, rows)
 	rows = e.collapseMediaVersionRows(ctx, rows)
 	userFavs := map[string]bool{}
 	userPos := map[string]int64{}
@@ -243,7 +240,7 @@ func (e *EmbyService) seriesItemsForLibrary(ctx context.Context, libraryID strin
 	if err := q.Order(mediaReleaseOrderSQL(true)).Limit(embySeriesGroupingLimit).Find(&rows).Error; err != nil {
 		return nil, err
 	}
-	groups := e.seriesGroupsFromMedia(ctx, rows)
+	groups := e.seriesGroupsFromMedia(rows)
 	sortSeriesGroups(groups, p)
 	total := len(groups)
 	items := make([]map[string]any, 0, minInt(p.Limit, len(groups)))

internal/service/emby_mount_acl_test.go

@@ -1,70 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/truewhile/MeBox/internal/model"
-)
-
-func TestViewsHidesDisallowedMountedEmbyLibraries(t *testing.T) {
-	svc := newTestEmbyService(t)
-	if err := svc.repo.DB.AutoMigrate(&model.EmbyMount{}); err != nil {
-		t.Fatal(err)
-	}
-	local := model.Library{Name: "Local", Path: "/media/local", Type: "movie", Enabled: true}
-	if err := svc.repo.Library.Create(t.Context(), &local); err != nil {
-		t.Fatal(err)
-	}
-	mount := &model.EmbyMount{
-		AccountID:      "acct-1",
-		RemoteViewID:   "view-1",
-		RemoteViewName: "Remote Movies",
-		Enabled:        true,
-	}
-	if err := svc.repo.EmbyMount.Create(t.Context(), mount); err != nil {
-		t.Fatal(err)
-	}
-	remoteID := EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)
-
-	user := &model.User{Username: "viewer", PasswordHash: "hash", Role: "user"}
-	allowed, err := json.Marshal([]string{local.ID})
-	if err != nil {
-		t.Fatal(err)
-	}
-	user.AllowedLibraryIDs = string(allowed)
-	if err := svc.repo.User.Create(t.Context(), user); err != nil {
-		t.Fatal(err)
-	}
-
-	// Without a live remote service, remoteViews is empty; assert helper ACL instead
-	// and that local Views still honor the allow-list.
-	views, err := svc.Views(t.Context(), user.ID)
-	if err != nil {
-		t.Fatalf("Views: %v", err)
-	}
-	items := views["Items"].([]map[string]any)
-	for _, item := range items {
-		if id, _ := item["Id"].(string); id == remoteID {
-			t.Fatalf("disallowed remote library should not appear in Views: %#v", item)
-		}
-	}
-	if !EmbyMountLibraryAllowed(MediaVisibility{AllowedLibraryIDs: []string{local.ID, remoteID}}, mount) {
-		t.Fatal("expected remote library allowed when listed")
-	}
-	if EmbyMountLibraryAllowed(MediaVisibility{AllowedLibraryIDs: []string{local.ID}}, mount) {
-		t.Fatal("expected remote library denied when not listed")
-	}
-}
-
-func TestLibraryIDAllowed(t *testing.T) {
-	if !LibraryIDAllowed(MediaVisibility{}, "any") {
-		t.Fatal("empty allow-list should allow all")
-	}
-	if LibraryIDAllowed(MediaVisibility{AllowedLibraryIDs: []string{"a"}}, "b") {
-		t.Fatal("missing id should be denied")
-	}
-	if !LibraryIDAllowed(MediaVisibility{AllowedLibraryIDs: []string{"a", "b"}}, "b") {
-		t.Fatal("listed id should be allowed")
-	}
-}

internal/service/emby_movie_items.go

@@ -65,7 +65,7 @@ func (e *EmbyService) movieLibraryItems(ctx context.Context, p ItemsParams) (map
 			return nil, err
 		}
 	}
-	seriesGroups := e.seriesGroupsFromMedia(ctx, episodicRows)
+	seriesGroups := e.seriesGroupsFromMedia(episodicRows)
 
 	// 真正的电影 -> Movie 项(剔除剧集结构行)。
 	movieQ := apply(e.repo.DB.WithContext(ctx).Model(&model.Media{}))
@@ -135,11 +135,10 @@ func (e *EmbyService) libraryIsEpisodic(ctx context.Context, libraryID string) (
 	if strings.TrimSpace(libraryID) == "" {
 		return false, nil
 	}
-	// 走请求级缓存（若有），避免同一请求内对同一库重复查表。
-	if typ, ok, err := e.payloadLibraryType(ctx, libraryID); err != nil {
+	if lib, err := e.repo.Library.FindByID(ctx, libraryID); err != nil {
 		return false, err
-	} else if ok {
-		return embyLibraryTypeIsEpisodic(typ), nil
+	} else if lib != nil {
+		return embyLibraryTypeIsEpisodic(lib.Type), nil
 	}
 	var count int64
 	err := e.repo.DB.WithContext(ctx).Model(&model.Media{}).
@@ -152,11 +151,11 @@ func (e *EmbyService) mediaBelongsToEpisodicLibrary(ctx context.Context, m *mode
 	if e == nil || m == nil || strings.TrimSpace(m.LibraryID) == "" {
 		return false
 	}
-	typ, ok, err := e.payloadLibraryType(ctx, m.LibraryID)
-	if err != nil || !ok {
+	lib, err := e.repo.Library.FindByID(ctx, m.LibraryID)
+	if err != nil || lib == nil {
 		return false
 	}
-	return embyLibraryTypeIsEpisodic(typ)
+	return embyLibraryTypeIsEpisodic(lib.Type)
 }
 
 func (e *EmbyService) mediaShouldBeEpisode(ctx context.Context, m *model.Media) bool {

internal/service/emby_payload_ctx.go

@@ -1,175 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"strings"
-	"sync"
-
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/model"
-)
-
-// 请求级 payload 构建缓存：/Items 列表为每行构建 payload 时，
-// mediaShouldBeEpisode 需要库类型、剧集 payload 需要 series 标题。
-// 一次页面请求内这些值高度重复（同一库、同一部剧），挂在 ctx 上的
-// 小缓存可以把每条目 2-3 次 DB 查询降为整个请求各 1 次预取。
-
-type embyPayloadCacheKey struct{}
-
-type embyLibraryTypeEntry struct {
-	typ   string
-	found bool // 库不存在时 found=false，调用方可退回计数启发式
-}
-
-type embyPayloadCache struct {
-	mu       sync.Mutex
-	libTypes map[string]embyLibraryTypeEntry
-	series   map[string]string // series_id -> title（"" 表示不存在/无标题）
-}
-
-func (c *embyPayloadCache) libraryType(id string) (embyLibraryTypeEntry, bool) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	entry, ok := c.libTypes[id]
-	return entry, ok
-}
-
-func (c *embyPayloadCache) setLibraryType(id string, entry embyLibraryTypeEntry) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.libTypes[id] = entry
-}
-
-func (c *embyPayloadCache) seriesTitle(id string) (string, bool) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	title, ok := c.series[id]
-	return title, ok
-}
-
-func (c *embyPayloadCache) setSeriesTitle(id, title string) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.series[id] = title
-}
-
-// withPayloadCache attaches a fresh request-scoped cache if none exists yet.
-func (e *EmbyService) withPayloadCache(ctx context.Context) context.Context {
-	if e == nil || e.repo == nil {
-		return ctx
-	}
-	if ctx.Value(embyPayloadCacheKey{}) != nil {
-		return ctx
-	}
-	return context.WithValue(ctx, embyPayloadCacheKey{}, &embyPayloadCache{
-		libTypes: map[string]embyLibraryTypeEntry{},
-		series:   map[string]string{},
-	})
-}
-
-// prefetchPayloadCache warms the cache for the given media rows with two bulk
-// queries (library types, series titles) instead of per-item lookups.
-func (e *EmbyService) prefetchPayloadCache(ctx context.Context, rows []model.Media) {
-	cache, ok := ctx.Value(embyPayloadCacheKey{}).(*embyPayloadCache)
-	if !ok || len(rows) == 0 {
-		return
-	}
-	libIDs := make([]string, 0, 8)
-	seriesIDs := make([]string, 0, 8)
-	seenLib := map[string]struct{}{}
-	seenSeries := map[string]struct{}{}
-	for i := range rows {
-		row := &rows[i]
-		if id := strings.TrimSpace(row.LibraryID); id != "" {
-			if _, done := seenLib[id]; !done {
-				// 已在缓存中的库不必再查。
-				if _, hit := cache.libraryType(id); !hit {
-					seenLib[id] = struct{}{}
-					libIDs = append(libIDs, id)
-				}
-			}
-		}
-		if id := strings.TrimSpace(row.SeriesID); id != "" {
-			if _, done := seenSeries[id]; !done {
-				if _, hit := cache.seriesTitle(id); !hit {
-					seenSeries[id] = struct{}{}
-					seriesIDs = append(seriesIDs, id)
-				}
-			}
-		}
-	}
-	if len(libIDs) > 0 {
-		var libs []model.Library
-		if err := e.repo.DB.WithContext(ctx).Select("id, type").Where("id IN ?", libIDs).Find(&libs).Error; err == nil {
-			found := map[string]string{}
-			for _, lib := range libs {
-				found[lib.ID] = lib.Type
-			}
-			for _, id := range libIDs {
-				typ, ok := found[id]
-				cache.setLibraryType(id, embyLibraryTypeEntry{typ: typ, found: ok})
-			}
-		}
-	}
-	if len(seriesIDs) > 0 {
-		var series []model.Series
-		if err := e.repo.DB.WithContext(ctx).Select("id, title").Where("id IN ?", seriesIDs).Find(&series).Error; err == nil {
-			for _, s := range series {
-				cache.setSeriesTitle(s.ID, s.Title)
-			}
-		}
-	}
-}
-
-// payloadLibraryType resolves a library type through the request cache,
-// falling back to a direct lookup when no cache is attached. found=false
-// means the library row does not exist (soft-deleted or orphaned id).
-func (e *EmbyService) payloadLibraryType(ctx context.Context, libraryID string) (typ string, found bool, err error) {
-	if cache, ok := ctx.Value(embyPayloadCacheKey{}).(*embyPayloadCache); ok {
-		if entry, hit := cache.libraryType(libraryID); hit {
-			return entry.typ, entry.found, nil
-		}
-		var lib model.Library
-		if dbErr := e.repo.DB.WithContext(ctx).Select("id, type").Where("id = ?", libraryID).First(&lib).Error; dbErr != nil {
-			cache.setLibraryType(libraryID, embyLibraryTypeEntry{})
-			return "", false, nil
-		}
-		cache.setLibraryType(lib.ID, embyLibraryTypeEntry{typ: lib.Type, found: true})
-		return lib.Type, true, nil
-	}
-	var lib model.Library
-	if err = e.repo.DB.WithContext(ctx).Select("id, type").Where("id = ?", libraryID).First(&lib).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return "", false, nil
-		}
-		return "", false, err
-	}
-	return lib.Type, true, nil
-}
-
-// payloadSeriesTitle resolves a series title through the request cache,
-// falling back to a direct lookup when no cache is attached.
-func (e *EmbyService) payloadSeriesTitle(ctx context.Context, seriesID string) (string, bool, error) {
-	if cache, ok := ctx.Value(embyPayloadCacheKey{}).(*embyPayloadCache); ok {
-		if title, hit := cache.seriesTitle(seriesID); hit {
-			return title, true, nil
-		}
-		var s model.Series
-		if err := e.repo.DB.WithContext(ctx).Select("id, title").Where("id = ?", seriesID).First(&s).Error; err != nil {
-			cache.setSeriesTitle(seriesID, "")
-			return "", true, nil
-		}
-		cache.setSeriesTitle(s.ID, s.Title)
-		return s.Title, true, nil
-	}
-	series, err := e.repo.Series.FindByID(ctx, seriesID)
-	if err != nil {
-		return "", false, err
-	}
-	if series == nil {
-		return "", false, nil
-	}
-	return series.Title, true, nil
-}

internal/service/emby_playback.go

@@ -24,9 +24,6 @@ func (e *EmbyService) PlaybackInfo(ctx context.Context, mediaID, userID string)
 		if err != nil {
 			return nil, ErrEmbyRemoteNotFound
 		}
-		if !EmbyMountLibraryAllowed(e.mediaVisibility(ctx, userID), mount) {
-			return nil, ErrEmbyRemoteNotFound
-		}
 		out, err := e.remote.RemotePlaybackInfo(ctx, mount, acct, remoteID, userID)
 		if err != nil {
 			return nil, err

internal/service/emby_remote_web.go

@@ -13,12 +13,10 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sync"
 	"time"
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 )
 
@@ -302,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
 }
 
@@ -515,138 +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
-			}
-
-			helper.Run(r.log, "emby.remoteSearch", func() {
-				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/emby_series.go

@@ -49,15 +49,11 @@ func (e *EmbyService) findSeriesGroup(ctx context.Context, id, userID string) (e
 	q = e.applyUserMediaVisibility(ctx, q, userID)
 	if !strings.HasPrefix(id, embyVirtualSeriesPrefix) {
 		q = q.Where("series_id = ?", id)
-	} else {
-		// 虚拟 series ID 只可能来自 series_id 为空的媒体：
-		// 有 series_id 时分组 key 就是 series_id 本身（UUID，不带虚拟前缀）。
-		q = q.Where("series_id IS NULL OR series_id = ''")
 	}
 	if err := q.Order("media.season_num asc, media.episode_num asc, media.created_at asc").Limit(embySeriesGroupingLimit).Find(&rows).Error; err != nil {
 		return embySeriesGroup{}, false, err
 	}
-	for _, group := range e.seriesGroupsFromMedia(ctx, rows) {
+	for _, group := range e.seriesGroupsFromMedia(rows) {
 		if group.ID == id {
 			e.rememberSeriesGroup(group)
 			return group, true, nil
@@ -92,18 +88,9 @@ func (e *EmbyService) findSeasonGroup(ctx context.Context, id, userID string) (e
 	if season, ok := e.cachedSeasonGroup(id); ok {
 		return season, true, nil
 	}
-	// 虚拟 Season ID 是 hash(seriesKey, seasonNum)，无法反解出 series。
-	// 常见情况（已刮削、series_id 非空）先用一条小型 DISTINCT 查询枚举候选对，
-	// 在内存中算哈希匹配，命中后只加载该一部剧的剧集行，避免整库扫描。
-	if season, ok, err := e.findSeasonGroupBySeriesCandidates(ctx, id, userID); err != nil {
-		return embySeasonGroup{}, false, err
-	} else if ok {
-		return season, true, nil
-	}
-	// 回退：未刮削（series_id 为空，虚拟 key 由库名+名称派生）的媒体只能全量分组。
 	var rows []model.Media
 	q := e.repo.DB.WithContext(ctx).Model(&model.Media{}).
-		Where("(series_id IS NULL OR series_id = '') AND (season_num > 0 OR episode_num > 0)")
+		Where("season_num > 0 OR episode_num > 0")
 	q = e.applyUserMediaVisibility(ctx, q, userID)
 	if err := q.
 		Order("media.season_num asc, media.episode_num asc, media.created_at asc").
@@ -111,7 +98,7 @@ func (e *EmbyService) findSeasonGroup(ctx context.Context, id, userID string) (e
 		Find(&rows).Error; err != nil {
 		return embySeasonGroup{}, false, err
 	}
-	for _, series := range e.seriesGroupsFromMedia(ctx, rows) {
+	for _, series := range e.seriesGroupsFromMedia(rows) {
 		for _, season := range e.seasonsForSeries(series) {
 			if season.ID == id {
 				e.rememberSeriesGroup(series)
@@ -122,77 +109,18 @@ func (e *EmbyService) findSeasonGroup(ctx context.Context, id, userID string) (e
 	return embySeasonGroup{}, false, nil
 }
 
-// findSeasonGroupBySeriesCandidates resolves virtual season IDs for media that
-// carry a real series_id: enumerate distinct (series_id, season_num) pairs via
-// SQL, hash each candidate to find the matching season, then load only that
-// one series' episodes.
-func (e *EmbyService) findSeasonGroupBySeriesCandidates(ctx context.Context, id, userID string) (embySeasonGroup, bool, error) {
-	type seasonCandidate struct {
-		SeriesID  string
-		SeasonNum int
-	}
-	var candidates []seasonCandidate
-	q := e.repo.DB.WithContext(ctx).Model(&model.Media{}).
-		Select("DISTINCT series_id, season_num").
-		Where("series_id <> '' AND (season_num > 0 OR episode_num > 0)")
-	q = e.applyUserMediaVisibility(ctx, q, userID)
-	if err := q.Find(&candidates).Error; err != nil {
-		return embySeasonGroup{}, false, err
-	}
-	matched := make([]string, 0, 1)
-	for _, cand := range candidates {
-		if seasonID(cand.SeriesID, cand.SeasonNum) == id {
-			matched = append(matched, cand.SeriesID)
-		}
-	}
-	for _, matchedSeries := range matched {
-		season, ok, err := e.seasonGroupForSeries(ctx, id, matchedSeries, userID)
-		if err != nil || ok {
-			return season, ok, err
-		}
-	}
-	return embySeasonGroup{}, false, nil
-}
-
-// seasonGroupForSeries rebuilds the season groups of one series (small row
-// set) and returns the one matching the virtual season id.
-func (e *EmbyService) seasonGroupForSeries(ctx context.Context, id, seriesID, userID string) (embySeasonGroup, bool, error) {
-	var rows []model.Media
-	rq := e.repo.DB.WithContext(ctx).Model(&model.Media{}).
-		Where("series_id = ? AND (season_num > 0 OR episode_num > 0)", seriesID)
-	rq = e.applyUserMediaVisibility(ctx, rq, userID)
-	if err := rq.
-		Order("media.season_num asc, media.episode_num asc, media.created_at asc").
-		Limit(embySeriesGroupingLimit).
-		Find(&rows).Error; err != nil {
-		return embySeasonGroup{}, false, err
-	}
-	for _, series := range e.seriesGroupsFromMedia(ctx, rows) {
-		if series.ID != seriesID {
-			continue
-		}
-		for _, season := range e.seasonsForSeries(series) {
-			if season.ID == id {
-				e.rememberSeriesGroup(series)
-				return season, true, nil
-			}
-		}
-	}
-	return embySeasonGroup{}, false, nil
-}
-
-func (e *EmbyService) seriesGroupsFromMedia(ctx context.Context, rows []model.Media) []embySeriesGroup {
+func (e *EmbyService) seriesGroupsFromMedia(rows []model.Media) []embySeriesGroup {
 	byID := map[string]*embySeriesGroup{}
 	order := []string{}
 	for _, row := range rows {
 		row := row
-		seriesID := e.seriesIDForMedia(ctx, &row)
+		seriesID := e.seriesIDForMedia(&row)
 		group, ok := byID[seriesID]
 		if !ok {
 			group = &embySeriesGroup{
 				ID:          seriesID,
 				LibraryID:   row.LibraryID,
-				Name:        e.seriesNameForMedia(ctx, &row),
+				Name:        e.seriesNameForMedia(&row),
 				Year:        row.Year,
 				ReleaseDate: row.ReleaseDate,
 				TMDbID:      row.TMDbID,

internal/service/emby_series_ids.go

@@ -14,22 +14,21 @@ import (
 	"github.com/truewhile/MeBox/internal/model"
 )
 
-func (e *EmbyService) seriesIDForMedia(ctx context.Context, m *model.Media) string {
+func (e *EmbyService) seriesIDForMedia(m *model.Media) string {
 	if strings.TrimSpace(m.SeriesID) != "" {
 		return m.SeriesID
 	}
-	return stableEmbyID(embyVirtualSeriesPrefix, m.LibraryID, e.seriesNameForMedia(ctx, m))
+	return stableEmbyID(embyVirtualSeriesPrefix, m.LibraryID, e.seriesNameForMedia(m))
 }
 
-func (e *EmbyService) seasonIDForMedia(ctx context.Context, m *model.Media) string {
-	return seasonID(e.seriesIDForMedia(ctx, m), m.SeasonNum)
+func (e *EmbyService) seasonIDForMedia(m *model.Media) string {
+	return seasonID(e.seriesIDForMedia(m), m.SeasonNum)
 }
 
-func (e *EmbyService) seriesNameForMedia(ctx context.Context, m *model.Media) string {
+func (e *EmbyService) seriesNameForMedia(m *model.Media) string {
 	if strings.TrimSpace(m.SeriesID) != "" {
-		// 走请求级缓存；无缓存 ctx 时退化为单次查询。
-		if title, ok, err := e.payloadSeriesTitle(ctx, m.SeriesID); err == nil && ok && strings.TrimSpace(title) != "" {
-			return title
+		if series, err := e.repo.Series.FindByID(context.Background(), m.SeriesID); err == nil && series != nil && strings.TrimSpace(series.Title) != "" {
+			return series.Title
 		}
 	}
 	if strings.EqualFold(strings.TrimSpace(m.ScrapeStatus), "matched") && strings.TrimSpace(m.Title) != "" {

internal/service/emby_system.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"sort"
 	"strings"
 	"time"
 
@@ -126,8 +125,7 @@ func (e *EmbyService) userPayload(u *model.User) map[string]any {
 }
 
 // Views 返回 Emby 中"虚拟根目录"——每个 library 一个条目，外加所有启用的
-// 远程 Emby 挂载的媒体库（联邦聚合）。顺序遵循用户置顶偏好：置顶库靠前，
-// 未置顶保持原有 sort_order / 远程挂载顺序。
+// 远程 Emby 挂载的媒体库（联邦聚合）。
 func (e *EmbyService) Views(ctx context.Context, userID string) (map[string]any, error) {
 	libs, err := e.repo.Library.List(ctx)
 	if err != nil {
@@ -143,60 +141,11 @@ func (e *EmbyService) Views(ctx context.Context, userID string) (map[string]any,
 		items = append(items, e.libraryAsView(ctx, &l))
 	}
 	for _, remote := range e.remoteViews(ctx) {
-		id, _ := remote["Id"].(string)
-		if !LibraryIDAllowed(visibility, id) {
-			continue
-		}
 		items = append(items, remote)
 	}
-	items = sortViewItemsByPinnedIDs(items, e.pinnedLibraryIDsForUser(ctx, userID))
 	return map[string]any{"Items": items, "TotalRecordCount": len(items), "StartIndex": 0}, nil
 }
 
-func (e *EmbyService) pinnedLibraryIDsForUser(ctx context.Context, userID string) []string {
-	if e == nil || e.repo == nil || e.repo.User == nil || strings.TrimSpace(userID) == "" {
-		return nil
-	}
-	user, err := e.repo.User.FindByID(ctx, userID)
-	if err != nil || user == nil {
-		return nil
-	}
-	return user.DecodePinnedLibraryIDs()
-}
-
-func sortViewItemsByPinnedIDs(items []map[string]any, pinnedIDs []string) []map[string]any {
-	if len(items) < 2 || len(pinnedIDs) == 0 {
-		return items
-	}
-	rank := make(map[string]int, len(pinnedIDs))
-	for i, id := range pinnedIDs {
-		if id == "" {
-			continue
-		}
-		if _, exists := rank[id]; !exists {
-			rank[id] = i
-		}
-	}
-	if len(rank) == 0 {
-		return items
-	}
-	sorted := append([]map[string]any(nil), items...)
-	sort.SliceStable(sorted, func(i, j int) bool {
-		iID, _ := sorted[i]["Id"].(string)
-		jID, _ := sorted[j]["Id"].(string)
-		iRank, iPinned := rank[iID]
-		jRank, jPinned := rank[jID]
-		if iPinned != jPinned {
-			return iPinned
-		}
-		if iPinned && jPinned {
-			return iRank < jRank
-		}
-		return false
-	})
-	return sorted
-}
-
 // remoteViews 返回全部启用挂载的远程媒体库视图（只有显式挂载的库才出现）。
 func (e *EmbyService) remoteViews(ctx context.Context) []map[string]any {
 	if e == nil || e.remote == nil {

internal/service/emby_user_data.go

@@ -7,17 +7,35 @@ import (
 	"strings"
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/truewhile/MeBox/internal/model"
 )
 
-// SetFavorite 把 mediaID 标为 userID 的收藏。挂载的远程 Emby 条目会同时写入
-// 本地 favourites 表并透传到对应远程服务器，保证网页与第三方 Emby 客户端一致。
+// SetFavorite 把 mediaID 标为 userID 的收藏。远程 Emby 条目直接透传到对应
+// 服务器（本地不落库）。
 func (e *EmbyService) SetFavorite(ctx context.Context, userID, mediaID string, favorite bool) error {
-	if err := SyncUserFavorite(ctx, e.repo, e.remote, userID, mediaID, favorite); err != nil {
+	if e.remote != nil && IsEmbyRemoteID(mediaID) {
+		acctID, remoteID, _ := DecodeEmbyRemoteID(mediaID)
+		if err := e.ProxyRemoteSetFavorite(ctx, acctID, remoteID, favorite); err != nil {
+			return err
+		}
+		return nil
+	}
+	if favorite {
+		var f model.Favorite
+		err := e.repo.DB.WithContext(ctx).
+			Where("user_id = ? AND media_id = ?", userID, mediaID).First(&f).Error
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return e.repo.DB.WithContext(ctx).Create(&model.Favorite{
+				UserID: userID, MediaID: mediaID,
+			}).Error
+		}
 		return err
 	}
-	e.invalidateEmbyItemsCache(ctx)
-	return nil
+	return e.repo.DB.WithContext(ctx).
+		Where("user_id = ? AND media_id = ?", userID, mediaID).
+		Delete(&model.Favorite{}).Error
 }
 
 // MarkPlayed 把 mediaID 标为已看（写一个 100% 进度的 history 行）。
@@ -104,7 +122,8 @@ func (e *EmbyService) RecordProgress(ctx context.Context, userID, mediaID string
 }
 
 // mergeRemoteUserData applies the current MeBox user's locally recorded playback
-// and favourite state to remote Emby payloads.
+// state to remote Emby payloads. Remote metadata remains authoritative unless the
+// user has played the item through MeBox.
 func (e *EmbyService) mergeRemoteUserData(ctx context.Context, userID string, payload any) error {
 	if strings.TrimSpace(userID) == "" || payload == nil {
 		return nil
@@ -133,27 +152,10 @@ func (e *EmbyService) mergeRemoteUserData(ctx context.Context, userID string, pa
 	for i := range histories {
 		byMediaID[histories[i].MediaID] = &histories[i]
 	}
-	var favs []model.Favorite
-	if err := e.repo.DB.WithContext(ctx).Where("user_id = ? AND media_id IN ?", userID, ids).Find(&favs).Error; err != nil {
-		return err
-	}
-	favSet := make(map[string]bool, len(favs))
-	for _, fav := range favs {
-		favSet[fav.MediaID] = true
-	}
 	for _, item := range items {
 		id, _ := item["Id"].(string)
-		userData, _ := item["UserData"].(map[string]any)
 		if h := byMediaID[id]; h != nil {
-			item["UserData"] = mergedRemoteUserData(userData, h)
-			userData, _ = item["UserData"].(map[string]any)
-		}
-		if favSet[id] {
-			if userData == nil {
-				userData = map[string]any{}
-				item["UserData"] = userData
-			}
-			userData["IsFavorite"] = true
+			item["UserData"] = mergedRemoteUserData(item["UserData"], h)
 		}
 	}
 	return nil

internal/service/emby_views_pinned_test.go

@@ -1,66 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/truewhile/MeBox/internal/model"
-)
-
-func TestViewsOrdersPinnedLibrariesFirst(t *testing.T) {
-	svc := newTestEmbyService(t)
-	first := model.Library{Name: "AAA", Path: "/media/a", Type: "movie", Enabled: true, SortOrder: 0}
-	second := model.Library{Name: "BBB", Path: "/media/b", Type: "movie", Enabled: true, SortOrder: 1}
-	third := model.Library{Name: "CCC", Path: "/media/c", Type: "movie", Enabled: true, SortOrder: 2}
-	for _, lib := range []*model.Library{&first, &second, &third} {
-		if err := svc.repo.Library.Create(t.Context(), lib); err != nil {
-			t.Fatalf("create library: %v", err)
-		}
-	}
-
-	user := &model.User{Username: "viewer", PasswordHash: "hash", Role: "user"}
-	pinned, err := json.Marshal([]string{third.ID, first.ID})
-	if err != nil {
-		t.Fatal(err)
-	}
-	user.PinnedLibraryIDs = string(pinned)
-	if err := svc.repo.User.Create(t.Context(), user); err != nil {
-		t.Fatalf("create user: %v", err)
-	}
-
-	views, err := svc.Views(t.Context(), user.ID)
-	if err != nil {
-		t.Fatalf("Views: %v", err)
-	}
-	items := views["Items"].([]map[string]any)
-	if len(items) != 3 {
-		t.Fatalf("expected 3 views, got %d", len(items))
-	}
-	got := []string{items[0]["Id"].(string), items[1]["Id"].(string), items[2]["Id"].(string)}
-	want := []string{third.ID, first.ID, second.ID}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("Views order = %v, want %v", got, want)
-		}
-	}
-}
-
-func TestSortViewItemsByPinnedIDsKeepsUnpinnedOrder(t *testing.T) {
-	items := []map[string]any{
-		{"Id": "a", "Name": "A"},
-		{"Id": "b", "Name": "B"},
-		{"Id": "c", "Name": "C"},
-		{"Id": "d", "Name": "D"},
-	}
-	sorted := sortViewItemsByPinnedIDs(items, []string{"c", "a"})
-	got := make([]string, len(sorted))
-	for i, item := range sorted {
-		got[i] = item["Id"].(string)
-	}
-	want := []string{"c", "a", "b", "d"}
-	for i := range want {
-		if got[i] != want[i] {
-			t.Fatalf("order = %v, want %v", got, want)
-		}
-	}
-}

internal/service/favorites_sync.go

@@ -1,74 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
-)
-
-// SyncUserFavorite keeps favourite state aligned across the local favourites table
-// and the upstream remote Emby server for mounted items.
-func SyncUserFavorite(ctx context.Context, repo *repository.Container, remote *EmbyRemoteService, userID, mediaID string, favorite bool) error {
-	if repo == nil || userID == "" || mediaID == "" {
-		return errors.New("missing favourite sync inputs")
-	}
-	if err := setLocalFavorite(ctx, repo, userID, mediaID, favorite); err != nil {
-		return err
-	}
-	if favorite || IsEmbyRemoteID(mediaID) {
-		if err := proxyRemoteFavorite(ctx, remote, mediaID, favorite); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// IsUserFavorite reports whether the user has favourited mediaID locally.
-func IsUserFavorite(ctx context.Context, repo *repository.Container, userID, mediaID string) (bool, error) {
-	if repo == nil || userID == "" || mediaID == "" {
-		return false, nil
-	}
-	var count int64
-	err := repo.DB.WithContext(ctx).Model(&model.Favorite{}).
-		Where("user_id = ? AND media_id = ?", userID, mediaID).
-		Count(&count).Error
-	return count > 0, err
-}
-
-func setLocalFavorite(ctx context.Context, repo *repository.Container, userID, mediaID string, favorite bool) error {
-	if favorite {
-		var existing model.Favorite
-		err := repo.DB.WithContext(ctx).
-			Where("user_id = ? AND media_id = ?", userID, mediaID).
-			First(&existing).Error
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return repo.DB.WithContext(ctx).Create(&model.Favorite{
-				UserID:  userID,
-				MediaID: mediaID,
-			}).Error
-		}
-		return err
-	}
-	return repo.DB.WithContext(ctx).
-		Where("user_id = ? AND media_id = ?", userID, mediaID).
-		Delete(&model.Favorite{}).Error
-}
-
-func proxyRemoteFavorite(ctx context.Context, remote *EmbyRemoteService, mediaID string, favorite bool) error {
-	if remote == nil || !IsEmbyRemoteID(mediaID) {
-		return nil
-	}
-	mountID, remoteItemID, ok := DecodeEmbyRemoteID(mediaID)
-	if !ok {
-		return nil
-	}
-	_, acct, err := remote.ResolveMount(ctx, mountID)
-	if err != nil {
-		return err
-	}
-	return remote.ProxySetFavorite(ctx, acct, remoteItemID, favorite)
-}

internal/service/favorites_sync_test.go

@@ -1,75 +0,0 @@
-package service
-
-import (
-	"context"
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
-)
-
-func TestSyncUserFavoriteWritesLocalForRemoteID(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.AutoMigrate(&model.Favorite{}); err != nil {
-		t.Fatal(err)
-	}
-	repos := repository.New(db)
-	userID := "user-1"
-	remoteMediaID := EncodeEmbyRemoteID("mount-1", "remote-item-1")
-
-	if err := SyncUserFavorite(context.Background(), repos, nil, userID, remoteMediaID, true); err != nil {
-		t.Fatalf("SyncUserFavorite favorite: %v", err)
-	}
-	favorite, err := IsUserFavorite(context.Background(), repos, userID, remoteMediaID)
-	if err != nil {
-		t.Fatalf("IsUserFavorite: %v", err)
-	}
-	if !favorite {
-		t.Fatal("expected remote favourite to be stored locally")
-	}
-
-	if err := SyncUserFavorite(context.Background(), repos, nil, userID, remoteMediaID, false); err != nil {
-		t.Fatalf("SyncUserFavorite unfavorite: %v", err)
-	}
-	favorite, err = IsUserFavorite(context.Background(), repos, userID, remoteMediaID)
-	if err != nil {
-		t.Fatalf("IsUserFavorite after delete: %v", err)
-	}
-	if favorite {
-		t.Fatal("expected remote favourite to be removed locally")
-	}
-}
-
-func TestFavoriteItemsIncludesRemoteFavourites(t *testing.T) {
-	db := newServiceTestDB(t, &model.User{}, &model.Library{}, &model.Media{}, &model.Favorite{})
-	repos := repository.New(db)
-	viewer := &model.User{Username: "viewer", PasswordHash: "hash", Role: "user"}
-	if err := repos.User.Create(t.Context(), viewer); err != nil {
-		t.Fatal(err)
-	}
-	remoteMediaID := EncodeEmbyRemoteID("mount-1", "remote-item-1")
-	if err := db.Create(&model.Favorite{UserID: viewer.ID, MediaID: remoteMediaID}).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := &EmbyService{repo: repos}
-	out, err := svc.favoriteItems(t.Context(), ItemsParams{UserID: viewer.ID, Limit: 50})
-	if err != nil {
-		t.Fatalf("favoriteItems: %v", err)
-	}
-	total, _ := out["TotalRecordCount"].(int64)
-	if total != 0 {
-		// Without a wired remote service hydration is skipped, but local-only path
-		// should not error and should not count unavailable remote rows.
-		items, _ := out["Items"].([]map[string]any)
-		if len(items) != 0 {
-			t.Fatalf("expected no hydrated remote rows without remote service, got %#v", out)
-		}
-	}
-}

internal/service/ffmpeg_tools.go

@@ -21,7 +21,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 )
 
@@ -153,7 +152,7 @@ func (s *FFmpegToolsService) StartInstall(ctx context.Context) error {
 	s.mu.Unlock()
 
 	s.setMessage("准备下载…")
-	helper.Go(s.log, "ffmpeg.install", s.runInstall)
+	go s.runInstall()
 	return nil
 }
 

internal/service/media_cache.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"sort"
 	"strings"
-	"time"
 
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
@@ -71,60 +70,11 @@ func (s *MediaService) seriesCardsCacheKey(libraryID string, visibility MediaVis
 
 func (s *MediaService) mediaCacheTTLSeconds() int {
 	if s == nil || s.cfg == nil || s.cfg.Cache.MediaTTLSeconds < 1 {
-		return 90
+		return 15
 	}
 	return s.cfg.Cache.MediaTTLSeconds
 }
 
-// mediaObjectTTL 对象缓存与字节缓存同 TTL，失效同走 invalidateMediaCache
-// 的 DeletePrefix("media:")（对象存储一并清除）。
-func (s *MediaService) mediaObjectTTL() time.Duration {
-	return time.Duration(s.mediaCacheTTLSeconds()) * time.Second
-}
-
-func hashObjectCacheKey(parts []string) string {
-	sum := sha1.Sum([]byte(strings.Join(parts, "|")))
-	return hex.EncodeToString(sum[:])
-}
-
-// mediaGroupedRowsCacheKey 版本分组源行（已挂库元数据）的对象缓存。
-func (s *MediaService) mediaGroupedRowsCacheKey(libraryID string, libraryIDs []string, filter repository.MediaQueryFilter) string {
-	libs := append([]string(nil), libraryIDs...)
-	sort.Strings(libs)
-	allowed := append([]string(nil), filter.AllowedLibraryIDs...)
-	hidden := append([]string(nil), filter.HiddenLibraryIDs...)
-	sort.Strings(allowed)
-	sort.Strings(hidden)
-	return "media:obj:grouped-rows:" + hashObjectCacheKey([]string{
-		libraryID,
-		strings.Join(libs, ","),
-		fmt.Sprintf("%t", filter.IncludeNSFW),
-		strings.Join(allowed, ","),
-		strings.Join(hidden, ","),
-	})
-}
-
-// libraryRowsCacheKey 整库可见行 + 预计算剧集索引的对象缓存（剧集卡片/剧集
-// 列表共用一次 SQL 加载与一次 key 解析）。
-func (s *MediaService) libraryRowsCacheKey(libraryID string, visibility MediaVisibility) string {
-	allowed := append([]string(nil), visibility.AllowedLibraryIDs...)
-	hidden := append([]string(nil), visibility.HiddenLibraryIDs...)
-	sort.Strings(allowed)
-	sort.Strings(hidden)
-	return "media:obj:library-rows:" + hashObjectCacheKey([]string{
-		libraryID,
-		fmt.Sprintf("%t", visibility.IncludeNSFW),
-		strings.Join(allowed, ","),
-		strings.Join(hidden, ","),
-	})
-}
-
-// libraryCardsObjectKey 系列卡片结果的对象缓存（与 seriesCardsCacheKey 同维度，
-// 换独立前缀避免与字节缓存 key 冲突）。
-func (s *MediaService) libraryCardsObjectKey(libraryID string, visibility MediaVisibility) string {
-	return s.seriesCardsCacheKey(libraryID, visibility) + ":obj"
-}
-
 func (s *MediaService) invalidateMediaCache(ctx context.Context) {
 	if s != nil && s.cache != nil {
 		s.cache.DeletePrefix(ctx, "media:")

internal/service/media_delete.go

@@ -1,59 +0,0 @@
-package service
-
-import (
-	"context"
-	"errors"
-	"os"
-	"strings"
-
-	"go.uber.org/zap"
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/model"
-)
-
-// DeleteMedia removes a media row from the library index.
-// When deleteFiles is true and the path is a local filesystem file, the media
-// file and its sidecar NFO are also removed. cloud:// paths are never touched on disk.
-func (s *MediaService) DeleteMedia(ctx context.Context, id string, deleteFiles bool) error {
-	var media model.Media
-	err := s.repo.DB.WithContext(ctx).Where("id = ?", id).First(&media).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil
-		}
-		return err
-	}
-
-	if deleteFiles {
-		if err := deleteLocalMediaFiles(s.log, media.Path); err != nil {
-			return err
-		}
-	}
-
-	err = s.repo.DB.WithContext(ctx).Unscoped().Where("id = ?", id).Delete(&model.Media{}).Error
-	if err == nil {
-		s.invalidateMediaCache(ctx)
-	}
-	return err
-}
-
-func deleteLocalMediaFiles(log *zap.Logger, path string) error {
-	path = strings.TrimSpace(path)
-	if path == "" {
-		return nil
-	}
-	if strings.HasPrefix(strings.ToLower(path), "cloud://") {
-		if log != nil {
-			log.Info("skip local file delete for cloud media path", zap.String("path", path))
-		}
-		return nil
-	}
-	if err := removeMediaAndNFO(path); err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			return nil
-		}
-		return err
-	}
-	return nil
-}

internal/service/media_delete_test.go

@@ -1,135 +0,0 @@
-package service
-
-import (
-	"os"
-	"path/filepath"
-	"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 TestDeleteMediaInvalidatesMediaAndStatsCache(t *testing.T) {
-	db := newServiceTestDB(t, &model.Media{})
-	repos := repository.New(db)
-	media := model.Media{
-		Base:  model.Base{ID: "local-media"},
-		Title: "Cached Movie",
-		Path:  filepath.Join(t.TempDir(), "Cached Movie.mkv"),
-	}
-	if err := repos.DB.Create(&media).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	cache := NewRuntimeCacheService(&config.Config{}, zap.NewNop())
-	cache.SetJSON(t.Context(), "media:list:test", map[string]string{"state": "stale"}, time.Minute)
-	cache.SetJSON(t.Context(), "stats:snapshot:base", map[string]int{"media": 1}, time.Minute)
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos).SetRuntimeCache(cache)
-	if err := svc.DeleteMedia(t.Context(), media.ID, false); err != nil {
-		t.Fatal(err)
-	}
-
-	var mediaCache map[string]string
-	if cache.GetJSON(t.Context(), "media:list:test", &mediaCache) {
-		t.Fatal("delete should invalidate media cache")
-	}
-	var statsCache map[string]int
-	if cache.GetJSON(t.Context(), "stats:snapshot:base", &statsCache) {
-		t.Fatal("delete should invalidate stats cache")
-	}
-	var count int64
-	if err := db.Unscoped().Model(&model.Media{}).Where("id = ?", media.ID).Count(&count).Error; err != nil {
-		t.Fatal(err)
-	}
-	if count != 0 {
-		t.Fatalf("media row still present, count=%d", count)
-	}
-}
-
-func TestDeleteMediaRemovesLocalFilesWhenRequested(t *testing.T) {
-	db := newServiceTestDB(t, &model.Media{})
-	repos := repository.New(db)
-	dir := t.TempDir()
-	mediaPath := filepath.Join(dir, "Movie.mkv")
-	nfo := filepath.Join(dir, "Movie.nfo")
-	if err := os.WriteFile(mediaPath, []byte("video"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(nfo, []byte("nfo"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	media := model.Media{
-		Base:  model.Base{ID: "local-delete-files"},
-		Title: "Movie",
-		Path:  mediaPath,
-	}
-	if err := repos.DB.Create(&media).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
-	if err := svc.DeleteMedia(t.Context(), media.ID, true); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(mediaPath); !os.IsNotExist(err) {
-		t.Fatalf("expected media file removed, err=%v", err)
-	}
-	if _, err := os.Stat(nfo); !os.IsNotExist(err) {
-		t.Fatalf("expected nfo removed, err=%v", err)
-	}
-}
-
-func TestDeleteMediaKeepsLocalFilesByDefault(t *testing.T) {
-	db := newServiceTestDB(t, &model.Media{})
-	repos := repository.New(db)
-	dir := t.TempDir()
-	mediaPath := filepath.Join(dir, "Keep.mkv")
-	if err := os.WriteFile(mediaPath, []byte("video"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-	media := model.Media{
-		Base:  model.Base{ID: "keep-files"},
-		Title: "Keep",
-		Path:  mediaPath,
-	}
-	if err := repos.DB.Create(&media).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
-	if err := svc.DeleteMedia(t.Context(), media.ID, false); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(mediaPath); err != nil {
-		t.Fatalf("expected media file kept, err=%v", err)
-	}
-}
-
-func TestDeleteMediaSkipsCloudPaths(t *testing.T) {
-	db := newServiceTestDB(t, &model.Media{})
-	repos := repository.New(db)
-	media := model.Media{
-		Base:  model.Base{ID: "cloud-media"},
-		Title: "Cloud",
-		Path:  "cloud://openlist/Movie.mkv",
-	}
-	if err := repos.DB.Create(&media).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
-	if err := svc.DeleteMedia(t.Context(), media.ID, true); err != nil {
-		t.Fatal(err)
-	}
-	var count int64
-	if err := db.Unscoped().Model(&model.Media{}).Where("id = ?", media.ID).Count(&count).Error; err != nil {
-		t.Fatal(err)
-	}
-	if count != 0 {
-		t.Fatalf("cloud media row still present, count=%d", count)
-	}
-}

internal/service/media_library.go

@@ -100,21 +100,14 @@ func (s *MediaService) ListLibrariesWithPreview(ctx context.Context, libraries [
 		if len(items) == 0 {
 			continue
 		}
-			cards := groupMediaSeriesCards(items)
-			// 如果折叠后的作品部数不足 cardLimit，且该库总记录数大于当前提取的条目数，
-			// 说明多集剧集折叠占满了提取窗口，调用 ListLibrarySeriesCards 补齐完整的影视部数。
-			if len(cards) < cardLimit && out[i].Total > int64(len(items)) {
-				if fullCards, _, err := s.ListLibrarySeriesCards(ctx, out[i].ID, visibility); err == nil && len(fullCards) > 0 {
-					cards = fullCards
-				}
-			}
-			if len(cards) > cardLimit {
-				cards = cards[:cardLimit]
-			}
-			if cards == nil {
-				cards = []SeriesCard{}
-			}
-			out[i].Cards = cards
+		cards := groupMediaSeriesCards(items)
+		if len(cards) > cardLimit {
+			cards = cards[:cardLimit]
+		}
+		if cards == nil {
+			cards = []SeriesCard{}
+		}
+		out[i].Cards = cards
 	}
 
 	if s.cache != nil {

internal/service/media_library_test.go

@@ -92,66 +92,3 @@ func TestListLibrariesWithPreview(t *testing.T) {
 		t.Errorf("preview[1].Cards[0].Count = %d, want 12", previews[1].Cards[0].Count)
 	}
 }
-
-func TestListLibrariesWithPreviewLongSeriesCompletion(t *testing.T) {
-	db := newServiceTestDB(t, &model.Library{}, &model.Media{})
-	repos := repository.New(db)
-
-	lib := model.Library{Name: "剧集库", Path: "/media/tv", Type: "tv", Enabled: true}
-	if err := repos.Library.Create(t.Context(), &lib); err != nil {
-		t.Fatal(err)
-	}
-
-	now := time.Date(2026, 7, 2, 12, 0, 0, 0, time.UTC)
-	var rows []model.Media
-
-	// 1. 添加一部更早入库的短剧（2 集），如果按窗口 60 条限制，排在第 70 集之后，无法被初始窗口截取
-	for i := 1; i <= 2; i++ {
-		rows = append(rows, model.Media{
-			Base:       model.Base{ID: fmt.Sprintf("short-ep-%02d", i), CreatedAt: now.Add(-time.Duration(100-i) * time.Minute)},
-			LibraryID:  lib.ID,
-			Title:      fmt.Sprintf("经典短剧 第%d集", i),
-			Path:       fmt.Sprintf("/media/tv/经典短剧/Season 01/经典短剧.S01E%02d.mp4", i),
-			SeasonNum:  1,
-			EpisodeNum: i,
-		})
-	}
-
-	// 2. 添加一部最新入库的 70 集长篇连续剧，这 70 篇全在新入库时间线上
-	for i := 1; i <= 70; i++ {
-		rows = append(rows, model.Media{
-			Base:       model.Base{ID: fmt.Sprintf("long-ep-%02d", i), CreatedAt: now.Add(time.Duration(i) * time.Minute)},
-			LibraryID:  lib.ID,
-			Title:      fmt.Sprintf("大长篇连续剧 第%d集", i),
-			Path:       fmt.Sprintf("/media/tv/大长篇连续剧/Season 01/大长篇连续剧.S01E%02d.mp4", i),
-			SeasonNum:  1,
-			EpisodeNum: i,
-		})
-	}
-
-	if err := repos.DB.Create(&rows).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
-
-	// 请求 10 部卡片
-	previews, err := svc.ListLibrariesWithPreview(t.Context(), []model.Library{lib}, MediaVisibility{IncludeNSFW: true}, 10)
-	if err != nil {
-		t.Fatalf("ListLibrariesWithPreview failed: %v", err)
-	}
-
-	if len(previews) != 1 {
-		t.Fatalf("got %d previews, want 1", len(previews))
-	}
-
-	// 总媒体行数是 72 行
-	if previews[0].Total != 72 {
-		t.Errorf("previews[0].Total = %d, want 72", previews[0].Total)
-	}
-
-	// 验证自适应补全机制：必须包含 2 部剧集（长篇 + 短剧），而不是因为长篇 70 集占满窗口只显示 1 部
-	if len(previews[0].Cards) != 2 {
-		t.Fatalf("previews[0].Cards count = %d, want 2", len(previews[0].Cards))
-	}
-}

internal/service/media_listing.go

@@ -73,15 +73,11 @@ func (s *MediaService) listMediaVisibleForGrouping(ctx context.Context, libraryI
 		AllowedLibraryIDs: visibility.AllowedLibraryIDs,
 		HiddenLibraryIDs:  visibility.HiddenLibraryIDs,
 	}
-	cacheKey := s.mediaGroupedRowsCacheKey(libraryID, libraryIDs, filter)
-	if s.cache != nil {
-		if cachedObj, ok := s.cache.GetObject(cacheKey); ok {
-			if cached, ok := cachedObj.([]model.Media); ok {
-				// 对象缓存中的切片视为不可变；attachLibraryMetadata 会在填充时
-				// 执行过，命中路径直接返回副本即可（调用方只读）。
-				return cached, nil
-			}
-		}
+	cacheKey := s.mediaListCacheKey(libraryID, libraryIDs, 0, maxMediaSearchLimit, filter) + ":group-source"
+	var cached mediaListCacheValue
+	if s.cache != nil && s.cache.GetJSON(ctx, cacheKey, &cached) {
+		s.attachLibraryMetadata(ctx, cached.Items)
+		return cached.Items, nil
 	}
 	items, total, err := s.repo.Media.ListByLibrariesFiltered(ctx, libraryIDs, 0, maxMediaSearchLimit, filter)
 	if err != nil {
@@ -95,7 +91,7 @@ func (s *MediaService) listMediaVisibleForGrouping(ctx context.Context, libraryI
 	}
 	s.attachLibraryMetadata(ctx, items)
 	if s.cache != nil {
-		s.cache.SetObject(cacheKey, items, s.mediaObjectTTL())
+		s.cache.SetJSON(ctx, cacheKey, mediaListCacheValue{Items: items, Total: total}, time.Duration(s.mediaCacheTTLSeconds())*time.Second)
 	}
 	return items, nil
 }

internal/service/media_recycle.go

@@ -0,0 +1,91 @@
+package service
+
+import (
+	"context"
+
+	"gorm.io/gorm"
+
+	"github.com/truewhile/MeBox/internal/model"
+)
+
+const maxRecycleBinRecords = 200
+
+// SoftDelete 物理删除媒体记录（统一硬删除以降低 SQLite 存储与索引压力）。
+func (s *MediaService) SoftDelete(ctx context.Context, id string) error {
+	err := s.repo.DB.WithContext(ctx).Unscoped().Where("id = ?", id).Delete(&model.Media{}).Error
+	if err == nil {
+		s.invalidateMediaCache(ctx)
+	}
+	return err
+}
+
+// RestoreDeleted unsets DeletedAt for a single media row.
+func (s *MediaService) RestoreDeleted(ctx context.Context, id string) error {
+	err := s.repo.DB.WithContext(ctx).Unscoped().Model(&model.Media{}).
+		Where("id = ?", id).Update("deleted_at", nil).Error
+	if err == nil {
+		s.invalidateMediaCache(ctx)
+	}
+	return err
+}
+
+// ListRecycleBin returns every soft-deleted row, newest first.
+func (s *MediaService) ListRecycleBin(ctx context.Context, limit int) ([]model.Media, error) {
+	if err := pruneRecycleBinRows(ctx, s.repo.DB, maxRecycleBinRecords); err != nil {
+		return nil, err
+	}
+	if limit <= 0 || limit > maxRecycleBinRecords {
+		limit = maxRecycleBinRecords
+	}
+	var rows []model.Media
+	err := s.repo.DB.Unscoped().
+		Where("deleted_at IS NOT NULL").
+		Order("deleted_at desc").
+		Limit(limit).
+		Find(&rows).Error
+	return rows, err
+}
+
+func pruneRecycleBinRows(ctx context.Context, db *gorm.DB, keep int) error {
+	if db == nil {
+		return nil
+	}
+	if keep <= 0 {
+		keep = maxRecycleBinRecords
+	}
+	var rows []struct {
+		ID string
+	}
+	if err := db.WithContext(ctx).Unscoped().
+		Model(&model.Media{}).
+		Select("id").
+		Where("deleted_at IS NOT NULL").
+		Order("deleted_at desc").
+		Limit(100000).
+		Offset(keep).
+		Find(&rows).Error; err != nil {
+		return err
+	}
+	if len(rows) == 0 {
+		return nil
+	}
+	ids := make([]string, 0, len(rows))
+	for _, row := range rows {
+		if row.ID != "" {
+			ids = append(ids, row.ID)
+		}
+	}
+	if len(ids) == 0 {
+		return nil
+	}
+	return db.WithContext(ctx).Unscoped().Where("id IN ?", ids).Delete(&model.Media{}).Error
+}
+
+// PurgeDeleted permanently removes a soft-deleted row from the database.
+func (s *MediaService) PurgeDeleted(ctx context.Context, id string) error {
+	err := s.repo.DB.WithContext(ctx).Unscoped().Where("id = ?", id).Delete(&model.Media{}).Error
+	if err == nil {
+		s.invalidateMediaCache(ctx)
+	}
+	return err
+}

internal/service/media_recycle_test.go

@@ -0,0 +1,88 @@
+package service
+
+import (
+	"fmt"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+
+	"github.com/truewhile/MeBox/internal/config"
+	"github.com/truewhile/MeBox/internal/model"
+	"github.com/truewhile/MeBox/internal/repository"
+)
+
+func TestListRecycleBinPrunesOldRowsOverLimit(t *testing.T) {
+	db := newServiceTestDB(t, &model.Media{})
+	repos := repository.New(db)
+	now := time.Now()
+	for i := 0; i < maxRecycleBinRecords+5; i++ {
+		deletedAt := now.Add(time.Duration(i) * time.Second)
+		media := model.Media{
+			Base: model.Base{
+				ID:        fmt.Sprintf("media-%03d", i),
+				DeletedAt: gorm.DeletedAt{Time: deletedAt, Valid: true},
+			},
+			Title: fmt.Sprintf("Movie %03d", i),
+			Path:  filepath.Join(t.TempDir(), fmt.Sprintf("Movie %03d.mkv", i)),
+		}
+		if err := db.Unscoped().Create(&media).Error; err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
+	rows, err := svc.ListRecycleBin(t.Context(), 500)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rows) != maxRecycleBinRecords {
+		t.Fatalf("recycle rows = %d, want %d", len(rows), maxRecycleBinRecords)
+	}
+	var count int64
+	if err := db.Unscoped().Model(&model.Media{}).Where("deleted_at IS NOT NULL").Count(&count).Error; err != nil {
+		t.Fatal(err)
+	}
+	if count != maxRecycleBinRecords {
+		t.Fatalf("stored recycle rows = %d, want %d", count, maxRecycleBinRecords)
+	}
+	var oldCount int64
+	if err := db.Unscoped().Model(&model.Media{}).Where("id IN ?", []string{"media-000", "media-001", "media-002", "media-003", "media-004"}).Count(&oldCount).Error; err != nil {
+		t.Fatal(err)
+	}
+	if oldCount != 0 {
+		t.Fatalf("oldest recycle rows were not pruned, count=%d", oldCount)
+	}
+}
+
+func TestSoftDeleteInvalidatesMediaAndStatsCache(t *testing.T) {
+	db := newServiceTestDB(t, &model.Media{})
+	repos := repository.New(db)
+	media := model.Media{
+		Base:  model.Base{ID: "local-media"},
+		Title: "Cached Movie",
+		Path:  filepath.Join(t.TempDir(), "Cached Movie.mkv"),
+	}
+	if err := repos.DB.Create(&media).Error; err != nil {
+		t.Fatal(err)
+	}
+
+	cache := NewRuntimeCacheService(&config.Config{}, zap.NewNop())
+	cache.SetJSON(t.Context(), "media:list:test", map[string]string{"state": "stale"}, time.Minute)
+	cache.SetJSON(t.Context(), "stats:snapshot:base", map[string]int{"media": 1}, time.Minute)
+	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos).SetRuntimeCache(cache)
+	if err := svc.SoftDelete(t.Context(), media.ID); err != nil {
+		t.Fatal(err)
+	}
+
+	var mediaCache map[string]string
+	if cache.GetJSON(t.Context(), "media:list:test", &mediaCache) {
+		t.Fatal("soft delete should invalidate media cache")
+	}
+	var statsCache map[string]int
+	if cache.GetJSON(t.Context(), "stats:snapshot:base", &statsCache) {
+		t.Fatal("soft delete should invalidate stats cache")
+	}
+}

internal/service/media_series.go

@@ -17,15 +17,6 @@ type seriesCardsCacheValue struct {
 	Total int64        `json:"total"`
 }
 
-// libraryRowsCacheValue 整库可见行 + 预计算索引的对象缓存。填充时一次性完成
-// 整库 SQL 加载与 series key 解析，之后剧集卡片、剧集列表、媒体详情剧集
-// 共享这份结果：命中路径零 SQL、零逐行 key 解析。Rows/Episodes 视为不可变。
-type libraryRowsCacheValue struct {
-	Rows     []model.Media
-	Resolver mediaSeriesKeyResolver
-	Episodes map[string][]model.Media
-}
-
 type SeriesCard struct {
 	Key       string      `json:"key"`
 	Rep       model.Media `json:"rep"`
@@ -38,59 +29,24 @@ type seriesCardGroup struct {
 	latest time.Time
 }
 
-// libraryRowsWithIndex 返回整库行与预计算剧集索引（带对象缓存）。
-func (s *MediaService) libraryRowsWithIndex(ctx context.Context, libraryID string, visibility MediaVisibility) (*libraryRowsCacheValue, error) {
-	cacheKey := s.libraryRowsCacheKey(libraryID, visibility)
-	if s.cache != nil {
-		if obj, ok := s.cache.GetObject(cacheKey); ok {
-			if cached, ok := obj.(*libraryRowsCacheValue); ok {
-				return cached, nil
-			}
-		}
+func (s *MediaService) ListLibrarySeriesCards(ctx context.Context, libraryID string, visibility MediaVisibility) ([]SeriesCard, int64, error) {
+	visibility = ExpandMediaVisibilityForMergedCloudLibraries(ctx, s.repo, visibility)
+	cacheKey := s.seriesCardsCacheKey(libraryID, visibility)
+	var cached seriesCardsCacheValue
+	if s.cache != nil && s.cache.GetJSON(ctx, cacheKey, &cached) {
+		return cached.Cards, cached.Total, nil
 	}
 	rows, _, err := s.listAllMediaVisible(ctx, libraryID, visibility)
-	if err != nil {
-		return nil, err
-	}
-	// listAllMediaVisible 走 ListMediaVisible，行已带库元数据（resolver 的
-	// key 计算依赖 DisplayLibraryPath/ID）。
-	resolver := newMediaSeriesKeyResolver(rows)
-	episodes := make(map[string][]model.Media, len(rows)/4+1)
-	for _, row := range rows {
-		k := resolver.key(row)
-		if k == "" {
-			continue
-		}
-		episodes[k] = append(episodes[k], row)
-	}
-	value := &libraryRowsCacheValue{Rows: rows, Resolver: resolver, Episodes: episodes}
-	if s.cache != nil {
-		s.cache.SetObject(cacheKey, value, s.mediaObjectTTL())
-	}
-	return value, nil
-}
-
-func (s *MediaService) ListLibrarySeriesCards(ctx context.Context, libraryID string, visibility MediaVisibility) ([]SeriesCard, int64, error) {
-	visibility = ExpandMediaVisibilityForMergedCloudLibraries(ctx, s.repo, visibility)
-	cacheKey := s.libraryCardsObjectKey(libraryID, visibility)
-	if s.cache != nil {
-		if obj, ok := s.cache.GetObject(cacheKey); ok {
-			if cached, ok := obj.(*seriesCardsCacheValue); ok {
-				return cached.Cards, cached.Total, nil
-			}
-		}
-	}
-	rows, err := s.libraryRowsWithIndex(ctx, libraryID, visibility)
 	if err != nil {
 		return nil, 0, err
 	}
-	cards := groupMediaSeriesCards(rows.Rows)
+	cards := groupMediaSeriesCards(rows)
 	if cards == nil {
 		cards = []SeriesCard{}
 	}
 	total := int64(len(cards))
 	if s.cache != nil {
-		s.cache.SetObject(cacheKey, &seriesCardsCacheValue{Cards: cards, Total: total}, s.mediaObjectTTL())
+		s.cache.SetJSON(ctx, cacheKey, seriesCardsCacheValue{Cards: cards, Total: total}, time.Duration(s.mediaCacheTTLSeconds())*time.Second)
 	}
 	return cards, total, nil
 }
@@ -116,35 +72,17 @@ func (s *MediaService) ListRecentSeriesCards(ctx context.Context, limit int, vis
 }
 
 func (s *MediaService) ListLibrarySeriesEpisodes(ctx context.Context, libraryID, key string, visibility MediaVisibility) ([]model.Media, error) {
-	rows, err := s.libraryRowsWithIndex(ctx, libraryID, visibility)
+	rows, _, err := s.listAllMediaVisible(ctx, libraryID, visibility)
 	if err != nil {
 		return nil, err
 	}
-	// 预计算索引命中：O(1) 查找，拷贝后排序避免改动共享缓存。
-	if episodes, ok := rows.Episodes[key]; ok && len(episodes) > 0 {
-		out := make([]model.Media, len(episodes))
-		copy(out, episodes)
-		sortEpisodesForDisplay(out)
-		return out, nil
-	}
-
-	// 兜底：索引未命中（如卡片 key 与行缓存短暂跨代），保持原线性匹配逻辑。
-	all := rows.Rows
 	out := make([]model.Media, 0)
-	for _, row := range all {
-		if rows.Resolver.key(row) == key {
+	resolver := newMediaSeriesKeyResolver(rows)
+	for _, row := range rows {
+		if resolver.key(row) == key {
 			out = append(out, row)
 		}
 	}
-	if len(out) == 0 {
-		return []model.Media{}, nil
-	}
-	sortEpisodesForDisplay(out)
-	return out, nil
-}
-
-// sortEpisodesForDisplay 与历史行为一致：季/集号升序，再按入库时间兜底。
-func sortEpisodesForDisplay(out []model.Media) {
 	sort.SliceStable(out, func(i, j int) bool {
 		if out[i].SeasonNum != out[j].SeasonNum {
 			return out[i].SeasonNum < out[j].SeasonNum
@@ -154,6 +92,7 @@ func sortEpisodesForDisplay(out []model.Media) {
 		}
 		return out[i].CreatedAt.Before(out[j].CreatedAt)
 	})
+	return out, nil
 }
 
 func (s *MediaService) ListMediaEpisodes(ctx context.Context, mediaID string, visibility MediaVisibility) ([]model.Media, error) {
@@ -170,59 +109,39 @@ func (s *MediaService) ListMediaEpisodes(ctx context.Context, mediaID string, vi
 	if target.LibraryID == "" {
 		return []model.Media{*target}, nil
 	}
-	cache, err := s.libraryRowsWithIndex(ctx, target.LibraryID, visibility)
+	rows, _, err := s.listAllMediaVisible(ctx, target.LibraryID, visibility)
 	if err != nil {
 		return nil, err
 	}
-	rows := cache.Rows
 	if len(rows) == 0 {
 		return []model.Media{*target}, nil
 	}
 
-	var out []model.Media
-	targetKey := cache.Resolver.key(*target)
+	resolver := newMediaSeriesKeyResolver(rows)
+	targetKey := resolver.key(*target)
+
+	out := make([]model.Media, 0)
 	if targetKey != "" {
-		// 预计算索引命中时拷贝，避免改动共享缓存。
-		if episodes, ok := cache.Episodes[targetKey]; ok {
-			out = make([]model.Media, len(episodes))
-			copy(out, episodes)
+		for _, row := range rows {
+			if resolver.key(row) == targetKey {
+				out = append(out, row)
+			}
 		}
 	}
 
-		// 如果没有聚合到多集，尝试同父目录匹配（排除合集目录和公共分类目录，且同目录文件不能是互不相同的独立电影）
-		if len(out) <= 1 && target.Path != "" {
-			targetDir := filepath.Dir(strings.ReplaceAll(target.Path, "\\", "/"))
-			parentBase := filepath.Base(targetDir)
-			if !mediaParentLooksLikeCollection(target.Path) && !seriesTitleIsGenericContainer(parentBase, *target) {
-				targetTitleNorm := normalizeSeriesTitle(target.Title)
-				targetDirNorm := normalizeSeriesTitle(parentBase)
-				dirMatches := make([]model.Media, 0)
-				for _, row := range rows {
-					if row.Path == "" || filepath.Dir(strings.ReplaceAll(row.Path, "\\", "/")) != targetDir {
-						continue
-					}
-					if row.ID == target.ID {
-						dirMatches = append(dirMatches, row)
-						continue
-					}
-					rowTitleNorm := normalizeSeriesTitle(row.Title)
-					allowMatch := false
-					if isGenericMovieTitle(rowTitleNorm) || isGenericMovieTitle(targetTitleNorm) {
-						allowMatch = true
-					} else if rowTitleNorm != "" && rowTitleNorm == targetTitleNorm {
-						allowMatch = true
-					} else if rowTitleNorm != "" && targetDirNorm != "" && rowTitleNorm == targetDirNorm {
-						allowMatch = true
-					}
-					if allowMatch {
-						dirMatches = append(dirMatches, row)
-					}
-				}
-				if len(dirMatches) > 1 {
-					out = dirMatches
-				}
+	// 如果没有聚合到多集，尝试同父目录匹配
+	if len(out) <= 1 && target.Path != "" {
+		targetDir := filepath.Dir(strings.ReplaceAll(target.Path, "\\", "/"))
+		dirMatches := make([]model.Media, 0)
+		for _, row := range rows {
+			if row.Path != "" && filepath.Dir(strings.ReplaceAll(row.Path, "\\", "/")) == targetDir {
+				dirMatches = append(dirMatches, row)
 			}
 		}
+		if len(dirMatches) > 1 {
+			out = dirMatches
+		}
+	}
 
 	if len(out) == 0 {
 		out = []model.Media{*target}

internal/service/media_series_key.go

@@ -11,16 +11,6 @@ import (
 
 var episodicPathRE = regexp.MustCompile(`(?i)[\\/](?:电视剧|剧集|连续剧|短剧|国产剧|国剧|大陆剧|华语剧|国产电视剧|大陆电视剧|华语电视剧|欧美剧|欧美电视剧|美剧|英剧|日韩剧|日韩电视剧|日剧|韩剧|港剧|台剧|港台剧|泰剧|综艺|纪录片|儿童|动漫|番剧|国漫|日番|韩漫|美漫|欧美动漫|欧美动画|其他动漫|tv|series|shows?|season[\s._-]*\d|s\d{1,2}(?:[\s._-]|[\\/])|special[\s._-]*episodes?|specials?|sp|ovas?|oads?|extras?|bonus(?:es)?|omake|特别篇|特別篇|番外篇?|特典|外传|外傳|总集篇|總集篇)[\\/]`)
 
-var genericMovieTitleRE = regexp.MustCompile(`(?i)^(?:cd\s*\d+|part\s*\d+|disc\s*\d+|disk\s*\d+|dvd\s*\d+|movie|film|video|main|feature|track\s*\d+|preview|sample|trailer|\d{3,4}p|4k|2160p|1080p|720p)$`)
-
-func isGenericMovieTitle(title string) bool {
-	title = strings.TrimSpace(title)
-	if title == "" {
-		return true
-	}
-	return genericMovieTitleRE.MatchString(title)
-}
-
 func mediaSeriesKey(media model.Media) string {
 	return compactSeriesKey(mediaSeriesRawKey(media))
 }
@@ -64,11 +54,7 @@ func mediaSeriesRawKey(media model.Media) string {
 		return seriesFingerprint("movie-external", fmt.Sprintf("bgm:%d", media.BangumiID))
 	}
 	if fromPath != "" && !mediaParentLooksLikeCollection(media.Path) {
-		titleNorm := normalizeSeriesTitle(media.Title)
-		fromPathNorm := normalizeSeriesTitle(fromPath)
-		if titleNorm == "" || isGenericMovieTitle(titleNorm) || titleNorm == fromPathNorm {
-			return seriesFingerprint("library-path", media.LibraryID, fromPath)
-		}
+		return seriesFingerprint("library-path", media.LibraryID, fromPath)
 	}
 	return seriesFingerprint("library-title", media.LibraryID, normalizeSeriesTitle(media.Title))
 }

internal/service/media_series_test.go

@@ -445,67 +445,3 @@ func TestGroupMediaSeriesCardsBridgesReleaseFoldersByMatchedSeriesTitle(t *testi
 		t.Fatalf("cards=%#v, want one series bridged by matched title", cards)
 	}
 }
-
-func TestGroupMediaSeriesCardsKeepsIndependentMoviesSeparateInSharedSubdirectory(t *testing.T) {
-	// 同一分类子目录下存放多部不同标题的独立电影，不应被强制折叠成 1 部
-	items := []model.Media{
-		{LibraryID: "movies", Title: "老师2024偷窥篇", Path: `/media/小姐姐/国产/nana/老师2024偷窥篇.strm`},
-		{LibraryID: "movies", Title: "紫光灯下的肉体诱惑", Path: `/media/小姐姐/国产/nana/紫光灯下的肉体诱惑.strm`},
-		{LibraryID: "movies", Title: "修洗衣机", Path: `/media/小姐姐/国产/nana/修洗衣机.strm`},
-	}
-	cards := groupMediaSeriesCards(items)
-	if len(cards) != 3 {
-		t.Fatalf("got %d cards, want 3 independent movie cards", len(cards))
-	}
-
-	// 但同一部电影的 CD1 和 CD2 仍应正确折叠为 1 部
-	cdItems := []model.Media{
-		{LibraryID: "movies", Title: "cd1", Path: `/media/电影/指环王 (2001)/cd1.mkv`},
-		{LibraryID: "movies", Title: "cd2", Path: `/media/电影/指环王 (2001)/cd2.mkv`},
-	}
-		cdCards := groupMediaSeriesCards(cdItems)
-		if len(cdCards) != 1 {
-			t.Fatalf("got %d cards for cd1/cd2, want 1 folded movie card", len(cdCards))
-		}
-	}
-
-func TestListMediaEpisodesKeepsIndependentMoviesSeparate(t *testing.T) {
-	db := newServiceTestDB(t, &model.Library{}, &model.Media{})
-	repos := repository.New(db)
-	lib := model.Library{Base: model.Base{ID: "lib-movies"}, Name: "电影", Type: "movies", Enabled: true}
-	if err := repos.DB.Create(&lib).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	m1 := model.Media{
-		Base:      model.Base{ID: "m1"},
-		LibraryID: lib.ID,
-		Title:     "老师2024偷窥篇",
-		Path:      `/media/小姐姐/国产/nana/老师2024偷窥篇.strm`,
-	}
-	m2 := model.Media{
-		Base:      model.Base{ID: "m2"},
-		LibraryID: lib.ID,
-		Title:     "紫光灯下的肉体诱惑",
-		Path:      `/media/小姐姐/国产/nana/紫光灯下的肉体诱惑.strm`,
-	}
-	m3 := model.Media{
-		Base:      model.Base{ID: "m3"},
-		LibraryID: lib.ID,
-		Title:     "修洗衣机",
-		Path:      `/media/小姐姐/国产/nana/修洗衣机.strm`,
-	}
-	if err := repos.DB.Create(&[]model.Media{m1, m2, m3}).Error; err != nil {
-		t.Fatal(err)
-	}
-
-	svc := NewMediaService(&config.Config{}, zap.NewNop(), repos)
-	eps, err := svc.ListMediaEpisodes(t.Context(), "m1", MediaVisibility{IncludeNSFW: true})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(eps) != 1 || eps[0].ID != "m1" {
-		t.Fatalf("ListMediaEpisodes got %#v, want exactly m1", eps)
-	}
-}
-

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/playback.go

@@ -159,20 +159,7 @@ func (p *PlaybackService) RecentHistory(ctx context.Context, userID string, limi
 
 // ToggleFavourite flips the favourite flag and reports the new state.
 func (p *PlaybackService) ToggleFavourite(ctx context.Context, userID, mediaID string) (bool, error) {
-	current, err := IsUserFavorite(ctx, p.repo, userID, mediaID)
-	if err != nil {
-		return false, err
-	}
-	next := !current
-	if err := p.SetFavourite(ctx, userID, mediaID, next); err != nil {
-		return false, err
-	}
-	return next, nil
-}
-
-// SetFavourite sets favourite state for a media item.
-func (p *PlaybackService) SetFavourite(ctx context.Context, userID, mediaID string, favorite bool) error {
-	return SyncUserFavorite(ctx, p.repo, p.remote, userID, mediaID, favorite)
+	return p.repo.Favorite.Toggle(ctx, userID, mediaID)
 }
 
 // ListFavourites returns every favourited media for a user.

internal/service/profile.go

@@ -3,7 +3,6 @@ package service
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"strings"
 
@@ -82,125 +81,6 @@ func (p *ProfileService) UpdateProfile(ctx context.Context, userID string, patch
 	return p.repo.User.FindByID(ctx, userID)
 }
 
-// GetPinnedLibraryIDs returns the user's pinned library IDs, filtered to libraries
-// they can still access.
-func (p *ProfileService) GetPinnedLibraryIDs(ctx context.Context, userID string) ([]string, error) {
-	user, err := p.repo.User.FindByID(ctx, userID)
-	if err != nil {
-		return nil, err
-	}
-	if user == nil {
-		return nil, errors.New("user not found")
-	}
-	visibility := UserDefaultMediaVisibility(ctx, p.repo, userID)
-	accessible, err := p.accessibleLibraryIDSet(ctx, visibility)
-	if err != nil {
-		return nil, err
-	}
-	return filterPinnedLibraryIDs(user.DecodePinnedLibraryIDs(), accessible), nil
-}
-
-// SetPinnedLibraryIDs persists the user's pinned library order after filtering to
-// accessible, enabled libraries.
-func (p *ProfileService) SetPinnedLibraryIDs(ctx context.Context, userID string, ids []string) ([]string, error) {
-	if userID == "" {
-		return nil, errors.New("missing user id")
-	}
-	user, err := p.repo.User.FindByID(ctx, userID)
-	if err != nil {
-		return nil, err
-	}
-	if user == nil {
-		return nil, errors.New("user not found")
-	}
-	visibility := UserDefaultMediaVisibility(ctx, p.repo, userID)
-	accessible, err := p.accessibleLibraryIDSet(ctx, visibility)
-	if err != nil {
-		return nil, err
-	}
-	normalized := filterPinnedLibraryIDs(normalizePinnedLibraryIDs(ids), accessible)
-	if normalized == nil {
-		normalized = []string{}
-	}
-	raw, err := json.Marshal(normalized)
-	if err != nil {
-		return nil, err
-	}
-	if err := p.repo.User.UpdateFields(ctx, userID, map[string]any{
-		"pinned_library_ids": string(raw),
-	}); err != nil {
-		return nil, err
-	}
-	return normalized, nil
-}
-
-func (p *ProfileService) accessibleLibraryIDSet(ctx context.Context, visibility MediaVisibility) (map[string]struct{}, error) {
-	libs, err := p.repo.Library.List(ctx)
-	if err != nil {
-		return nil, err
-	}
-	out := make(map[string]struct{})
-	for _, lib := range libs {
-		if !lib.Enabled {
-			continue
-		}
-		if !LibraryVisibleForUser(ctx, p.repo, lib, visibility) {
-			continue
-		}
-		out[lib.ID] = struct{}{}
-	}
-	// Mounted Emby libraries are not rows in the local libraries table; their
-	// web IDs are embyremote~{mountID}~{remoteViewID}. Include enabled mounts
-	// from the mount table so pinning them does not get stripped (and so a
-	// pin-save that includes remotes cannot accidentally wipe local pins).
-	if p.repo.EmbyMount != nil {
-		mounts, err := p.repo.EmbyMount.List(ctx)
-		if err != nil {
-			return nil, err
-		}
-		for _, mount := range mounts {
-			if !mount.Enabled || strings.TrimSpace(mount.RemoteViewID) == "" {
-				continue
-			}
-			out[EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)] = struct{}{}
-		}
-	}
-	return out, nil
-}
-
-func normalizePinnedLibraryIDs(ids []string) []string {
-	if len(ids) == 0 {
-		return nil
-	}
-	seen := make(map[string]struct{}, len(ids))
-	out := make([]string, 0, len(ids))
-	for _, id := range ids {
-		trimmed := strings.TrimSpace(id)
-		if trimmed == "" {
-			continue
-		}
-		if _, ok := seen[trimmed]; ok {
-			continue
-		}
-		seen[trimmed] = struct{}{}
-		out = append(out, trimmed)
-	}
-	return out
-}
-
-func filterPinnedLibraryIDs(ids []string, accessible map[string]struct{}) []string {
-	if len(ids) == 0 {
-		return nil
-	}
-	out := make([]string, 0, len(ids))
-	for _, id := range ids {
-		if _, ok := accessible[id]; ok {
-			out = append(out, id)
-		}
-	}
-	return out
-}
-
 // AdminUpdateRole lets administrators promote / demote another user. The
 // caller is expected to gate the route with AdminRequired.
 func (p *ProfileService) AdminUpdateRole(ctx context.Context, userID, role string) (*model.User, error) {

internal/service/profile_pinned_test.go

@@ -1,123 +0,0 @@
-package service
-
-import (
-	"testing"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/gorm"
-
-	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
-	"go.uber.org/zap"
-)
-
-func TestProfilePinnedLibrariesFiltersInaccessibleAndPreservesOrder(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.AutoMigrate(&model.User{}, &model.Library{}, &model.EmbyMount{}); err != nil {
-		t.Fatal(err)
-	}
-	repos := repository.New(db)
-	svc := NewProfileService(zap.NewNop(), repos)
-
-	user := &model.User{Username: "viewer", PasswordHash: "hash", Role: "user"}
-	if err := repos.User.Create(t.Context(), user); err != nil {
-		t.Fatal(err)
-	}
-	libA := &model.Library{Name: "Movies", Path: "/media/movies", Type: "movie", Enabled: true}
-	libB := &model.Library{Name: "TV", Path: "/media/tv", Type: "tv", Enabled: true}
-	libHidden := &model.Library{Name: "Adult", Path: "/media/adult", Type: "movie", Enabled: true}
-	for _, lib := range []*model.Library{libA, libB, libHidden} {
-		if err := repos.Library.Create(t.Context(), lib); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := repos.User.UpdateFields(t.Context(), user.ID, map[string]any{
-		"allowed_library_ids": `["` + libA.ID + `","` + libB.ID + `"]`,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	got, err := svc.SetPinnedLibraryIDs(t.Context(), user.ID, []string{
-		libB.ID, libHidden.ID, libA.ID, libB.ID, "missing",
-	})
-	if err != nil {
-		t.Fatalf("SetPinnedLibraryIDs: %v", err)
-	}
-	want := []string{libB.ID, libA.ID}
-	if len(got) != len(want) || got[0] != want[0] || got[1] != want[1] {
-		t.Fatalf("SetPinnedLibraryIDs = %v, want %v", got, want)
-	}
-
-	loaded, err := svc.GetPinnedLibraryIDs(t.Context(), user.ID)
-	if err != nil {
-		t.Fatalf("GetPinnedLibraryIDs: %v", err)
-	}
-	if len(loaded) != len(want) || loaded[0] != want[0] || loaded[1] != want[1] {
-		t.Fatalf("GetPinnedLibraryIDs = %v, want %v", loaded, want)
-	}
-}
-
-func TestProfilePinnedLibrariesKeepsMountedEmbyAndLocalPins(t *testing.T) {
-	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.AutoMigrate(&model.User{}, &model.Library{}, &model.EmbyMount{}); err != nil {
-		t.Fatal(err)
-	}
-	repos := repository.New(db)
-	svc := NewProfileService(zap.NewNop(), repos)
-
-	user := &model.User{Username: "viewer", PasswordHash: "hash", Role: "user"}
-	if err := repos.User.Create(t.Context(), user); err != nil {
-		t.Fatal(err)
-	}
-	local := &model.Library{Name: "Movies", Path: "/media/movies", Type: "movie", Enabled: true}
-	if err := repos.Library.Create(t.Context(), local); err != nil {
-		t.Fatal(err)
-	}
-	mount := &model.EmbyMount{
-		AccountID:      "acct-1",
-		RemoteViewID:   "view-42",
-		RemoteViewName: "Remote Movies",
-		Enabled:        true,
-	}
-	if err := repos.EmbyMount.Create(t.Context(), mount); err != nil {
-		t.Fatal(err)
-	}
-	remoteID := EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)
-	disabled := &model.EmbyMount{
-		AccountID:    "acct-1",
-		RemoteViewID: "view-99",
-		Enabled:      true,
-	}
-	if err := repos.EmbyMount.Create(t.Context(), disabled); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.Model(disabled).Update("enabled", false).Error; err != nil {
-		t.Fatal(err)
-	}
-	disabledID := EncodeEmbyRemoteID(disabled.ID, disabled.RemoteViewID)
-
-	got, err := svc.SetPinnedLibraryIDs(t.Context(), user.ID, []string{
-		local.ID, remoteID, disabledID, "embyremote~missing~view",
-	})
-	if err != nil {
-		t.Fatalf("SetPinnedLibraryIDs: %v", err)
-	}
-	want := []string{local.ID, remoteID}
-	if len(got) != len(want) || got[0] != want[0] || got[1] != want[1] {
-		t.Fatalf("SetPinnedLibraryIDs = %v, want %v", got, want)
-	}
-
-	loaded, err := svc.GetPinnedLibraryIDs(t.Context(), user.ID)
-	if err != nil {
-		t.Fatalf("GetPinnedLibraryIDs: %v", err)
-	}
-	if len(loaded) != len(want) || loaded[0] != want[0] || loaded[1] != want[1] {
-		t.Fatalf("GetPinnedLibraryIDs = %v, want %v", loaded, want)
-	}
-}

internal/service/runtime_cache.go

@@ -20,7 +20,6 @@ type RuntimeCacheService struct {
 
 	mu     sync.RWMutex
 	memory map[string]runtimeCacheItem
-	obj    map[string]runtimeObjectItem
 	limit  int
 }
 
@@ -29,18 +28,8 @@ type runtimeCacheItem struct {
 	expiresAt time.Time
 }
 
-// runtimeObjectItem 直存 Go 对象，跳过 JSON 编解码。热点路径（整库行、
-// 分组结果）每次请求都要完整反序列化，字节缓存避免了 SQL 却没避免解码；
-// 对象缓存命中时零解码零分配。存储的值视为不可变：读取方如需修改必须
-// 自行浅拷贝。仅进程内生效（Redis 只支持字节），多实例部署退化为各实例
-// 独立缓存，与现有内存 L1 语义一致。
-type runtimeObjectItem struct {
-	value     any
-	expiresAt time.Time
-}
-
 func NewRuntimeCacheService(cfg *config.Config, log *zap.Logger) *RuntimeCacheService {
-	c := &RuntimeCacheService{log: log, memory: map[string]runtimeCacheItem{}, obj: map[string]runtimeObjectItem{}, limit: 2048}
+	c := &RuntimeCacheService{log: log, memory: map[string]runtimeCacheItem{}, limit: 2048}
 	if cfg == nil {
 		return c
 	}
@@ -123,50 +112,6 @@ func (c *RuntimeCacheService) SetJSON(ctx context.Context, key string, value any
 	}
 }
 
-// GetObject 返回缓存中的对象。返回值不可变：调用方需要修改时必须先自行拷贝。
-func (c *RuntimeCacheService) GetObject(key string) (any, bool) {
-	if !c.Enabled() || strings.TrimSpace(key) == "" {
-		return nil, false
-	}
-	fullKey := c.key(key)
-	now := time.Now()
-	c.mu.RLock()
-	item, ok := c.obj[fullKey]
-	c.mu.RUnlock()
-	if !ok {
-		return nil, false
-	}
-	if now.After(item.expiresAt) {
-		c.mu.Lock()
-		delete(c.obj, fullKey)
-		c.mu.Unlock()
-		return nil, false
-	}
-	return item.value, true
-}
-
-// SetObject 存入一个此后视为不可变的对象。
-func (c *RuntimeCacheService) SetObject(key string, value any, ttl time.Duration) {
-	if !c.Enabled() || strings.TrimSpace(key) == "" || value == nil || ttl <= 0 {
-		return
-	}
-	fullKey := c.key(key)
-	now := time.Now()
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if len(c.obj) >= c.limit {
-		for k, item := range c.obj {
-			if now.After(item.expiresAt) || len(c.obj) >= c.limit {
-				delete(c.obj, k)
-			}
-			if len(c.obj) < c.limit {
-				break
-			}
-		}
-	}
-	c.obj[fullKey] = runtimeObjectItem{value: value, expiresAt: now.Add(ttl)}
-}
-
 func (c *RuntimeCacheService) DeletePrefix(ctx context.Context, prefix string) {
 	if !c.Enabled() || strings.TrimSpace(prefix) == "" {
 		return
@@ -245,9 +190,4 @@ func (c *RuntimeCacheService) deleteMemoryPrefix(prefix string) {
 			delete(c.memory, key)
 		}
 	}
-	for key := range c.obj {
-		if strings.HasPrefix(key, prefix) {
-			delete(c.obj, key)
-		}
-	}
 }

internal/service/scanner_local_probe_queue.go

@@ -7,7 +7,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 )
 
@@ -46,7 +45,7 @@ func (s *ScannerService) startLocalMediaProbeWorkers() {
 	s.localMediaProbeOnce.Do(func() {
 		workers := s.ffprobeWorkerCount()
 		for i := 0; i < workers; i++ {
-			helper.Go(s.log, "scanner.probeWorker", s.localMediaProbeWorker)
+			go s.localMediaProbeWorker()
 		}
 	})
 }

internal/service/scanner_local_write_batch.go

@@ -63,8 +63,6 @@ func (b *localMediaWriteBatch) Flush() {
 		return
 	}
 	existingPaths := b.existingPaths(items)
-	upsertItems := make([]*model.Media, 0, len(items))
-	upsertAfter := make([]func(), 0, len(items))
 	createItems := make([]localMediaWriteItem, 0, len(items))
 	createMedia := make([]model.Media, 0, len(items))
 	for _, item := range items {
@@ -72,16 +70,12 @@ func (b *localMediaWriteBatch) Flush() {
 			continue
 		}
 		if existingPaths[filepath.Clean(item.media.Path)] {
-			// 已存在行：攒起来在一个事务里逐条 upsert（一批一次提交）。
-			after := item.after
-			upsertItems = append(upsertItems, item.media)
-			upsertAfter = append(upsertAfter, after)
+			b.upsertExistingItem(item)
 			continue
 		}
 		createItems = append(createItems, item)
 		createMedia = append(createMedia, *item.media)
 	}
-	b.flushUpserts(items, upsertItems, upsertAfter)
 	if len(createMedia) == 0 {
 		b.publish()
 		return
@@ -148,35 +142,6 @@ func (b *localMediaWriteBatch) existingPaths(items []localMediaWriteItem) map[st
 	return out
 }
 
-// flushUpserts 把已存在行的 upsert 攒成一个事务（一次提交/一组 fsync）。
-// 整批失败（如单条数据触发约束）时退回逐条 Upsert，只丢真正坏的那几条。
-func (b *localMediaWriteBatch) flushUpserts(allItems []localMediaWriteItem, upsertItems []*model.Media, upsertAfter []func()) {
-	if len(upsertItems) == 0 {
-		return
-	}
-	if err := b.scanner.repo.Media.UpsertBatch(b.ctx, upsertItems); err == nil {
-		b.res.Updated += len(upsertItems)
-		for _, after := range upsertAfter {
-			if after != nil {
-				after()
-			}
-		}
-		return
-	} else if b.scanner.log != nil {
-		b.scanner.log.Warn("batch upsert failed; falling back to per-item upsert",
-			zap.Int("items", len(upsertItems)))
-	}
-	// 兜底：按原始顺序找回每个条目的 path/after（两个切片同序但可能含 nil）。
-	idx := 0
-	for _, item := range allItems {
-		if item.media == nil || idx >= len(upsertItems) || upsertItems[idx] != item.media {
-			continue
-		}
-		idx++
-		b.upsertExistingItem(item)
-	}
-}
-
 func (b *localMediaWriteBatch) upsertExistingItem(item localMediaWriteItem) {
 	if item.media == nil {
 		return

internal/service/scanner_post_scan.go

@@ -5,8 +5,6 @@ import (
 	"time"
 
 	"go.uber.org/zap"
-
-	"github.com/truewhile/MeBox/internal/helper"
 )
 
 func (s *ScannerService) invalidateMediaCache(ctx context.Context) {
@@ -20,12 +18,10 @@ func (s *ScannerService) startAutoScrape(ctx context.Context, libraryID string)
 	scrapeCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Minute)
 	go func() {
 		defer cancel()
-		// 扫描触发的后台刮削与请求线程无关，panic 只记日志，不能带崩进程。
-		helper.Run(s.log, "scanner.autoScrape", func() {
-			_, err := s.scraper.EnrichLibraryDetailedWithOptions(scrapeCtx, libraryID, skipEpisodeArtworkOptions(false))
-			if err != nil {
-				s.log.Warn("scraper enrich failed", zap.Error(err))
-			}
-		})
+		_, err := s.scraper.EnrichLibraryDetailedWithOptions(scrapeCtx, libraryID, skipEpisodeArtworkOptions(false))
+		if err != nil {
+			s.log.Warn("scraper enrich failed", zap.Error(err))
+			return
+		}
 	}()
 }

internal/service/scheduler.go

@@ -8,6 +8,9 @@
 //	organize_source   opt-in        — organize the configured staging folder.
 //	transcode_cleanup every 24 h   — purge HLS transcode artefacts
 //	                                  older than 24 h.
+//	recycle_purge     every 24 h   — empty the recycle bin of rows
+//	                                  soft-deleted more than 30 days
+//	                                  ago.
 //
 // Each job runs at most once at a time (an in-flight run blocks the
 // next tick). All work happens on a long-lived background context so
@@ -22,7 +25,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 )
 
@@ -126,6 +128,11 @@ func (s *SchedulerService) Start(ctx context.Context) {
 			interval: 24 * time.Hour,
 			run:      s.jobCleanTranscodeCache,
 		},
+		{
+			name:     "recycle_purge",
+			interval: 24 * time.Hour,
+			run:      s.jobPurgeRecycleBin,
+		},
 		{
 			name:     "image_cache_cleanup",
 			interval: 1 * time.Hour,
@@ -140,7 +147,7 @@ func (s *SchedulerService) Start(ctx context.Context) {
 			// 首轮等满一个完整周期再跑，平时节奏不变。
 			initialDelay = j.interval
 		}
-		helper.Go(s.log, "scheduler.loop."+j.name, func() { s.loopWithInitialDelay(ctx, j, initialDelay) })
+		go s.loopWithInitialDelay(ctx, j, initialDelay)
 	}
 }
 

internal/service/scheduler_local_jobs.go

@@ -8,6 +8,9 @@ import (
 	"time"
 
 	"go.uber.org/zap"
+	"gorm.io/gorm"
+
+	"github.com/truewhile/MeBox/internal/model"
 )
 
 // jobScanLibraries re-walks every enabled library.
@@ -178,6 +181,29 @@ func (s *SchedulerService) jobCleanTranscodeCache(ctx context.Context) error {
 	return walkAndPrune(s.cacheDir+"/hls", cutoff)
 }
 
+// jobPurgeRecycleBin permanently deletes media rows soft-deleted >30 days
+// ago. The on-disk file is left untouched (delete is operator-driven).
+func (s *SchedulerService) jobPurgeRecycleBin(ctx context.Context) error {
+	cutoff := time.Now().Add(-30 * 24 * time.Hour)
+	res := s.repo.DB.WithContext(ctx).
+		Unscoped().
+		Where("deleted_at IS NOT NULL AND deleted_at < ?", cutoff).
+		Delete(&model.Media{})
+	if res.Error != nil && !isMissingTableErr(res.Error) {
+		return res.Error
+	}
+	return pruneRecycleBinRows(ctx, s.repo.DB, maxRecycleBinRecords)
+}
+
+// isMissingTableErr lets the test harness ignore "no such table" errors
+// that show up before AutoMigrate has run.
+func isMissingTableErr(err error) bool {
+	if err == nil {
+		return false
+	}
+	return err == gorm.ErrInvalidDB
+}
+
 // jobCleanImageCache prunes image proxy cache files when disk usage exceeds the configured limit.
 func (s *SchedulerService) jobCleanImageCache(ctx context.Context) error {
 	if s.cacheDir == "" {

internal/service/scheduler_runner.go

@@ -6,8 +6,6 @@ import (
 	"time"
 
 	"go.uber.org/zap"
-
-	"github.com/truewhile/MeBox/internal/helper"
 )
 
 // JobStatus is a snapshot suitable for the admin UI.
@@ -144,8 +142,7 @@ func (s *SchedulerService) beginRun(j *scheduledJob) error {
 }
 
 func (s *SchedulerService) runReserved(ctx context.Context, j *scheduledJob) error {
-	// 任务 panic 转为 error，保证下方 running/lastErr 状态照常清理、调度循环存活。
-	err := helper.Recover(s.log, "scheduler.job."+j.name, func() error { return j.run(ctx) })
+	err := j.run(ctx)
 	s.mu.Lock()
 	j.lastRun = s.currentTime()
 	if err != nil {

internal/service/scraper_queue.go

@@ -10,7 +10,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 )
 
@@ -74,10 +73,7 @@ func (s *ScraperService) queueWorker(ctx context.Context) {
 				}
 				defer func() { <-sem }()
 
-				// 刮削要解析远端元数据响应，单个任务 panic 不应拖垮队列 worker。
-				helper.Run(s.log, "scraper.task", func() {
-					s.processScrapeTask(ctx, t)
-				})
+				s.processScrapeTask(ctx, t)
 			}(&tasks[i])
 		}
 		wg.Wait()
@@ -349,10 +345,6 @@ func (s *ScraperService) ClearCanceledScrapeTasks(ctx context.Context) (int64, e
 	return s.repo.ScrapeTask.ClearCanceled(ctx)
 }
 
-func (s *ScraperService) ClearFailedScrapeTasks(ctx context.Context) (int64, error) {
-	return s.repo.ScrapeTask.ClearFailed(ctx)
-}
-
 func (s *ScraperService) RetryAllFailedScrapeTasks(ctx context.Context) (int64, error) {
 	return s.repo.ScrapeTask.RetryAllFailed(ctx)
 }

internal/service/service.go

@@ -10,13 +10,11 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 )
 
 // Container 持有在启动时初始化的每个服务。Handler 接收指向它的指针并选择相关字段。
 type Container struct {
-	Version          string
 	Cfg              *config.Config
 	Log              *zap.Logger
 	Repo             *repository.Container
@@ -97,7 +95,7 @@ func (c *Container) Boot() {
 	if err := c.APIConfig.SeedDefaults(c.stopCtx); err != nil {
 		c.Log.Warn("api config seed failed", zap.Error(err))
 	}
-	helper.Go(c.Log, "service.warmMediaSearchIndex", func() { c.warmMediaSearchIndex(c.stopCtx) })
+	go c.warmMediaSearchIndex(c.stopCtx)
 
 	// 启动调度器定时任务
 	c.Scheduler.Start(c.stopCtx)
@@ -120,7 +118,7 @@ func (c *Container) Boot() {
 	// Mgo 保号规则巡检：默认关闭，由管理员通过 Telegram Bot 命令开启。
 	// 每天触发一次评估；规则里的窗口可随机，不固定。
 	if c.Device != nil {
-		helper.Go(c.Log, "service.inactivitySweeper", func() { c.runInactivitySweeper(c.stopCtx) })
+		go c.runInactivitySweeper(c.stopCtx)
 	}
 }
 

internal/service/service_builder.go

@@ -8,7 +8,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
 )
@@ -28,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()
@@ -48,12 +46,12 @@ func newServiceContainer(cfg *config.Config, log *zap.Logger, repos *repository.
 
 func (b *serviceContainerBuilder) startRealtimeServices() {
 	b.c.WSHub = NewHub(b.log)
-	helper.Go(b.log, "ws.hub", b.c.WSHub.Run)
+	go b.c.WSHub.Run()
 	b.c.Tasks = NewTaskTrackerService(b.log, b.c.WSHub)
 	b.c.SystemUpdate = NewSystemUpdateService(b.cfg, b.log, b.repos, b.c.Tasks, b.version)
 
 	b.c.SSEHub = NewSSEHub(b.log)
-	helper.Go(b.log, "sse.hub", b.c.SSEHub.Run)
+	go b.c.SSEHub.Run()
 }
 
 func (b *serviceContainerBuilder) initProviderServices() {

internal/service/strm_queue.go

@@ -18,7 +18,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/service/cloud"
 	"github.com/truewhile/MeBox/internal/service/cloud115"
@@ -67,10 +66,7 @@ func (s *StrmService) downloadWorker(ctx context.Context) {
 					return
 				}
 				defer s.releaseDownloadSlot(task.Provider)
-				// 单个任务 panic 不应拖垮整个下载 worker。
-				helper.Run(s.log, "strm.downloadTask", func() {
-					s.processDownloadTask(ctx, task)
-				})
+				s.processDownloadTask(ctx, task)
 			}(i)
 		}
 		wg.Wait()
@@ -614,21 +610,11 @@ func (s *StrmService) ClearCanceledDownloadTasks(ctx context.Context) (int64, er
 	return s.repo.StrmDownload.ClearCanceled(ctx)
 }
 
-// ClearFailedDownloadTasks 清空全部已失败的下载记录，返回删除数量。
-func (s *StrmService) ClearFailedDownloadTasks(ctx context.Context) (int64, error) {
-	return s.repo.StrmDownload.ClearFailed(ctx)
-}
-
 // ClearCanceledUploadTasks 清空全部已取消的上传记录，返回删除数量。
 func (s *StrmService) ClearCanceledUploadTasks(ctx context.Context) (int64, error) {
 	return s.repo.StrmUpload.ClearCanceled(ctx)
 }
 
-// ClearFailedUploadTasks 清空全部已失败的上传记录，返回删除数量。
-func (s *StrmService) ClearFailedUploadTasks(ctx context.Context) (int64, error) {
-	return s.repo.StrmUpload.ClearFailed(ctx)
-}
-
 // ClearDoneUploadTasks 清空全部已完成上传记录，返回删除数量。
 func (s *StrmService) ClearDoneUploadTasks(ctx context.Context) (int64, error) {
 	return s.repo.StrmUpload.ClearDone(ctx)

internal/service/strm_service.go

@@ -24,7 +24,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
 	"github.com/truewhile/MeBox/internal/service/cloud"
@@ -187,14 +186,14 @@ func (s *StrmService) Start(ctx context.Context) {
 		uploadThreads = 4
 	}
 	for i := 0; i < downloadThreads; i++ {
-		helper.Go(s.log, "strm.downloadWorker", func() { s.downloadWorker(ctx) })
+		go s.downloadWorker(ctx)
 	}
 	for i := 0; i < uploadThreads; i++ {
-		helper.Go(s.log, "strm.uploadWorker", func() { s.uploadWorker(ctx) })
+		go s.uploadWorker(ctx)
 	}
-	helper.Go(s.log, "strm.cronLoop", func() { s.cronLoop(ctx) })
-	helper.Go(s.log, "strm.queueCleanupLoop", func() { s.queueCleanupLoop(ctx) })
-	helper.Go(s.log, "strm.refresh115TokensLoop", func() { s.refresh115TokensLoop(ctx) })
+	go s.cronLoop(ctx)
+	go s.queueCleanupLoop(ctx)
+	go s.refresh115TokensLoop(ctx)
 	s.log.Info("strm service started",
 		zap.Int("download_threads", downloadThreads),
 		zap.Int("upload_threads", uploadThreads))

internal/service/strm_sync.go

@@ -18,7 +18,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/service/cloud"
 	"github.com/truewhile/MeBox/internal/service/cloud115"
@@ -106,7 +105,7 @@ func (s *StrmService) StartSync(ctx context.Context, pathID string, syncType ...
 	p.LastSyncMessage = "同步进行中"
 	_ = s.repo.StrmSyncPath.Update(ctx, p)
 
-	helper.Go(s.log, "strm.sync", func() { s.runSync(runCtx, p, rec) })
+	go s.runSync(runCtx, p, rec)
 	return nil
 }
 
@@ -362,45 +361,38 @@ func (st *strmSyncState) walkRemote() error {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			// worker 解析远端响应 panic 时取消整个同步，让 closer 与其余
-			// worker 正常收尾，避免队列与 pending 计数卡死；正常退出不取消。
-			if err := helper.Recover(st.s.log, "strm.sync.walkRemote", func() error {
-				for task := range queue {
-					if ctx.Err() != nil {
-						return nil
-					}
-					entries, err := st.provider.List(ctx, task.id)
-					if err != nil {
-						errMu.Lock()
-						if firstErr == nil {
-							firstErr = fmt.Errorf("列出远端目录 %s 失败：%w", task.id, err)
-						}
-						errMu.Unlock()
-						cancel()
-						return nil
-					}
-					for _, entry := range entries {
-						cleanName := cleanEntryName(entry.Name, entry.IsDir)
-						rel := cleanName
-						if task.rel != "" {
-							rel = task.rel + "/" + cleanName
-						}
-						if entry.IsDir {
-							pending.Add(1)
-							select {
-							case queue <- dirTask{id: entry.ID, rel: rel}:
-							case <-ctx.Done():
-								pending.Add(-1)
-							}
-						} else {
-							st.processRemoteFile(entry, rel)
-						}
-					}
-					pending.Add(-1)
+			for task := range queue {
+				if ctx.Err() != nil {
+					return
 				}
-				return nil
-			}); err != nil {
-				cancel()
+				entries, err := st.provider.List(ctx, task.id)
+				if err != nil {
+					errMu.Lock()
+					if firstErr == nil {
+						firstErr = fmt.Errorf("列出远端目录 %s 失败：%w", task.id, err)
+					}
+					errMu.Unlock()
+					cancel()
+					return
+				}
+				for _, entry := range entries {
+					cleanName := cleanEntryName(entry.Name, entry.IsDir)
+					rel := cleanName
+					if task.rel != "" {
+						rel = task.rel + "/" + cleanName
+					}
+					if entry.IsDir {
+						pending.Add(1)
+						select {
+						case queue <- dirTask{id: entry.ID, rel: rel}:
+						case <-ctx.Done():
+							pending.Add(-1)
+						}
+					} else {
+						st.processRemoteFile(entry, rel)
+					}
+				}
+				pending.Add(-1)
 			}
 		}()
 	}
@@ -568,28 +560,22 @@ func (st *strmSyncState) walk115Flat(open115 *cloud115.OpenClient) error {
 			wg.Add(1)
 			go func() {
 				defer wg.Done()
-				// 分页拉取 panic 时取消整个同步；正常退出不取消。
-				if err := helper.Recover(st.s.log, "strm.sync.walk115.page", func() error {
-					for t := range taskCh {
-						if ctx.Err() != nil {
-							return nil
-						}
-						files, _, err := open115.GetFsListFlat(ctx, rootCID, t.offset, pageSize)
-						if err != nil {
-							errMu.Lock()
-							if fetchErr == nil {
-								fetchErr = err
-							}
-							errMu.Unlock()
-							return nil
-						}
-						filesMu.Lock()
-						allFiles = append(allFiles, files...)
-						filesMu.Unlock()
+				for t := range taskCh {
+					if ctx.Err() != nil {
+						return
 					}
-					return nil
-				}); err != nil {
-					cancel()
+					files, _, err := open115.GetFsListFlat(ctx, rootCID, t.offset, pageSize)
+					if err != nil {
+						errMu.Lock()
+						if fetchErr == nil {
+							fetchErr = err
+						}
+						errMu.Unlock()
+						return
+					}
+					filesMu.Lock()
+					allFiles = append(allFiles, files...)
+					filesMu.Unlock()
 				}
 			}()
 		}
@@ -646,70 +632,63 @@ func (st *strmSyncState) walk115Flat(open115 *cloud115.OpenClient) error {
 			pwg.Add(1)
 			go func() {
 				defer pwg.Done()
-				// 解析目录详情 panic 时中止整个同步（避免带着损坏的相对路径
-				// 继续执行）；正常退出不取消。
-				if err := helper.Recover(st.s.log, "strm.sync.walk115.dirTree", func() error {
-					for pid := range pidCh {
-						if ctx.Err() != nil {
-							return nil
-						}
-						if _, loaded := st.dirCache.Load(pid); loaded {
-							if n := doneDirs.Add(1); n%20 == 0 || n == int64(totalDirs) {
-								st.updateSyncMessage(fmt.Sprintf("正在解析目录树 (%d/%d)...", n, totalDirs))
-							}
-							continue
-						}
-						detail, err := open115.GetFsDetailByCid(ctx, pid)
-						if err != nil {
-							// 目录详情解析失败会导致下游文件 rel 无法还原真实父路径，
-							// seen key 与磁盘路径对不上：增量 prune 会误删本地文件、上传会
-							// 误传本地未变文件、下载会重复下载。这里不是降级容错，而是
-							// 直接中止整个同步——宁可本次同步失败，也不带着损坏的相对路径
-							// 继续执行造成大规模误删/误传/重下（参考用户反馈"云盘没动却重下重传"）。
-							errMu.Lock()
-							if firstErr == nil {
-								firstErr = fmt.Errorf("115: 解析目录树失败（file_id=%s）：%w", pid, err)
-							}
-							errMu.Unlock()
-							st.scanIncomplete.Store(true)
-							cancel()
-							return nil
-						} else if detail != nil {
-							// 解析相对路径
-							relPath := cleanDirRel(detail.RelativePath(rootCID))
-							st.dirCache.Store(pid, relPath)
-							_ = st.s.repo.StrmDirCache.Set(ctx, st.p.ID, pid, relPath)
-
-							// 顺便解析并缓存 detail.Paths 中包含的中间各层级目录
-							for _, ancestor := range detail.Paths {
-								if ancestor.FileId == "0" || ancestor.FileId == rootCID {
-									continue
-								}
-								if _, loaded := st.dirCache.Load(ancestor.FileId); !loaded {
-									subDetail := &cloud115.RemoteFileDetail{
-										FileId:   ancestor.FileId,
-										FileName: ancestor.Name,
-										Paths:    nil,
-									}
-									for _, p := range detail.Paths {
-										subDetail.Paths = append(subDetail.Paths, p)
-										if p.FileId == ancestor.FileId {
-											break
-										}
-									}
-									ancestorRel := cleanDirRel(subDetail.RelativePath(rootCID))
-									st.dirCache.Store(ancestor.FileId, ancestorRel)
-									_ = st.s.repo.StrmDirCache.Set(ctx, st.p.ID, ancestor.FileId, ancestorRel)
-								}
-							}
-						}
-						if n := doneDirs.Add(1); n%10 == 0 || n == int64(totalDirs) {
+				for pid := range pidCh {
+					if ctx.Err() != nil {
+						return
+					}
+					if _, loaded := st.dirCache.Load(pid); loaded {
+						if n := doneDirs.Add(1); n%20 == 0 || n == int64(totalDirs) {
 							st.updateSyncMessage(fmt.Sprintf("正在解析目录树 (%d/%d)...", n, totalDirs))
 						}
+						continue
+					}
+					detail, err := open115.GetFsDetailByCid(ctx, pid)
+					if err != nil {
+						// 目录详情解析失败会导致下游文件 rel 无法还原真实父路径，
+						// seen key 与磁盘路径对不上：增量 prune 会误删本地文件、上传会
+						// 误传本地未变文件、下载会重复下载。这里不是降级容错，而是
+						// 直接中止整个同步——宁可本次同步失败，也不带着损坏的相对路径
+						// 继续执行造成大规模误删/误传/重下（参考用户反馈"云盘没动却重下重传"）。
+						errMu.Lock()
+						if firstErr == nil {
+							firstErr = fmt.Errorf("115: 解析目录树失败（file_id=%s）：%w", pid, err)
+						}
+						errMu.Unlock()
+						st.scanIncomplete.Store(true)
+						cancel()
+						return
+					} else if detail != nil {
+						// 解析相对路径
+						relPath := cleanDirRel(detail.RelativePath(rootCID))
+						st.dirCache.Store(pid, relPath)
+						_ = st.s.repo.StrmDirCache.Set(ctx, st.p.ID, pid, relPath)
+
+						// 顺便解析并缓存 detail.Paths 中包含的中间各层级目录
+						for _, ancestor := range detail.Paths {
+							if ancestor.FileId == "0" || ancestor.FileId == rootCID {
+								continue
+							}
+							if _, loaded := st.dirCache.Load(ancestor.FileId); !loaded {
+								subDetail := &cloud115.RemoteFileDetail{
+									FileId:   ancestor.FileId,
+									FileName: ancestor.Name,
+									Paths:    nil,
+								}
+								for _, p := range detail.Paths {
+									subDetail.Paths = append(subDetail.Paths, p)
+									if p.FileId == ancestor.FileId {
+										break
+									}
+								}
+								ancestorRel := cleanDirRel(subDetail.RelativePath(rootCID))
+								st.dirCache.Store(ancestor.FileId, ancestorRel)
+								_ = st.s.repo.StrmDirCache.Set(ctx, st.p.ID, ancestor.FileId, ancestorRel)
+							}
+						}
+					}
+					if n := doneDirs.Add(1); n%10 == 0 || n == int64(totalDirs) {
+						st.updateSyncMessage(fmt.Sprintf("正在解析目录树 (%d/%d)...", n, totalDirs))
 					}
-					return nil
-				}); err != nil {
-					cancel()
 				}
 			}()
 		}

internal/service/subtitle.go

@@ -23,8 +23,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
-	"sync"
-	"time"
 
 	"go.uber.org/zap"
 
@@ -37,21 +35,6 @@ type SubtitleService struct {
 	log  *zap.Logger
 	repo *repository.Container
 	cfg  *config.Config
-
-	// 目录发现是 Emby 条目列表的热路径（每个媒体源一次 DB 查询 + 最多 5 次
-	// os.ReadDir），而字幕文件极少变化：按 media_id 做短 TTL 缓存。
-	cacheMu   sync.Mutex
-	discovery map[string]subtitleDiscoveryEntry
-}
-
-const (
-	subtitleDiscoveryTTL      = 2 * time.Minute
-	subtitleDiscoveryCacheCap = 4096
-)
-
-type subtitleDiscoveryEntry struct {
-	tracks    []SubtitleTrack
-	expiresAt time.Time
 }
 
 // NewSubtitleService is the constructor.
@@ -90,50 +73,6 @@ func (s *SubtitleService) DiscoverExternalOnly(ctx context.Context, mediaID stri
 }
 
 func (s *SubtitleService) discover(ctx context.Context, mediaID string) ([]SubtitleTrack, error) {
-	if tracks, ok := s.cachedDiscovery(mediaID); ok {
-		return tracks, nil
-	}
-	tracks, err := s.discoverUncached(ctx, mediaID)
-	if err != nil {
-		return nil, err
-	}
-	s.rememberDiscovery(mediaID, tracks)
-	return tracks, nil
-}
-
-func (s *SubtitleService) cachedDiscovery(mediaID string) ([]SubtitleTrack, bool) {
-	now := time.Now()
-	s.cacheMu.Lock()
-	defer s.cacheMu.Unlock()
-	entry, ok := s.discovery[mediaID]
-	if !ok {
-		return nil, false
-	}
-	if now.After(entry.expiresAt) {
-		delete(s.discovery, mediaID)
-		return nil, false
-	}
-	// 返回副本，避免调用方修改缓存内容。
-	return append([]SubtitleTrack(nil), entry.tracks...), true
-}
-
-func (s *SubtitleService) rememberDiscovery(mediaID string, tracks []SubtitleTrack) {
-	now := time.Now()
-	s.cacheMu.Lock()
-	defer s.cacheMu.Unlock()
-	if s.discovery == nil {
-		s.discovery = make(map[string]subtitleDiscoveryEntry)
-	}
-	if len(s.discovery) >= subtitleDiscoveryCacheCap {
-		s.discovery = make(map[string]subtitleDiscoveryEntry)
-	}
-	s.discovery[mediaID] = subtitleDiscoveryEntry{
-		tracks:    append([]SubtitleTrack(nil), tracks...),
-		expiresAt: now.Add(subtitleDiscoveryTTL),
-	}
-}
-
-func (s *SubtitleService) discoverUncached(ctx context.Context, mediaID string) ([]SubtitleTrack, error) {
 	m, err := s.repo.Media.FindByID(ctx, mediaID)
 	if err != nil {
 		return nil, err

internal/service/system_update.go

@@ -11,7 +11,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 )
 
@@ -133,7 +132,7 @@ func (s *SystemUpdateService) Apply(ctx context.Context) (SystemUpdateStatus, er
 	s.last = &status
 	s.mu.Unlock()
 
-	helper.Go(s.log, "system.update", func() { s.runUpdate(context.Background(), status, task) })
+	go s.runUpdate(context.Background(), status, task)
 	return status, nil
 }
 

internal/service/token_svc_pending.go

@@ -7,7 +7,6 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/model"
 	"github.com/truewhile/MeBox/internal/repository"
 )
@@ -27,14 +26,11 @@ func (s *TokenService) storeRefreshTokenBestEffort(userID, tokenHash string, exp
 	go func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
 		defer cancel()
-		err := helper.Recover(s.log, "token.storeRefreshToken", func() error {
-			return s.storeRefreshToken(ctx, &model.RefreshToken{
-				UserID:    userID,
-				TokenHash: tokenHash,
-				ExpiresAt: expiresAt,
-			})
+		done <- s.storeRefreshToken(ctx, &model.RefreshToken{
+			UserID:    userID,
+			TokenHash: tokenHash,
+			ExpiresAt: expiresAt,
 		})
-		done <- err
 	}()
 	select {
 	case err := <-done:

internal/service/transcoder.go

@@ -33,7 +33,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/truewhile/MeBox/internal/config"
-	"github.com/truewhile/MeBox/internal/helper"
 	"github.com/truewhile/MeBox/internal/repository"
 )
 
@@ -144,7 +143,7 @@ func (t *TranscoderService) EnsureJob(ctx context.Context, mediaID string) (stri
 	t.jobs[mediaID] = job
 	t.mu.Unlock()
 
-	helper.Go(t.log, "transcoder.monitorIdle", func() { t.monitorIdle(jobCtx, job) })
-	helper.Go(t.log, "transcoder.ffmpeg", func() { t.runFFmpeg(jobCtx, job, m.Path) })
+	go t.monitorIdle(jobCtx, job)
+	go t.runFFmpeg(jobCtx, job, m.Path)
 	return t.PlaylistPath(mediaID), nil
 }