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.104
+0.0.81

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

@@ -60,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/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

@@ -13,7 +13,6 @@ import (
 
 	"github.com/truewhile/MeBox/internal/middleware"
 	"github.com/truewhile/MeBox/internal/model"
-	"github.com/truewhile/MeBox/internal/repository"
 	"github.com/truewhile/MeBox/internal/service"
 )
 
@@ -59,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 {
@@ -110,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() {
@@ -199,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
 		}
@@ -384,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)
@@ -455,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()})
@@ -514,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})
 	}
 }
@@ -641,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_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/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/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/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/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_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 {
@@ -112,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
@@ -194,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 {

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

internal/service/emby_remote_web_test.go

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

internal/service/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/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_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/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
@@ -125,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,

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

@@ -345,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

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

internal/service/service_builder.go

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

internal/service/strm_queue.go

@@ -610,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/visibility.go

@@ -131,39 +131,20 @@ func DecodeAllowedLibraryIDs(raw string) []string {
 	return out
 }
 
-// LibraryIDAllowed reports whether libraryID is permitted by the allow-list.
-// An empty AllowedLibraryIDs means unrestricted access.
-func LibraryIDAllowed(visibility MediaVisibility, libraryID string) bool {
-	if len(visibility.AllowedLibraryIDs) == 0 {
-		return true
-	}
-	for _, id := range visibility.AllowedLibraryIDs {
-		if id == libraryID {
-			return true
-		}
-	}
-	return false
-}
-
-// EmbyMountLibraryID is the web/Emby library id for a mounted remote view.
-func EmbyMountLibraryID(mount *model.EmbyMount) string {
-	if mount == nil {
-		return ""
-	}
-	return EncodeEmbyRemoteID(mount.ID, mount.RemoteViewID)
-}
-
-// EmbyMountLibraryAllowed reports whether a mounted Emby library is allowed for
-// the given visibility policy.
-func EmbyMountLibraryAllowed(visibility MediaVisibility, mount *model.EmbyMount) bool {
-	return LibraryIDAllowed(visibility, EmbyMountLibraryID(mount))
-}
-
 // LibraryVisibleForUser applies profile library limits and adult-directory
 // hiding to a library card/folder.
 func LibraryVisibleForUser(ctx context.Context, repo *repository.Container, lib model.Library, visibility MediaVisibility) bool {
-	if !LibraryIDAllowed(visibility, lib.ID) {
-		return false
+	if len(visibility.AllowedLibraryIDs) > 0 {
+		found := false
+		for _, id := range visibility.AllowedLibraryIDs {
+			if id == lib.ID {
+				found = true
+				break
+			}
+		}
+		if !found {
+			return false
+		}
 	}
 	if visibility.IncludeNSFW {
 		return true

web/package-lock.json

@@ -19,7 +19,6 @@
         "react-dom": "^18.3.1",
         "react-hot-toast": "^2.6.0",
         "react-router-dom": "^6.23.1",
-        "react-virtuoso": "^4.18.12",
         "zustand": "^4.5.2"
       },
       "devDependencies": {
@@ -3875,16 +3874,6 @@
         "react-dom": ">=16.8"
       }
     },
-    "node_modules/react-virtuoso": {
-      "version": "4.18.12",
-      "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.12.tgz",
-      "integrity": "sha512-6c1SnRicSBfG+WnbhcyJUxzDHvvxD3vsux/EpcfVbgB7clyP1Od2r81TAGTgwbL7U2qP889RR4u+CH6WjgpW0g==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": ">=16 || >=17 || >= 18 || >= 19",
-        "react-dom": ">=16 || >=17 || >= 18 || >=19"
-      }
-    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",

web/package.json

@@ -21,7 +21,6 @@
     "react-dom": "^18.3.1",
     "react-hot-toast": "^2.6.0",
     "react-router-dom": "^6.23.1",
-    "react-virtuoso": "^4.18.12",
     "zustand": "^4.5.2"
   },
   "devDependencies": {

web/src/api/admin.ts

@@ -1,4 +1,4 @@
-import { api, MIGRATION_REQUEST_TIMEOUT } from './client'
+import { api } from './client'
 import type { AccessLog, Setting, User } from '../types'
 
 export interface DatabaseStatus {
@@ -137,12 +137,8 @@ export const adminAPI = {
 	  testDatabaseConnection: (payload: DatabaseConnectionPayload) =>
 	    api.post<PostgresTestResult>('/admin/database/test', payload).then((r) => r.data),
 
-  migrateDatabase: (payload: DatabaseConnectionPayload) =>
-    api
-      .post<DatabaseMigrationResult>('/admin/database/migrate', payload, {
-        timeout: MIGRATION_REQUEST_TIMEOUT,
-      })
-      .then((r) => r.data),
+	  migrateDatabase: (payload: DatabaseConnectionPayload) =>
+	    api.post<DatabaseMigrationResult>('/admin/database/migrate', payload).then((r) => r.data),
 
 	  saveDatabaseConfig: (payload: DatabaseConnectionPayload) =>
 	    api.post<{ message: string; type: string }>('/admin/database/save-config', payload).then((r) => r.data),

web/src/api/client.ts

@@ -12,7 +12,6 @@ export const api = axios.create({
 
 export const LONG_REQUEST_TIMEOUT = 120_000
 export const BATCH_REQUEST_TIMEOUT = 300_000
-export const MIGRATION_REQUEST_TIMEOUT = 600_000
 
 // Flag to prevent multiple simultaneous refresh attempts
 let isRefreshing = false

web/src/api/library.ts

@@ -87,31 +87,17 @@ export interface LibraryWithPreview extends Library {
 }
 
 export const libraryAPI = {
-  list: (options?: { includeHidden?: boolean; withPreview?: boolean; previewLimit?: number; ids?: string[] }) =>
+  list: (options?: { includeHidden?: boolean; withPreview?: boolean; previewLimit?: number }) =>
     api
       .get<LibraryWithPreview[]>('/libraries', {
         params: {
           ...(options?.includeHidden ? { include_hidden: 1 } : {}),
           ...(options?.withPreview ? { with_preview: 1 } : {}),
           ...(options?.previewLimit ? { preview_limit: options.previewLimit } : {}),
-          ...(options?.ids && options.ids.length > 0 ? { ids: options.ids.join(',') } : {}),
         },
       })
       .then((r) => r.data),
 
-  listPreviews: (ids: string[], previewLimit = 10) => {
-    if (ids.length === 0) return Promise.resolve<LibraryWithPreview[]>([])
-    return api
-      .get<LibraryWithPreview[]>('/libraries', {
-        params: {
-          with_preview: 1,
-          preview_limit: previewLimit,
-          ids: ids.join(','),
-        },
-      })
-      .then((r) => r.data)
-  },
-
   get: (id: string, options?: { includeHidden?: boolean }) =>
     api
       .get<Library>(`/libraries/${id}`, {
@@ -239,19 +225,6 @@ export const mediaAPI = {
         { timeout: BATCH_REQUEST_TIMEOUT },
       )
       .then((r) => r.data),
-
-  delete: (id: string, options?: { deleteFiles?: boolean }) =>
-    api
-      .delete(`/media/${id}`, {
-        params: options?.deleteFiles ? { delete_files: true } : undefined,
-      })
-      .then((r) => r.data),
-
-  exportNFO: (id: string) =>
-    api.post<{ path: string }>(`/media/${id}/nfo`).then((r) => r.data),
-
-  exportLibraryNFO: (id: string) =>
-    api.post<{ written: number }>(`/libraries/${id}/nfo`).then((r) => r.data),
 }
 
 function episodeImageOption(options?: ScrapeOptions): boolean | undefined {

web/src/api/profile.ts

@@ -12,12 +12,6 @@ export const profileAPI = {
   }) =>
     api.patch<User>('/me', patch).then((r) => r.data),
 
-  getPinnedLibraries: () =>
-    api.get<{ library_ids: string[] }>('/me/pinned-libraries').then((r) => r.data.library_ids ?? []),
-
-  setPinnedLibraries: (libraryIds: string[]) =>
-    api.put<{ library_ids: string[] }>('/me/pinned-libraries', { library_ids: libraryIds }).then((r) => r.data.library_ids ?? []),
-
   adminUpdateRole: (id: string, role: 'admin' | 'user') =>
     api.patch<User>(`/admin/users/${id}/role`, { role }).then((r) => r.data),
 }

web/src/api/recycle.ts

@@ -0,0 +1,15 @@
+import { api } from './client'
+
+export const recycleAPI = {
+  softDelete: (id: string) => api.delete(`/media/${id}`).then((r) => r.data),
+
+  restore: (id: string) => api.post(`/media/${id}/restore`).then((r) => r.data),
+
+  purge: (id: string) => api.delete(`/media/${id}/purge`).then((r) => r.data),
+
+  exportNFO: (id: string) =>
+    api.post<{ path: string }>(`/media/${id}/nfo`).then((r) => r.data),
+
+  exportLibraryNFO: (id: string) =>
+    api.post<{ written: number }>(`/libraries/${id}/nfo`).then((r) => r.data),
+}

web/src/api/scraper.ts

@@ -39,9 +39,6 @@ export const scraperAPI = {
   clearCanceled: () =>
     api.post<{ deleted: number }>('/admin/scraper/queue/clear-canceled').then((r) => r.data),
 
-  clearFailed: () =>
-    api.post<{ deleted: number }>('/admin/scraper/queue/clear-failed').then((r) => r.data),
-
   retryFailed: () =>
     api.post<{ retried: number }>('/admin/scraper/queue/retry-failed').then((r) => r.data),
 

web/src/api/strm.ts

@@ -159,9 +159,6 @@ export const strmAPI = {
   clearCanceledDownloads: () =>
     api.post<{ deleted: number }>('/admin/strm/downloads/clear-canceled').then((r) => r.data),
 
-  clearFailedDownloads: () =>
-    api.post<{ deleted: number }>('/admin/strm/downloads/clear-failed').then((r) => r.data),
-
   retryFailedDownloads: () =>
     api.post<{ retried: number }>('/admin/strm/downloads/retry-failed').then((r) => r.data),
 
@@ -199,9 +196,6 @@ export const strmAPI = {
   clearCanceledUploads: () =>
     api.post<{ deleted: number }>('/admin/strm/uploads/clear-canceled').then((r) => r.data),
 
-  clearFailedUploads: () =>
-    api.post<{ deleted: number }>('/admin/strm/uploads/clear-failed').then((r) => r.data),
-
   retryFailedUploads: () =>
     api.post<{ retried: number }>('/admin/strm/uploads/retry-failed').then((r) => r.data),
 }

web/src/components/AdminUserLibrariesDialog.tsx

@@ -278,19 +278,12 @@ export function AdminUserLibrariesDialog({
                           <div className="min-w-0 flex-1">
                             <p className="truncate text-xs font-semibold text-ink-600">
                               {lib.name}
-                              {lib.is_remote_emby ? (
-                                <span className="ml-1.5 rounded bg-sky-50 px-1.5 py-0.5 text-[10px] font-bold text-sky-700">
-                                  Emby 挂载
-                                </span>
-                              ) : null}
                             </p>
                             <p
                               className="truncate text-[10px] text-sand-500"
-                              title={lib.is_remote_emby ? lib.remote_source || lib.name : lib.path}
+                              title={lib.path}
                             >
-                              {lib.is_remote_emby
-                                ? `远程 · ${lib.remote_source || 'Emby'}`
-                                : `${lib.type} · ${libraryDisplayPath(lib.path)}`}
+                              {lib.type} · {libraryDisplayPath(lib.path)}
                             </p>
                           </div>
                         </div>

web/src/components/ConfirmDialog.tsx

@@ -1,4 +1,3 @@
-import { useState } from 'react'
 import { AlertTriangle } from 'lucide-react'
 
 export type ConfirmOptions = {
@@ -7,13 +6,6 @@ export type ConfirmOptions = {
   confirmText?: string
   cancelText?: string
   danger?: boolean
-  checkboxLabel?: string
-  checkboxDefaultChecked?: boolean
-}
-
-export type ConfirmResult = {
-  confirmed: boolean
-  checked: boolean
 }
 
 export function ConfirmDialog({
@@ -21,15 +13,13 @@ export function ConfirmDialog({
   onClose,
 }: {
   options: ConfirmOptions
-  onClose: (value: ConfirmResult) => void
+  onClose: (value: boolean) => void
 }) {
   const danger = options.danger ?? true
-  const hasCheckbox = Boolean(options.checkboxLabel)
-  const [checked, setChecked] = useState(Boolean(options.checkboxDefaultChecked))
   return (
     <div
       className="fixed inset-0 z-[100] flex items-center justify-center bg-black/35 p-4 backdrop-blur-sm"
-      onClick={() => onClose({ confirmed: false, checked })}
+      onClick={() => onClose(false)}
     >
       <div
         role="dialog"
@@ -50,31 +40,20 @@ export function ConfirmDialog({
             <h3 className="font-display text-lg font-bold text-ink-600">
               {options.title || '确认操作'}
             </h3>
-            <p className="mt-2 whitespace-pre-line text-sm leading-6 text-ink-50">{options.message}</p>
-            {hasCheckbox ? (
-              <label className="mt-4 flex cursor-pointer items-start gap-2.5 text-sm text-ink-100">
-                <input
-                  type="checkbox"
-                  className="mt-0.5 h-4 w-4 rounded border-gray-300 text-red-500 focus:ring-red-400"
-                  checked={checked}
-                  onChange={(event) => setChecked(event.target.checked)}
-                />
-                <span>{options.checkboxLabel}</span>
-              </label>
-            ) : null}
+            <p className="mt-2 text-sm leading-6 text-ink-50">{options.message}</p>
           </div>
         </div>
         <div className="flex justify-end gap-2 border-t border-gray-100 bg-gray-50/80 px-5 py-4">
           <button
             type="button"
-            onClick={() => onClose({ confirmed: false, checked })}
+            onClick={() => onClose(false)}
             className="rounded-xl border border-gray-200 bg-white px-4 py-2 text-sm font-semibold text-ink-100 hover:bg-gray-50"
           >
             {options.cancelText || '取消'}
           </button>
           <button
             type="button"
-            onClick={() => onClose({ confirmed: true, checked })}
+            onClick={() => onClose(true)}
             className={
               'rounded-xl px-4 py-2 text-sm font-semibold text-white shadow-sm transition ' +
               (danger ? 'bg-red-500 hover:bg-red-600' : 'bg-brand-500 hover:bg-brand-600')

web/src/components/GlobalEvents.tsx

@@ -26,7 +26,7 @@ export function GlobalEvents() {
         return
       }
       if (p.queued) {
-        toast.loading(String(p.message ?? '媒体库扫描已加入后台队列，会自动入库'), { id })
+        toast.loading(String(p.message ?? '云盘扫描已加入后台队列，会自动入库'), { id })
         return
       }
       if (p.cloud && p.stage) {

web/src/components/LayoutHeaderSections.tsx

@@ -6,7 +6,6 @@ import { ArrowLeft, Film, LoaderCircle, Menu, Search, Star, X } from 'lucide-rea
 import { imageURL } from '../api/client'
 import { mediaAPI } from '../api/library'
 import type { Media, PlayProfile, User } from '../types'
-import { favouriteMediaLink } from '../utils/mediaNavigation'
 import { resolveHeaderBack } from './layoutNavigation'
 import { LayoutThemeToggle } from './LayoutThemeToggle'
 import { LayoutUserMenu } from './LayoutUserMenu'
@@ -150,17 +149,17 @@ function LayoutHeaderSearch() {
     return () => document.removeEventListener('mousedown', handleClickOutside)
   }, [])
 
-  const handleSelect = (item: Media) => {
+  const handleSelect = (mediaId: string) => {
     setIsOpen(false)
     setQuery('')
-    navigate(favouriteMediaLink(item))
+    navigate(`/media/${mediaId}`)
   }
 
   const handleKeyDown = (e: React.KeyboardEvent) => {
     if (e.key === 'Escape') {
       setIsOpen(false)
     } else if (e.key === 'Enter' && results.length > 0) {
-      handleSelect(results[0])
+      handleSelect(results[0].id)
     }
   }
 
@@ -221,7 +220,7 @@ function LayoutHeaderSearch() {
                 {results.map((item) => (
                   <button
                     key={item.id}
-                    onClick={() => handleSelect(item)}
+                    onClick={() => handleSelect(item.id)}
                     className="flex w-full items-center gap-3 rounded-xl p-2 text-left transition-colors hover:bg-[var(--app-hover)] group"
                   >
                     <div className="relative h-12 w-9 shrink-0 overflow-hidden rounded-lg bg-[var(--app-panel-soft)]">
@@ -240,16 +239,9 @@ function LayoutHeaderSearch() {
                     </div>
 
                     <div className="min-w-0 flex-1">
-                      <div className="flex items-center gap-1.5">
-                        <p className="truncate text-xs font-bold text-[var(--app-text)] group-hover:text-brand-500">
-                          {item.title}
-                        </p>
-                        {(item.display_library_name || item.library_name) && (
-                          <span className="shrink-0 text-[9px] px-1.5 py-0.5 rounded bg-[var(--app-panel-elevated)] border border-[var(--app-border)] text-[var(--app-muted)] max-w-[130px] truncate">
-                            {item.display_library_name || item.library_name}
-                          </span>
-                        )}
-                      </div>
+                      <p className="truncate text-xs font-bold text-[var(--app-text)] group-hover:text-brand-500">
+                        {item.title}
+                      </p>
                       <div className="flex items-center gap-2 text-[10px] text-[var(--app-muted)] mt-0.5">
                         {item.year > 0 && <span>{item.year}</span>}
                         {item.rating > 0 && (

web/src/components/LayoutSections.tsx

@@ -137,7 +137,7 @@ export function LayoutWorkspace({ routeKey, showMobileBottomNav = false }: Layou
   }
 
   return (
-    <main id="app-main-scroll" className={clsx('flex-1 overflow-y-auto px-4 py-6 md:px-8 md:py-10', bottomPad)}>
+    <main className={clsx('flex-1 overflow-y-auto px-4 py-6 md:px-8 md:py-10', bottomPad)}>
       <div className="max-w-7xl mx-auto">
         <AnimatePresence mode="wait">
           <motion.div

web/src/components/VirtualMediaGrid.tsx

@@ -1,67 +0,0 @@
-import { forwardRef, useEffect, useState, type CSSProperties, type ReactNode } from 'react'
-import { VirtuosoGrid } from 'react-virtuoso'
-
-// 与 LibraryMediaSections 等处的海报网格保持同一套响应式列配置。
-export const MEDIA_GRID_CLASS =
-  'grid grid-cols-3 gap-4 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 2xl:grid-cols-8'
-
-// 首帧滚动容器尚未就绪时的占位渲染数量（约一屏）。
-const FIRST_PAINT_COUNT = 28
-
-const GridList = forwardRef<HTMLDivElement, { style?: CSSProperties; children?: ReactNode }>(
-  function GridList({ children, style, ...rest }, ref) {
-    return (
-      <div ref={ref} style={style} {...rest} className={MEDIA_GRID_CLASS}>
-        {children}
-      </div>
-    )
-  },
-)
-
-const GridItem = forwardRef<HTMLDivElement, { style?: CSSProperties; children?: ReactNode }>(
-  function GridItem({ children, style, ...rest }, ref) {
-    return (
-      <div ref={ref} style={style} {...rest}>
-        {children}
-      </div>
-    )
-  },
-)
-
-// VirtualMediaGrid 大库性能优化：无论库里有 1 千还是 5 万张卡片，
-// 实际挂载的只有视口内及邻近一屏的节点。滚动容器是 Layout 的
-// <main id="app-main-scroll">（非 window 滚动），通过 customScrollParent 接入；
-// 元素尚未挂载时先渲染一屏卡片，挂载后切换为虚拟列表。
-export function VirtualMediaGrid({
-  totalCount,
-  renderItem,
-}: {
-  totalCount: number
-  renderItem: (index: number) => ReactNode
-}) {
-  const [scrollParent, setScrollParent] = useState<HTMLElement | null>(null)
-
-  useEffect(() => {
-    setScrollParent(document.getElementById('app-main-scroll'))
-  }, [])
-
-  if (!scrollParent) {
-    return (
-      <div className={MEDIA_GRID_CLASS}>
-        {Array.from({ length: Math.min(totalCount, FIRST_PAINT_COUNT) }, (_, index) => (
-          <div key={index}>{renderItem(index)}</div>
-        ))}
-      </div>
-    )
-  }
-
-  return (
-    <VirtuosoGrid
-      customScrollParent={scrollParent}
-      totalCount={totalCount}
-      overscan={800}
-      components={{ List: GridList, Item: GridItem }}
-      itemContent={renderItem}
-    />
-  )
-}

web/src/components/confirmAction.tsx

@@ -1,17 +1,13 @@
 import { createRoot } from 'react-dom/client'
 
-import { ConfirmDialog, type ConfirmOptions, type ConfirmResult } from './ConfirmDialog'
+import { ConfirmDialog, type ConfirmOptions } from './ConfirmDialog'
 
 export function confirmAction(options: ConfirmOptions): Promise<boolean> {
-  return confirmActionResult(options).then((result) => result.confirmed)
-}
-
-export function confirmActionResult(options: ConfirmOptions): Promise<ConfirmResult> {
   return new Promise((resolve) => {
     const host = document.createElement('div')
     document.body.appendChild(host)
     const root = createRoot(host)
-    const close = (value: ConfirmResult) => {
+    const close = (value: boolean) => {
       root.unmount()
       host.remove()
       resolve(value)

web/src/components/layoutNavigation.ts

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

web/src/hooks/usePinnedLibraries.ts

@@ -1,75 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
-
-import {
-  loadPinnedLibraryIds,
-  savePinnedLibraryIds,
-  togglePinnedLibraryId,
-} from '../utils/pinnedLibraries'
-
-export function usePinnedLibraries() {
-  const [pinnedIds, setPinnedIds] = useState<string[]>([])
-  const [loading, setLoading] = useState(true)
-  const [syncing, setSyncing] = useState(false)
-  const [loadError, setLoadError] = useState(false)
-  const loadedRef = useRef(false)
-  const pinnedIdsRef = useRef<string[]>([])
-  const syncingRef = useRef(false)
-
-  useEffect(() => {
-    pinnedIdsRef.current = pinnedIds
-  }, [pinnedIds])
-
-  useEffect(() => {
-    let cancelled = false
-    setLoading(true)
-    setLoadError(false)
-    loadedRef.current = false
-    loadPinnedLibraryIds()
-      .then((ids) => {
-        if (cancelled) return
-        loadedRef.current = true
-        pinnedIdsRef.current = ids
-        setPinnedIds(ids)
-        setLoadError(false)
-      })
-      .catch(() => {
-        if (cancelled) return
-        loadedRef.current = false
-        setLoadError(true)
-      })
-      .finally(() => {
-        if (!cancelled) setLoading(false)
-      })
-    return () => {
-      cancelled = true
-    }
-  }, [])
-
-  const togglePin = useCallback(async (libraryId: string) => {
-    if (!loadedRef.current || loading || loadError || syncingRef.current) return
-
-    // Compute the next list synchronously from a ref. Do NOT capture the next
-    // value inside setState updater callbacks — React may defer those, leaving
-    // optimistic as [] and wiping the server-side pin list.
-    const previous = pinnedIdsRef.current
-    const optimistic = togglePinnedLibraryId(previous, libraryId)
-
-    pinnedIdsRef.current = optimistic
-    setPinnedIds(optimistic)
-    syncingRef.current = true
-    setSyncing(true)
-    try {
-      const saved = await savePinnedLibraryIds(optimistic)
-      pinnedIdsRef.current = saved
-      setPinnedIds(saved)
-    } catch {
-      pinnedIdsRef.current = previous
-      setPinnedIds(previous)
-    } finally {
-      syncingRef.current = false
-      setSyncing(false)
-    }
-  }, [loading, loadError])
-
-  return { pinnedIds, loading, syncing, loadError, togglePin }
-}

web/src/pages/AboutSettingsPanel.tsx

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

web/src/pages/FavouritesPage.tsx

@@ -4,6 +4,7 @@ import toast from 'react-hot-toast'
 import { playbackAPI } from '../api/playback'
 import { MediaCard } from '../components/MediaCard'
 import type { Media } from '../types'
+import { favouriteMediaLink } from '../utils/mediaNavigation'
 
 export function FavouritesPage() {
   const [items, setItems] = useState<Media[]>([])
@@ -74,7 +75,7 @@ export function FavouritesPage() {
       {items.length > 0 && (
         <div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-6">
           {items.map((m) => (
-            <MediaCard key={m.id} media={m} />
+            <MediaCard key={m.id} media={m} linkTo={favouriteMediaLink(m)} />
           ))}
         </div>
       )}

web/src/pages/HomePage.tsx

@@ -1,15 +1,12 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 
-import { libraryAPI } from '../api/library'
+import { libraryAPI, type LibraryWithPreview } from '../api/library'
 import { historyAPI } from '../api/history'
 import type { HistoryItem } from '../api/playback'
 import type { Library, Media } from '../types'
 import type { SeriesCard } from '../utils/groupSeries'
-import { usePinnedLibraries } from '../hooks/usePinnedLibraries'
-import { sortByPinnedIds } from '../utils/pinnedLibraries'
 import {
   ContinueWatchingSection,
-  ContinueWatchingSkeleton,
   HomeCarouselSection,
   HomeEmptyState,
   HomeLibrariesSection,
@@ -24,176 +21,58 @@ export function HomePage() {
   const [libraries, setLibraries] = useState<Library[]>([])
   const [libraryData, setLibraryData] = useState<Record<string, { cards: SeriesCard[]; items: Media[]; total: number }>>({})
   const [history, setHistory] = useState<HistoryItem[]>([])
-  // 两个请求独立渐进加载：库列表控制整页首屏，播放记录区块自行渲染，
-  // 避免整页被 Promise.all 里最慢的那个请求拖住。
-  const [librariesLoading, setLibrariesLoading] = useState(true)
-  const [historyLoading, setHistoryLoading] = useState(true)
-  const { pinnedIds } = usePinnedLibraries()
+  const [loading, setLoading] = useState(true)
 
-  // 1. 媒体库元数据极速加载（不带 preview，毫秒级秒开首屏）
   useEffect(() => {
     let cancelled = false
 
-    libraryAPI
-      .list()
-      .then((rows) => asArray<Library>(rows))
-      .catch(() => [] as Library[])
-      .then((libs) => {
+    async function load() {
+      setLoading(true)
+      try {
+        const [libs, hist] = await Promise.all([
+          libraryAPI
+            .list({ withPreview: true, previewLimit: 20 })
+            .then((rows) => asArray<LibraryWithPreview>(rows))
+            .catch(() => [] as LibraryWithPreview[]),
+          historyAPI
+            .continueWatching(12)
+            .then((rows) =>
+              rows.map(
+                (row): HistoryItem => ({
+                  ...row.history,
+                  created_at: '',
+                  updated_at: '',
+                  media: row.media,
+                }),
+              ),
+            )
+            .catch(() => [] as HistoryItem[]),
+        ])
+
         if (cancelled) return
         setLibraries(libs)
-        setLibrariesLoading(false)
-      })
+        setHistory(hist.filter((h) => h && !h.completed))
 
-    return () => {
-      cancelled = true
-    }
-  }, [])
-
-  // 2. 继续观看记录独立渐进加载
-  useEffect(() => {
-    let cancelled = false
-
-    historyAPI
-      .continueWatching(12)
-      .then((rows) =>
-        rows.map(
-          (row): HistoryItem => ({
-            ...row.history,
-            created_at: '',
-            updated_at: '',
-            media: row.media,
-          }),
-        ),
-      )
-      .catch(() => [] as HistoryItem[])
-      .then((rows) => {
-        if (cancelled) return
-        setHistory(rows.filter((h) => h && !h.completed))
-        setHistoryLoading(false)
-      })
-
-    return () => {
-      cancelled = true
-    }
-  }, [])
-
-  const sortedLibraries = useMemo(() => sortByPinnedIds(libraries, pinnedIds), [libraries, pinnedIds])
-
-  // 按需拉取卡片预览管理
-  const fetchedLibIdsRef = useRef<Set<string>>(new Set())
-  const fetchingRef = useRef<Set<string>>(new Set())
-
-  const fetchPreviews = useCallback(async (ids: string[]) => {
-    const targets = ids.filter((id) => !fetchedLibIdsRef.current.has(id) && !fetchingRef.current.has(id))
-    if (targets.length === 0) return
-    targets.forEach((id) => fetchingRef.current.add(id))
-
-    try {
-      const rows = await libraryAPI.listPreviews(targets, 10)
-      setLibraryData((prev) => {
-        const next = { ...prev }
-        for (const row of rows) {
-          next[row.id] = {
-            cards: row.cards ?? [],
+        const mapData: Record<string, { cards: SeriesCard[]; items: Media[]; total: number }> = {}
+        for (const lib of libs) {
+          mapData[lib.id] = {
+            cards: lib.cards ?? [],
             items: [],
-            total: row.total ?? 0,
+            total: lib.total ?? 0,
           }
         }
-        return next
-      })
-    } catch {
-      // 容错
-    } finally {
-      targets.forEach((id) => {
-        fetchedLibIdsRef.current.add(id)
-        fetchingRef.current.delete(id)
-      })
+        setLibraryData(mapData)
+      } finally {
+        if (!cancelled) setLoading(false)
+      }
+    }
+
+    load()
+    return () => {
+      cancelled = true
     }
   }, [])
 
-  // 3. 首屏优先加载：轮播图库 + 媒体库卡片区前 20 个库 + 首屏前 3 个内容行
-  useEffect(() => {
-    if (sortedLibraries.length === 0) return
-    const carouselLibIds = sortedLibraries
-      .filter((l) => l.carousel_enabled === true)
-      .map((l) => l.id)
-    const topGridLibIds = sortedLibraries.slice(0, 20).map((l) => l.id)
-    const topRowLibIds = sortedLibraries.slice(0, 3).map((l) => l.id)
-    const initialTargets = Array.from(new Set([...carouselLibIds, ...topGridLibIds, ...topRowLibIds]))
-    void fetchPreviews(initialTargets)
-  }, [sortedLibraries, fetchPreviews])
-
-  // 4. 媒体库展示行渐进流式加载：默认先检视前 3 个库，随向下滚动逐步检视后续库
-  const INITIAL_ROWS = 3
-  const STEP_ROWS = 2
-  const [visibleTargetCount, setVisibleTargetCount] = useState(INITIAL_ROWS)
-  const sentinelRef = useRef<HTMLDivElement | null>(null)
-
-  // 随 visibleTargetCount 增加，按需触发后续库的预览加载
-  useEffect(() => {
-    if (sortedLibraries.length === 0) return
-    const currentTargets = sortedLibraries.slice(0, visibleTargetCount).map((l) => l.id)
-    void fetchPreviews(currentTargets)
-  }, [sortedLibraries, visibleTargetCount, fetchPreviews])
-
-  // 当前已拉取并确认有内容的媒体库行
-  const visibleLibraries = useMemo(() => {
-    return sortedLibraries
-      .slice(0, visibleTargetCount)
-      .filter((lib) => (libraryData[lib.id]?.cards?.length ?? 0) > 0)
-  }, [sortedLibraries, visibleTargetCount, libraryData])
-
-  const hasMoreLibraries = visibleTargetCount < sortedLibraries.length
-
-  // 底部哨兵监听与滚动双保险（触底解锁后续媒体库行）
-  useEffect(() => {
-    const scrollParent = document.getElementById('app-main-scroll')
-    if (!scrollParent) return
-
-    const handleCheckBottom = () => {
-      const remaining = scrollParent.scrollHeight - scrollParent.scrollTop - scrollParent.clientHeight
-      if (remaining < 600) {
-        setVisibleTargetCount((prev) => {
-          if (prev >= sortedLibraries.length) return prev
-          return Math.min(prev + STEP_ROWS, sortedLibraries.length)
-        })
-      }
-    }
-
-    scrollParent.addEventListener('scroll', handleCheckBottom, { passive: true })
-
-    const sentinel = sentinelRef.current
-    let observer: IntersectionObserver | null = null
-    if (sentinel) {
-      observer = new IntersectionObserver(
-        (entries) => {
-          const [entry] = entries
-          if (entry?.isIntersecting) {
-            setVisibleTargetCount((prev) => {
-              if (prev >= sortedLibraries.length) return prev
-              return Math.min(prev + STEP_ROWS, sortedLibraries.length)
-            })
-          }
-        },
-        {
-          root: scrollParent,
-          rootMargin: '600px 0px',
-          threshold: 0,
-        },
-      )
-      observer.observe(sentinel)
-    }
-
-    handleCheckBottom()
-
-    return () => {
-      scrollParent.removeEventListener('scroll', handleCheckBottom)
-      if (observer) {
-        observer.disconnect()
-      }
-    }
-  }, [visibleLibraries.length, hasMoreLibraries, sortedLibraries.length])
-
   // Quick lookup map for libraries
   const libraryMap = useMemo(() => {
     const map = new Map<string, Library>()
@@ -247,16 +126,15 @@ export function HomePage() {
     return candidateMedia.slice(0, 10)
   }, [libraries, libraryData])
 
-  // 库列表还没回来先展示整页 loading；库为空时再等一下播放记录，
-  // 以免在"空站点"和"有观看记录"两个终态之间闪空白。
-  if (librariesLoading || (libraries.length === 0 && historyLoading)) {
-    return <HomeLoadingState />
-  }
-
   const empty =
+    !loading &&
     libraries.length === 0 &&
     history.length === 0
 
+  if (loading) {
+    return <HomeLoadingState />
+  }
+
   if (empty) {
     return <HomeEmptyState />
   }
@@ -268,43 +146,32 @@ export function HomePage() {
         <HomeCarouselSection items={carouselItems} libraryMap={libraryMap} />
       )}
 
-      {/* 2. 继续观看（独立加载，未回来前展示同构骨架） */}
-      {historyLoading && <ContinueWatchingSkeleton />}
-      {!historyLoading && history.length > 0 && <ContinueWatchingSection history={history} />}
+      {/* 2. 继续观看（若有历史） */}
+      {history.length > 0 && <ContinueWatchingSection history={history} />}
 
-      {/* 3. 媒体库卡片区（每页展示 20 个媒体库） */}
-      {sortedLibraries.length > 0 && (
+      {/* 3. 媒体库卡片区 */}
+      {libraries.length > 0 && (
         <HomeLibrariesSection
-          libraries={sortedLibraries}
+          libraries={libraries}
           libraryData={libraryData}
           libraryCounts={libraryCounts}
-          onNeedPreviews={fetchPreviews}
         />
       )}
 
-      {/* 4. 各媒体库内容展示行（向下滑动渐进流式加载，不受上方20个分页限制） */}
-      {visibleLibraries.length > 0 && (
-        <div className="space-y-10">
-          {visibleLibraries.map((lib) => {
-            const cards = libraryData[lib.id]?.cards || []
-            return (
-              <HomeLibraryRowSection
-                key={lib.id}
-                library={lib}
-                cards={cards}
-              />
-            )
-          })}
-          {hasMoreLibraries && (
-            <div ref={sentinelRef} className="flex h-10 w-full items-center justify-center py-2 opacity-60">
-              <div className="flex items-center gap-2 text-xs text-[var(--app-muted)]">
-                <div className="h-1.5 w-1.5 animate-ping rounded-full bg-brand-500" />
-                <span>加载更多媒体库…</span>
-              </div>
-            </div>
-          )}
-        </div>
-      )}
+      {/* 4. 各媒体库内容展示行 */}
+      <div className="space-y-10">
+        {libraries.map((lib) => {
+          const cards = libraryData[lib.id]?.cards || []
+          if (cards.length === 0) return null
+          return (
+            <HomeLibraryRowSection
+              key={lib.id}
+              library={lib}
+              cards={cards}
+            />
+          )
+        })}
+      </div>
     </div>
   )
 }

web/src/pages/HomePageSections.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
+import { useEffect, useRef, useState, type ReactNode } from 'react'
 import { Link } from 'react-router-dom'
 import { AnimatePresence, motion } from 'framer-motion'
 import {
@@ -87,41 +87,6 @@ export function HomeEmptyState() {
   )
 }
 
-// ContinueWatchingSkeleton 与 ContinueWatchingSection 同构的占位块：
-// 播放记录请求独立渐进加载时，避免区块突然弹入造成的布局跳动。
-export function ContinueWatchingSkeleton() {
-  return (
-    <section className="space-y-4">
-      <div className="flex items-center justify-between border-b border-[var(--app-border)] pb-3">
-        <div className="flex items-center gap-2.5">
-          <span className="rounded-xl border border-[var(--app-border)] bg-[var(--app-panel-soft)] p-1.5 text-[var(--app-text)]">
-            <Clock size={18} />
-          </span>
-          <div className="space-y-1.5">
-            <div className="h-5 w-24 animate-pulse rounded bg-[var(--app-panel-soft)]" />
-            <div className="h-3 w-16 animate-pulse rounded bg-[var(--app-panel-soft)]" />
-          </div>
-        </div>
-      </div>
-
-      <div className="flex gap-4 overflow-hidden pb-3 pt-1">
-        {[0, 1, 2, 3, 4, 5].map((i) => (
-          <div key={i} className="w-64 sm:w-72 shrink-0">
-            <div className="flex items-center gap-3.5 rounded-2xl border border-[var(--app-border)] bg-[var(--app-panel)] p-3 shadow-sm">
-              <div className="h-20 w-14 shrink-0 animate-pulse rounded-xl bg-[var(--app-panel-soft)]" />
-              <div className="min-w-0 flex-1 space-y-2">
-                <div className="h-3 w-3/4 animate-pulse rounded bg-[var(--app-panel-soft)]" />
-                <div className="h-2.5 w-1/2 animate-pulse rounded bg-[var(--app-panel-soft)]" />
-                <div className="h-1.5 w-full animate-pulse rounded-full bg-[var(--app-panel-soft)]" />
-              </div>
-            </div>
-          </div>
-        ))}
-      </div>
-    </section>
-  )
-}
-
 /* =========================================================================
    1. 海报轮播区 (Hero Carousel Section)
    ========================================================================= */
@@ -366,28 +331,11 @@ export function HomeLibrariesSection({
   libraries,
   libraryData,
   libraryCounts,
-  onNeedPreviews,
 }: {
   libraries: Library[]
   libraryData?: Record<string, { cards: SeriesCard[]; items: Media[]; total: number }>
   libraryCounts: Record<string, number>
-  onNeedPreviews?: (ids: string[]) => void
 }) {
-  const PAGE_SIZE = 20
-  const [currentPage, setCurrentPage] = useState(1)
-  const totalPages = Math.max(1, Math.ceil(libraries.length / PAGE_SIZE))
-  const effectivePage = Math.min(currentPage, totalPages)
-
-  const pagedLibraries = useMemo<Library[]>(() => {
-    const start = (effectivePage - 1) * PAGE_SIZE
-    return libraries.slice(start, start + PAGE_SIZE)
-  }, [libraries, effectivePage])
-
-  useEffect(() => {
-    const ids = pagedLibraries.map((l) => l.id)
-    onNeedPreviews?.(ids)
-  }, [pagedLibraries, onNeedPreviews])
-
   return (
     <section className="space-y-4">
       <div className="flex flex-wrap items-center justify-between gap-3 border-b border-[var(--app-border)] pb-3">
@@ -396,62 +344,27 @@ export function HomeLibrariesSection({
             <LibraryIcon size={18} />
           </span>
           <div>
-            <div className="flex items-center gap-2">
-              <h2 className="font-display text-xl font-extrabold tracking-tight text-[var(--app-text)]">
-                媒体库
-              </h2>
-              {libraries.length > PAGE_SIZE && (
-                <span className="rounded-md border border-[var(--app-border)] bg-[var(--app-panel-soft)] px-1.5 py-0.5 text-[11px] font-semibold text-[var(--app-muted)]">
-                  共 {libraries.length} 个 · 每页 {PAGE_SIZE} 个
-                </span>
-              )}
-            </div>
+            <h2 className="font-display text-xl font-extrabold tracking-tight text-[var(--app-text)]">
+              媒体库
+            </h2>
             <p className="text-xs text-[var(--app-muted)]">
               点击卡片浏览对应媒体库精选内容
             </p>
           </div>
         </div>
 
-        <div className="flex items-center gap-3">
-          {totalPages > 1 && (
-            <div className="flex items-center gap-2 rounded-xl border border-[var(--app-border)] bg-[var(--app-panel-soft)] px-2 py-1 text-xs">
-              <button
-                type="button"
-                onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
-                disabled={effectivePage <= 1}
-                className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
-                title="上一页"
-              >
-                <ChevronLeft size={14} />
-              </button>
-              <span className="font-mono text-xs font-semibold text-[var(--app-subtle)]">
-                {effectivePage} / {totalPages}
-              </span>
-              <button
-                type="button"
-                onClick={() => setCurrentPage((p) => Math.min(totalPages, p + 1))}
-                disabled={effectivePage >= totalPages}
-                className="rounded-lg p-1 text-[var(--app-muted)] hover:bg-[var(--app-hover)] hover:text-[var(--app-text)] disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-[var(--app-muted)] transition-colors"
-                title="下一页"
-              >
-                <ChevronRight size={14} />
-              </button>
-            </div>
-          )}
-
-          <Link
-            to="/libraries"
-            className="group inline-flex items-center gap-1 text-xs font-bold text-[var(--app-subtle)] transition-colors hover:text-brand-500"
-          >
-            <span>全部媒体库</span>
-            <ArrowRight size={14} className="transition-transform group-hover:translate-x-0.5" />
-          </Link>
-        </div>
+        <Link
+          to="/libraries"
+          className="group inline-flex items-center gap-1 text-xs font-bold text-[var(--app-subtle)] transition-colors hover:text-brand-500"
+        >
+          <span>全部媒体库</span>
+          <ArrowRight size={14} className="transition-transform group-hover:translate-x-0.5" />
+        </Link>
       </div>
 
       {/* Libraries Grid */}
-      <div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-5 xl:grid-cols-5 2xl:grid-cols-6">
-        {pagedLibraries.map((lib) => {
+      <div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-6">
+        {libraries.map((lib) => {
           const count = libraryCounts[lib.id] ?? 0
           const cards = libraryData?.[lib.id]?.cards || []
           const artwork = getLibraryArtworks(lib, cards)
@@ -461,7 +374,6 @@ export function HomeLibrariesSection({
               key={lib.id}
               to={`/library/${lib.id}`}
               className="group relative flex flex-col justify-between overflow-hidden rounded-2xl border border-[var(--app-border)] bg-[var(--app-panel)] p-3 transition-all duration-300 hover:-translate-y-1 hover:border-brand-500/50 hover:bg-[var(--app-hover)]/40 hover:shadow-lg hover:shadow-brand-500/10"
-              title={lib.name}
             >
               {/* 封面图片展示区：和媒体库页面一样，显示设置好的或生成的图片 */}
               <div
@@ -497,10 +409,7 @@ export function HomeLibrariesSection({
 
               {/* 媒体库信息 */}
               <div className="mt-3 flex flex-col justify-between">
-                <h3
-                  className="line-clamp-2 break-words font-display text-sm font-bold text-[var(--app-text)] group-hover:text-brand-500"
-                  title={lib.name}
-                >
+                <h3 className="truncate font-display text-sm font-bold text-[var(--app-text)] group-hover:text-brand-500">
                   {lib.name}
                 </h3>
                 <p className="mt-0.5 text-xs text-[var(--app-muted)]">
@@ -546,7 +455,7 @@ export function HomeLibraryRowSection({
             {TYPE_ICONS[library.type] || <FolderOpen size={18} />}
           </span>
           <div>
-            <h2 className="font-display text-xl font-extrabold tracking-tight text-[var(--app-text)]" title={library.name}>
+            <h2 className="font-display text-xl font-extrabold tracking-tight text-[var(--app-text)]">
               {library.name}
             </h2>
             <span className="text-xs text-[var(--app-muted)]">

web/src/pages/LibrariesPage.tsx

@@ -1,70 +1,40 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { libraryAPI } from '../api/library'
 import { toolsAPI } from '../api/tools'
 import { openManageLibrariesDialog } from '../components/manageLibrariesDialog'
-import { usePinnedLibraries } from '../hooks/usePinnedLibraries'
 import {
   LibrariesContent,
   LibrariesEmptyState,
   LibrariesHeader,
 } from './LibrariesPageSections'
 import type { LibraryPreview } from './librariesPageModel'
-import type { Library } from '../types'
-import type { SeriesCard } from '../utils/groupSeries'
-import { sortLibraryPreviews } from '../utils/pinnedLibraries'
+import { readPinnedLibraryIds, sortLibraryPreviews, togglePinnedLibraryId } from '../utils/pinnedLibraries'
 
 export function LibrariesPage() {
-  const [libraries, setLibraries] = useState<Library[]>([])
-  const [libraryData, setLibraryData] = useState<Record<string, { cards: SeriesCard[]; total: number }>>({})
-  const { pinnedIds, loading: pinnedLoading, togglePin } = usePinnedLibraries()
+  const [previews, setPreviews] = useState<LibraryPreview[]>([])
+  const [pinnedIds, setPinnedIds] = useState<string[]>(() => readPinnedLibraryIds())
   const [loading, setLoading] = useState(true)
   const [repairing, setRepairing] = useState(false)
   const [repairEpisodeArtwork, setRepairEpisodeArtwork] = useState(false)
   const [repairMsg, setRepairMsg] = useState('')
 
-  const fetchedLibIdsRef = useRef<Set<string>>(new Set())
-  const fetchingRef = useRef<Set<string>>(new Set())
-
-  const fetchPreviews = useCallback(async (ids: string[]) => {
-    const targets = ids.filter((id) => !fetchedLibIdsRef.current.has(id) && !fetchingRef.current.has(id))
-    if (targets.length === 0) return
-    targets.forEach((id) => fetchingRef.current.add(id))
-
-    try {
-      const rows = await libraryAPI.listPreviews(targets, 10)
-      setLibraryData((prev) => {
-        const next = { ...prev }
-        for (const row of rows) {
-          next[row.id] = {
-            cards: row.cards ?? [],
-            total: row.total ?? 0,
-          }
-        }
-        return next
-      })
-    } catch {
-      // 容错
-    } finally {
-      targets.forEach((id) => {
-        fetchedLibIdsRef.current.add(id)
-        fetchingRef.current.delete(id)
-      })
-    }
-  }, [])
-
   const loadLibraries = useCallback(async () => {
     setLoading(true)
     try {
-      const libs = await libraryAPI.list()
-      setLibraries(libs)
-      // 优先拉取入口卡片网格当前页（前 20 个库）的预览
-      const topIds = libs.slice(0, 20).map((l) => l.id)
-      void fetchPreviews(topIds)
+      const libs = await libraryAPI.list({ withPreview: true })
+      setPreviews(
+        libs.map((library) => ({
+          library,
+          items: [],
+          total: library.total ?? 0,
+          cards: library.cards ?? [],
+        })),
+      )
     } finally {
       setLoading(false)
     }
-  }, [fetchPreviews])
+  }, [])
 
   async function handleRepairRescrape() {
     if (repairing) return
@@ -89,27 +59,15 @@ export function LibrariesPage() {
     loadLibraries().catch(() => undefined)
   }, [loadLibraries])
 
-  const previews: LibraryPreview[] = useMemo(() => {
-    return libraries.map((library) => {
-      const data = libraryData[library.id]
-      return {
-        library,
-        items: [],
-        total: data?.total ?? 0,
-        cards: data?.cards ?? [],
-      }
-    })
-  }, [libraries, libraryData])
-
   const sortedPreviews = useMemo(() => sortLibraryPreviews(previews, pinnedIds), [previews, pinnedIds])
 
   const handleTogglePin = useCallback((libraryId: string) => {
-    void togglePin(libraryId)
-  }, [togglePin])
+    setPinnedIds(togglePinnedLibraryId(libraryId))
+  }, [])
 
   const total = useMemo(() => previews.reduce((sum, preview) => sum + preview.total, 0), [previews])
 
-  if (loading || pinnedLoading) {
+  if (loading) {
     return <p className="px-2 py-8 text-sm text-sand-500">媒体库加载中…</p>
   }
 
@@ -129,12 +87,7 @@ export function LibrariesPage() {
       {previews.length === 0 ? (
         <LibrariesEmptyState />
       ) : (
-        <LibrariesContent
-          previews={sortedPreviews}
-          pinnedIds={pinnedIds}
-          onTogglePin={handleTogglePin}
-          onNeedPreviews={fetchPreviews}
-        />
+        <LibrariesContent previews={sortedPreviews} pinnedIds={pinnedIds} onTogglePin={handleTogglePin} />
       )}
     </div>
   )

web/src/pages/LibrariesPageSections.tsx

@@ -1,7 +1,7 @@
-import { useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
+import type { ReactNode } from 'react'
 import { Link } from 'react-router-dom'
 import { motion } from 'framer-motion'
-import { ArrowRight, ChevronLeft, ChevronRight, Film, FolderOpen, Library as LibraryIcon, Music, Pin, PlayCircle, RefreshCw, Sparkles, Tv } from 'lucide-react'
+import { ArrowRight, Film, FolderOpen, Library as LibraryIcon, Music, Pin, PlayCircle, RefreshCw, Sparkles, Tv } from 'lucide-react'
 
 import { imageURL } from '../api/client'
 import { EpisodeArtworkToggle } from '../components/EpisodeArtworkToggle'
@@ -107,141 +107,25 @@ export function LibrariesContent({
   previews,
   pinnedIds,
   onTogglePin,
-  onNeedPreviews,
 }: {
   previews: LibraryPreview[]
   pinnedIds: string[]
   onTogglePin: (libraryId: string) => void
-  onNeedPreviews?: (ids: string[]) => void
 }) {
   const pinnedCount = previews.filter((preview) => isLibraryPinned(preview.library.id, pinnedIds)).length
 
-  // 下方媒体库货架支持向下滑动渐进流式加载：默认先展示前 3 个库货架，
-  // 随着用户向下滑动接近底部，通过 IntersectionObserver 动态解锁后续媒体库货架。
-  const INITIAL_SHELVES = 3
-  const STEP_SHELVES = 2
-  const [visibleCount, setVisibleCount] = useState(INITIAL_SHELVES)
-  const sentinelRef = useRef<HTMLDivElement | null>(null)
-
-  useEffect(() => {
-    const currentTargets = previews.slice(0, visibleCount).map((p) => p.library.id)
-    onNeedPreviews?.(currentTargets)
-  }, [previews, visibleCount, onNeedPreviews])
-
-  // 底部哨兵监听与滚动双保险（触底解锁后续媒体库货架）
-  useEffect(() => {
-    const scrollParent = document.getElementById('app-main-scroll')
-    if (!scrollParent) return
-
-    const handleCheckBottom = () => {
-      const remaining = scrollParent.scrollHeight - scrollParent.scrollTop - scrollParent.clientHeight
-      if (remaining < 600) {
-        setVisibleCount((prev) => {
-          if (prev >= previews.length) return prev
-          return Math.min(prev + STEP_SHELVES, previews.length)
-        })
-      }
-    }
-
-    scrollParent.addEventListener('scroll', handleCheckBottom, { passive: true })
-
-    const sentinel = sentinelRef.current
-    let observer: IntersectionObserver | null = null
-    if (sentinel) {
-      observer = new IntersectionObserver(
-        (entries) => {
-          const [entry] = entries
-          if (entry?.isIntersecting) {
-            setVisibleCount((prev) => {
-              if (prev >= previews.length) return prev
-              return Math.min(prev + STEP_SHELVES, previews.length)
-            })
-          }
-        },
-        {
-          root: scrollParent,
-          rootMargin: '600px 0px',
-          threshold: 0,
-        },
-      )
-      observer.observe(sentinel)
-    }
-
-    handleCheckBottom()
-
-    return () => {
-      scrollParent.removeEventListener('scroll', handleCheckBottom)
-      if (observer) {
-        observer.disconnect()
-      }
-    }
-  }, [visibleCount, previews.length])
-
-  const visiblePreviews = useMemo(() => {
-    return previews.slice(0, visibleCount)
-  }, [previews, visibleCount])
-
-  const ENTRY_PAGE_SIZE = 20
-  const [entryPage, setEntryPage] = useState(1)
-  const totalEntryPages = Math.max(1, Math.ceil(previews.length / ENTRY_PAGE_SIZE))
-  const effectiveEntryPage = Math.min(entryPage, totalEntryPages)
-  const pagedPreviews = useMemo<LibraryPreview[]>(() => {
-    const start = (effectiveEntryPage - 1) * ENTRY_PAGE_SIZE
-    return previews.slice(start, start + ENTRY_PAGE_SIZE)
-  }, [previews, effectiveEntryPage])
-
-  useEffect(() => {
-    const ids = pagedPreviews.map((p) => p.library.id)
-    onNeedPreviews?.(ids)
-  }, [pagedPreviews, onNeedPreviews])
-
   return (
     <>
       <section className="space-y-4">
-        <div className="flex flex-wrap items-center justify-between gap-3">
-          <div>
-            <div className="flex items-center gap-2">
-              <h2 className="font-display text-2xl font-bold text-ink-600">媒体库入口</h2>
-              {previews.length > ENTRY_PAGE_SIZE && (
-                <span className="rounded-md border border-sand-200 bg-sand-50 px-2 py-0.5 text-xs font-semibold text-sand-700">
-                  共 {previews.length} 个 · 每页 {ENTRY_PAGE_SIZE} 个
-                </span>
-              )}
-            </div>
-            <p className="text-sm text-ink-50">
-              按目录进入完整媒体库；下方每个目录也会直接展示最新内容。
-              {pinnedCount > 0 ? ` 已置顶 ${pinnedCount} 个媒体库。` : ' 点击卡片右上角图钉可置顶常用媒体库。'}
-            </p>
-          </div>
-
-          {totalEntryPages > 1 && (
-            <div className="flex items-center gap-2 rounded-xl border border-sand-200 bg-white px-2.5 py-1 text-xs shadow-sm">
-              <button
-                type="button"
-                onClick={() => setEntryPage((p) => Math.max(1, p - 1))}
-                disabled={effectiveEntryPage <= 1}
-                className="rounded-lg p-1 text-ink-50 hover:bg-sand-100 hover:text-ink-600 disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-ink-50 transition-colors"
-                title="上一页"
-              >
-                <ChevronLeft size={14} />
-              </button>
-              <span className="font-mono text-xs font-semibold text-ink-600">
-                {effectiveEntryPage} / {totalEntryPages}
-              </span>
-              <button
-                type="button"
-                onClick={() => setEntryPage((p) => Math.min(totalEntryPages, p + 1))}
-                disabled={effectiveEntryPage >= totalEntryPages}
-                className="rounded-lg p-1 text-ink-50 hover:bg-sand-100 hover:text-ink-600 disabled:opacity-30 disabled:hover:bg-transparent disabled:hover:text-ink-50 transition-colors"
-                title="下一页"
-              >
-                <ChevronRight size={14} />
-              </button>
-            </div>
-          )}
+        <div>
+          <h2 className="font-display text-2xl font-bold text-ink-600">媒体库入口</h2>
+          <p className="text-sm text-ink-50">
+            按目录进入完整媒体库；下方每个目录也会直接展示最新内容。
+            {pinnedCount > 0 ? ` 已置顶 ${pinnedCount} 个媒体库。` : ' 点击卡片右上角图钉可置顶常用媒体库。'}
+          </p>
         </div>
         <div className="grid grid-cols-1 gap-3 sm:grid-cols-2 sm:gap-4 xl:grid-cols-3">
-          {pagedPreviews.map((preview, index) => (
+          {previews.map((preview, index) => (
             <motion.div
               key={preview.library.id}
               initial={{ opacity: 0, y: 12 }}
@@ -258,32 +142,21 @@ export function LibrariesContent({
         </div>
       </section>
 
-      {visiblePreviews.length > 0 && (
-        <section className="space-y-6">
-          {visiblePreviews.map((preview, index) => (
-            <motion.div
-              key={preview.library.id}
-              initial={{ opacity: 0, y: 12 }}
-              animate={{ opacity: 1, y: 0 }}
-              transition={{ delay: Math.min(index, 3) * 0.03 }}
-            >
-              <LibraryShelf
-                preview={preview}
-                pinned={isLibraryPinned(preview.library.id, pinnedIds)}
-              />
-            </motion.div>
-          ))}
-
-          {visibleCount < previews.length && (
-            <div ref={sentinelRef} className="flex h-10 w-full items-center justify-center py-2 opacity-60">
-              <div className="flex items-center gap-2 text-xs text-[var(--app-muted)]">
-                <div className="h-1.5 w-1.5 animate-ping rounded-full bg-brand-500" />
-                <span>加载更多媒体库货架…</span>
-              </div>
-            </div>
-          )}
-        </section>
-      )}
+      <section className="space-y-6">
+        {previews.map((preview, index) => (
+          <motion.div
+            key={preview.library.id}
+            initial={{ opacity: 0, y: 12 }}
+            animate={{ opacity: 1, y: 0 }}
+            transition={{ delay: index * 0.03 }}
+          >
+            <LibraryShelf
+              preview={preview}
+              pinned={isLibraryPinned(preview.library.id, pinnedIds)}
+            />
+          </motion.div>
+        ))}
+      </section>
     </>
   )
 }
@@ -332,7 +205,6 @@ function LibraryEntryCard({
       <Link
         to={`/library/${library.id}`}
         className="flex min-w-0 flex-1"
-        title={library.name}
       >
       <div className={`grid h-20 w-24 sm:h-24 sm:w-36 shrink-0 gap-1 overflow-hidden rounded-xl sm:rounded-2xl bg-[linear-gradient(135deg,#fff7ed,#f8fafc)] ${artwork.length > 1 ? 'grid-cols-2' : 'grid-cols-1'}`}>
         {artwork.length > 0 ? (
@@ -363,10 +235,7 @@ function LibraryEntryCard({
               {preview.total.toLocaleString()} 个条目
             </span>
           </div>
-          <h2
-            className="line-clamp-2 break-words font-display text-sm font-bold leading-snug text-ink-600 group-hover:text-brand-600 sm:text-base lg:text-lg sm:font-black"
-            title={library.name}
-          >
+          <h2 className="line-clamp-2 font-display text-sm font-bold leading-tight text-ink-600 group-hover:text-brand-600 sm:truncate sm:text-xl sm:font-black">
             {library.name}
             {pinned ? <span className="ml-1.5 align-middle text-[10px] font-bold text-brand-600">置顶</span> : null}
           </h2>
@@ -399,10 +268,7 @@ function LibraryShelf({ preview, pinned }: { preview: LibraryPreview; pinned?: b
             {TYPE_ICONS[library.type] ?? <LibraryIcon size={14} />}
             {TYPE_LABELS[library.type] ?? library.type}
           </div>
-          <h2
-            className="line-clamp-2 break-words font-display text-xl sm:text-2xl font-black text-ink-600"
-            title={library.name}
-          >
+          <h2 className="line-clamp-2 font-display text-xl sm:text-2xl font-black text-ink-600 sm:truncate">
             {library.name}
             {pinned ? <span className="ml-2 align-middle text-xs font-bold text-brand-600">置顶</span> : null}
           </h2>

web/src/pages/LibraryMediaSections.tsx

@@ -2,13 +2,9 @@ import type { ReactNode } from 'react'
 import { Film } from 'lucide-react'
 
 import { MediaCard } from '../components/MediaCard'
-import { MEDIA_GRID_CLASS, VirtualMediaGrid } from '../components/VirtualMediaGrid'
 import type { Media } from '../types'
 import type { SeriesCard } from '../utils/groupSeries'
 
-// 超过该数量后切换为虚拟滚动：DOM 只挂载视口内的卡片，大库不再线性劣化。
-const VIRTUALIZE_THRESHOLD = 200
-
 type LibraryMediaSectionsProps = {
   isSeries: boolean
   items: Media[]
@@ -31,10 +27,11 @@ export function LibraryMediaSections({
   return (
     <>
       {!isSeries && items.length > 0 && (
-        <MediaGrid count={items.length} renderItem={(index) => {
-          const media = items[index]
-          return <MediaCard key={media.id} media={media} actions={cardActions(media)} />
-        }} />
+        <div className="grid grid-cols-3 gap-4 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 2xl:grid-cols-8">
+          {items.map((media) => (
+            <MediaCard key={media.id} media={media} actions={cardActions(media)} />
+          ))}
+        </div>
       )}
 
       {!isSeries && items.length === 0 && (
@@ -42,9 +39,8 @@ export function LibraryMediaSections({
       )}
 
       {isSeries && seriesCards.length > 0 && !selectedSeries && (
-        <MediaGrid count={seriesCards.length} renderItem={(index) => {
-          const series = seriesCards[index]
-          return (
+        <div className="grid grid-cols-3 gap-4 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 2xl:grid-cols-8">
+          {seriesCards.map((series) => (
             <MediaCard
               key={series.key}
               media={series.rep}
@@ -52,8 +48,8 @@ export function LibraryMediaSections({
               actions={cardActions(series.rep)}
               onClick={() => onSeriesClick(series)}
             />
-          )
-        }} />
+          ))}
+        </div>
       )}
 
       {isSeries && seriesCards.length === 0 && !loading && (
@@ -63,13 +59,6 @@ export function LibraryMediaSections({
   )
 }
 
-function MediaGrid({ count, renderItem }: { count: number; renderItem: (index: number) => ReactNode }) {
-  if (count <= VIRTUALIZE_THRESHOLD) {
-    return <div className={MEDIA_GRID_CLASS}>{Array.from({ length: count }, (_, index) => renderItem(index))}</div>
-  }
-  return <VirtualMediaGrid totalCount={count} renderItem={renderItem} />
-}
-
 function LibraryEmptyState({ message }: { message: string }) {
   return (
     <div className="flex flex-col items-center justify-center py-24 text-center">