diff --git a/README.md b/README.md
index 1e2f780..b0c048d 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@
| **网盘与 STRM** | OpenList、CloudDrive2、115、WebDAV 等；STRM 同步、上传/下载队列、直链/302 播放 |
| **下载与整理** | qBittorrent 接入、站点搜索与订阅、下载后自动整理、文件管理器（复制/移动/硬链/软链） |
| **用户与权限** | 管理员/普通用户、有效期、成人内容开关、播放配置 PIN、细粒度操作权限 |
-| **运维能力** | 统一任务队列、回收站、存储统计、DLNA 投屏、系统设置与日志 |
+| **运维能力** | 统一任务队列、存储统计、DLNA 投屏、系统设置与日志 |
### 技术栈
diff --git a/README_EN.md b/README_EN.md
index 0afda28..9a31a47 100644
--- a/README_EN.md
+++ b/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, recycle bin, storage stats, DLNA casting, settings and logs |
+| **Operations** | Unified task queue, storage stats, DLNA casting, settings and logs |
### Tech stack
diff --git a/internal/handler/media_delete.go b/internal/handler/media_delete.go
new file mode 100644
index 0000000..9437847
--- /dev/null
+++ b/internal/handler/media_delete.go
@@ -0,0 +1,35 @@
+// 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
+}
diff --git a/internal/handler/media_delete_test.go b/internal/handler/media_delete_test.go
new file mode 100644
index 0000000..925d97f
--- /dev/null
+++ b/internal/handler/media_delete_test.go
@@ -0,0 +1,23 @@
+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)
+ }
+ }
+}
diff --git a/internal/handler/recycle.go b/internal/handler/recycle.go
deleted file mode 100644
index 63eeb9a..0000000
--- a/internal/handler/recycle.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// 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)
- }
-}
diff --git a/internal/handler/routes_authenticated.go b/internal/handler/routes_authenticated.go
index a9de929..ec11fb9 100644
--- a/internal/handler/routes_authenticated.go
+++ b/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)
- registerAuthedRecycleAndRealtimeRoutes(authed, svc)
+ registerAuthedRealtimeRoutes(authed, svc)
registerAuthedUISurfaceRoutes(authed, svc)
registerAuthedSearchRoutes(authed, svc)
registerAuthedSystemExtraRoutes(authed, svc)
diff --git a/internal/handler/routes_authenticated_core.go b/internal/handler/routes_authenticated_core.go
index 8d793c7..5489d5e 100644
--- a/internal/handler/routes_authenticated_core.go
+++ b/internal/handler/routes_authenticated_core.go
@@ -50,8 +50,6 @@ 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))
diff --git a/internal/handler/routes_authenticated_features.go b/internal/handler/routes_authenticated_features.go
index 8e18efb..2769c1a 100644
--- a/internal/handler/routes_authenticated_features.go
+++ b/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 registerAuthedRecycleAndRealtimeRoutes(authed *gin.RouterGroup, svc *service.Container) {
+func registerAuthedRealtimeRoutes(authed *gin.RouterGroup, svc *service.Container) {
authed.GET("/ws", wsHandler(svc))
authed.GET("/events", sseHandler(svc))
}
diff --git a/internal/repository/media_repository.go b/internal/repository/media_repository.go
index 256b063..62f99df 100644
--- a/internal/repository/media_repository.go
+++ b/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 for virtual
-// cloud mounts where "remove mount" must not populate the recycle bin.
+// PurgeByLibrary permanently removes media tied to a library. Used when
+// removing a library or virtual mount so indexed rows are dropped immediately.
func (r *MediaRepository) PurgeByLibrary(ctx context.Context, libraryID string) error {
return r.db.WithContext(ctx).Unscoped().Where("library_id = ?", libraryID).Delete(&model.Media{}).Error
}
diff --git a/internal/service/media_delete.go b/internal/service/media_delete.go
new file mode 100644
index 0000000..e9f0e94
--- /dev/null
+++ b/internal/service/media_delete.go
@@ -0,0 +1,59 @@
+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
+}
diff --git a/internal/service/media_delete_test.go b/internal/service/media_delete_test.go
new file mode 100644
index 0000000..a5ea043
--- /dev/null
+++ b/internal/service/media_delete_test.go
@@ -0,0 +1,135 @@
+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)
+ }
+}
diff --git a/internal/service/media_recycle.go b/internal/service/media_recycle.go
deleted file mode 100644
index ec39eb3..0000000
--- a/internal/service/media_recycle.go
+++ /dev/null
@@ -1,91 +0,0 @@
-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
-}
diff --git a/internal/service/media_recycle_test.go b/internal/service/media_recycle_test.go
deleted file mode 100644
index 201f0e7..0000000
--- a/internal/service/media_recycle_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-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")
- }
-}
diff --git a/internal/service/scheduler.go b/internal/service/scheduler.go
index c140232..a8a28f4 100644
--- a/internal/service/scheduler.go
+++ b/internal/service/scheduler.go
@@ -8,9 +8,6 @@
// 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
@@ -128,11 +125,6 @@ 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,
diff --git a/internal/service/scheduler_local_jobs.go b/internal/service/scheduler_local_jobs.go
index cbd4319..5e02da6 100644
--- a/internal/service/scheduler_local_jobs.go
+++ b/internal/service/scheduler_local_jobs.go
@@ -8,9 +8,6 @@ import (
"time"
"go.uber.org/zap"
- "gorm.io/gorm"
-
- "github.com/truewhile/MeBox/internal/model"
)
// jobScanLibraries re-walks every enabled library.
@@ -181,29 +178,6 @@ 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 == "" {
diff --git a/web/src/api/library.ts b/web/src/api/library.ts
index c833715..4185398 100644
--- a/web/src/api/library.ts
+++ b/web/src/api/library.ts
@@ -225,6 +225,19 @@ 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 {
diff --git a/web/src/api/recycle.ts b/web/src/api/recycle.ts
deleted file mode 100644
index 467e055..0000000
--- a/web/src/api/recycle.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-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),
-}
diff --git a/web/src/components/ConfirmDialog.tsx b/web/src/components/ConfirmDialog.tsx
index 07c554a..2e76f3b 100644
--- a/web/src/components/ConfirmDialog.tsx
+++ b/web/src/components/ConfirmDialog.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react'
import { AlertTriangle } from 'lucide-react'
export type ConfirmOptions = {
@@ -6,6 +7,13 @@ export type ConfirmOptions = {
confirmText?: string
cancelText?: string
danger?: boolean
+ checkboxLabel?: string
+ checkboxDefaultChecked?: boolean
+}
+
+export type ConfirmResult = {
+ confirmed: boolean
+ checked: boolean
}
export function ConfirmDialog({
@@ -13,13 +21,15 @@ export function ConfirmDialog({
onClose,
}: {
options: ConfirmOptions
- onClose: (value: boolean) => void
+ onClose: (value: ConfirmResult) => void
}) {
const danger = options.danger ?? true
+ const hasCheckbox = Boolean(options.checkboxLabel)
+ const [checked, setChecked] = useState(Boolean(options.checkboxDefaultChecked))
return (
onClose(false)}
+ onClick={() => onClose({ confirmed: false, checked })}
>
{options.title || '确认操作'}
-
{options.message}
+
{options.message}
+ {hasCheckbox ? (
+
+ ) : null}
diff --git a/web/src/pages/LibrarySeriesDetailSection.tsx b/web/src/pages/LibrarySeriesDetailSection.tsx
index d24ecee..f9725e8 100644
--- a/web/src/pages/LibrarySeriesDetailSection.tsx
+++ b/web/src/pages/LibrarySeriesDetailSection.tsx
@@ -31,7 +31,7 @@ type LibrarySeriesDetailSectionProps = {
onProbe: () => void
onNFO: () => void
onOrganize: () => void
- onSoftDelete: () => void
+ onDelete: () => void
onSeasonChange: (season: number) => void
}
@@ -56,7 +56,7 @@ export function LibrarySeriesDetailSection({
onProbe,
onNFO,
onOrganize,
- onSoftDelete,
+ onDelete,
onSeasonChange,
}: LibrarySeriesDetailSectionProps) {
return (
@@ -86,7 +86,7 @@ export function LibrarySeriesDetailSection({
onProbe={onProbe}
onNFO={onNFO}
onOrganize={onOrganize}
- onSoftDelete={onSoftDelete}
+ onDelete={onDelete}
/>
void
onProbe: () => void
onExportNFO: () => void
- onSoftDelete: () => void
+ onDelete: () => void
}
export function MediaDetailAdminPanel({
@@ -27,7 +27,7 @@ export function MediaDetailAdminPanel({
onOrganize,
onProbe,
onExportNFO,
- onSoftDelete,
+ onDelete,
}: MediaDetailAdminPanelProps) {
if (isRemoteEmbyID(media.id)) {
return null
@@ -70,11 +70,11 @@ export function MediaDetailAdminPanel({
写出本地 NFO 属性
diff --git a/web/src/pages/MediaDetailPage.tsx b/web/src/pages/MediaDetailPage.tsx
index 326d8c0..c50c85a 100644
--- a/web/src/pages/MediaDetailPage.tsx
+++ b/web/src/pages/MediaDetailPage.tsx
@@ -42,7 +42,7 @@ export function MediaDetailPage() {
onOrganize={() => detail.setOrganizeOpen(true)}
onProbe={detail.reprobe}
onExportNFO={detail.exportNFO}
- onSoftDelete={detail.softDelete}
+ onDelete={detail.deleteMedia}
/>
{detail.hasEpisodes && (
diff --git a/web/src/pages/MediaDetailPageSections.tsx b/web/src/pages/MediaDetailPageSections.tsx
index 0849add..401d5b0 100644
--- a/web/src/pages/MediaDetailPageSections.tsx
+++ b/web/src/pages/MediaDetailPageSections.tsx
@@ -31,7 +31,7 @@ interface MediaDetailMainContentProps extends MediaDetailPlaybackActionsProps {
onOrganize: () => void
onProbe: () => void
onExportNFO: () => void
- onSoftDelete: () => void
+ onDelete: () => void
}
interface MediaDetailDialogsProps {
@@ -147,7 +147,7 @@ export function MediaDetailMainContent({
onOrganize,
onProbe,
onExportNFO,
- onSoftDelete,
+ onDelete,
}: MediaDetailMainContentProps) {
return (
@@ -174,7 +174,7 @@ export function MediaDetailMainContent({
onOrganize={onOrganize}
onProbe={onProbe}
onExportNFO={onExportNFO}
- onSoftDelete={onSoftDelete}
+ onDelete={onDelete}
/>
)}
diff --git a/web/src/pages/useLibraryAdminActions.tsx b/web/src/pages/useLibraryAdminActions.tsx
index 1ea6cfe..fb8e66d 100644
--- a/web/src/pages/useLibraryAdminActions.tsx
+++ b/web/src/pages/useLibraryAdminActions.tsx
@@ -3,9 +3,9 @@ import toast from 'react-hot-toast'
import { api } from '../api/client'
import { libraryAPI } from '../api/library'
-import { recycleAPI } from '../api/recycle'
+import { mediaAPI } from '../api/library'
import { toolsAPI } from '../api/tools'
-import { confirmAction } from '../components/confirmAction'
+import { confirmAction, confirmActionResult } from '../components/confirmAction'
import type { Library, Media } from '../types'
import { seriesTitle, type SeriesCard } from '../utils/groupSeries'
import { LibraryMovieActions } from './LibraryMovieActions'
@@ -92,7 +92,7 @@ export function useLibraryAdminActions({
}
const handleSeriesNFO = () => {
- runSeriesTool('nfo', '整剧 NFO 写出', (media) => recycleAPI.exportNFO(media.id))
+ runSeriesTool('nfo', '整剧 NFO 写出', (media) => mediaAPI.exportNFO(media.id))
}
const handleSeriesOrganize = async () => {
@@ -128,14 +128,16 @@ export function useLibraryAdminActions({
}
}
- const handleSeriesSoftDelete = async () => {
+ const handleSeriesDelete = async () => {
if (!selectedSeries || selectedSeriesEpisodes.length === 0) return
- if (!(await confirmAction({
- title: '移入回收站',
- message: `将「${seriesTitle(selectedSeries.rep)}」的 ${selectedSeriesEpisodes.length} 个媒体移至回收站? (磁盘文件保留)`,
- confirmText: '移入回收站',
- }))) return
- await runSeriesTool('delete', '整剧移入回收站', (media) => recycleAPI.softDelete(media.id))
+ const result = await confirmActionResult({
+ title: '删除整剧',
+ message: `确定从媒体库删除「${seriesTitle(selectedSeries.rep)}」的 ${selectedSeriesEpisodes.length} 个媒体？\n默认仅移除索引记录，磁盘文件会保留。`,
+ confirmText: '删除',
+ checkboxLabel: '同时删除本地文件（含同名 NFO）',
+ })
+ if (!result.confirmed) return
+ await runSeriesTool('delete', '整剧删除', (media) => mediaAPI.delete(media.id, { deleteFiles: result.checked }))
clearSelectedSeries()
}
@@ -166,16 +168,18 @@ export function useLibraryAdminActions({
}
const handleMovieNFO = (media: Media) => {
- runMovieTool(media, 'nfo', 'NFO 写出', (item) => recycleAPI.exportNFO(item.id))
+ runMovieTool(media, 'nfo', 'NFO 写出', (item) => mediaAPI.exportNFO(item.id))
}
- const handleMovieSoftDelete = async (media: Media) => {
- if (!(await confirmAction({
- title: '移入回收站',
- message: `将「${media.title}」移至回收站? (磁盘文件保留)`,
- confirmText: '移入回收站',
- }))) return
- await runMovieTool(media, 'delete', '移入回收站', (item) => recycleAPI.softDelete(item.id))
+ const handleMovieDelete = async (media: Media) => {
+ const result = await confirmActionResult({
+ title: '删除媒体',
+ message: `确定从媒体库删除「${media.title}」？\n默认仅移除索引记录，磁盘文件会保留。`,
+ confirmText: '删除',
+ checkboxLabel: '同时删除本地文件（含同名 NFO）',
+ })
+ if (!result.confirmed) return
+ await runMovieTool(media, 'delete', '删除', (item) => mediaAPI.delete(item.id, { deleteFiles: result.checked }))
}
const movieActions = (media: Media): ReactNode => {
@@ -188,7 +192,7 @@ export function useLibraryAdminActions({
onManualScrape={setManualMovie}
onProbe={handleMovieProbe}
onNFO={handleMovieNFO}
- onSoftDelete={handleMovieSoftDelete}
+ onDelete={handleMovieDelete}
/>
)
}
@@ -205,7 +209,7 @@ export function useLibraryAdminActions({
handleSeriesProbe,
handleSeriesNFO,
handleSeriesOrganize,
- handleSeriesSoftDelete,
+ handleSeriesDelete,
movieActions,
}
}
diff --git a/web/src/pages/useMediaDetailPageState.ts b/web/src/pages/useMediaDetailPageState.ts
index cd41f5e..b4d2975 100644
--- a/web/src/pages/useMediaDetailPageState.ts
+++ b/web/src/pages/useMediaDetailPageState.ts
@@ -5,8 +5,7 @@ import toast from 'react-hot-toast'
import { api } from '../api/client'
import { mediaAPI } from '../api/library'
import { playbackAPI } from '../api/playback'
-import { recycleAPI } from '../api/recycle'
-import { confirmAction } from '../components/confirmAction'
+import { confirmActionResult } from '../components/confirmAction'
import type { Media } from '../types'
import { mediaLibraryBackTarget } from './MediaDetailPageModel'
@@ -181,11 +180,11 @@ function useMediaDetailActions({
)
const reprobe = useCallback(() => reprobeMedia(media, refresh), [media, refresh])
const exportNFO = useCallback(() => exportMediaNFO(media), [media])
- const softDelete = useCallback(
- () => softDeleteMedia(media, navigate),
+ const deleteMedia = useCallback(
+ () => deleteMediaFromLibrary(media, navigate),
[media, navigate],
)
- return { goBack, toggleFavourite, rescrape, reprobe, exportNFO, softDelete }
+ return { goBack, toggleFavourite, rescrape, reprobe, exportNFO, deleteMedia }
}
function goBackFromMediaDetail(media: Media | null, navigate: NavigateFunction, replace = false): void {
@@ -237,23 +236,24 @@ async function reprobeMedia(media: Media | null, refresh: () => Promise):
async function exportMediaNFO(media: Media | null): Promise {
if (!media) return
try {
- const result = await recycleAPI.exportNFO(media.id)
+ const result = await mediaAPI.exportNFO(media.id)
toast.success(`NFO 已成功写入 ${result.path}`)
} catch (err: unknown) {
toast.error(apiErrorMessage(err, '导出失败'))
}
}
-async function softDeleteMedia(media: Media | null, navigate: NavigateFunction): Promise {
+async function deleteMediaFromLibrary(media: Media | null, navigate: NavigateFunction): Promise {
if (!media) return
- const confirmed = await confirmAction({
- title: '移入回收站',
- message: `将「${media.title}」移至回收站? (磁盘文件保留)`,
- confirmText: '移入回收站',
+ const result = await confirmActionResult({
+ title: '删除媒体',
+ message: `确定从媒体库删除「${media.title}」？\n默认仅移除索引记录，磁盘文件会保留。`,
+ confirmText: '删除',
+ checkboxLabel: '同时删除本地文件（含同名 NFO）',
})
- if (!confirmed) return
- await recycleAPI.softDelete(media.id)
- toast.success('已移至回收站')
+ if (!result.confirmed) return
+ await mediaAPI.delete(media.id, { deleteFiles: result.checked })
+ toast.success(result.checked ? '已删除媒体及本地文件' : '已从媒体库删除')
goBackFromMediaDetail(media, navigate, true)
}