mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-08 14:26:37 +08:00
feat: refresh libraries after STRM updates
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
package handler
|
package handler
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -106,6 +107,7 @@ type generateSTRMReq struct {
|
|||||||
Overwrite bool `json:"overwrite"`
|
Overwrite bool `json:"overwrite"`
|
||||||
IncludeLocal *bool `json:"include_local"`
|
IncludeLocal *bool `json:"include_local"`
|
||||||
PreserveTree bool `json:"preserve_tree"`
|
PreserveTree bool `json:"preserve_tree"`
|
||||||
|
Refresh bool `json:"refresh_library"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type generateSTRMTreeReq struct {
|
type generateSTRMTreeReq struct {
|
||||||
@@ -121,12 +123,14 @@ type generateSTRMTreeReq struct {
|
|||||||
DryRun bool `json:"dry_run"`
|
DryRun bool `json:"dry_run"`
|
||||||
BatchLimit int `json:"batch_limit"`
|
BatchLimit int `json:"batch_limit"`
|
||||||
TransferSubtitles bool `json:"transfer_subtitles"`
|
TransferSubtitles bool `json:"transfer_subtitles"`
|
||||||
|
RefreshLibrary bool `json:"refresh_library"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type repairSTRMReq struct {
|
type repairSTRMReq struct {
|
||||||
OutputDir string `json:"output_dir" binding:"required"`
|
OutputDir string `json:"output_dir" binding:"required"`
|
||||||
BaseURL string `json:"base_url"`
|
BaseURL string `json:"base_url"`
|
||||||
DryRun bool `json:"dry_run"`
|
DryRun bool `json:"dry_run"`
|
||||||
|
RefreshLibrary bool `json:"refresh_library"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
func generateSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
||||||
@@ -169,6 +173,9 @@ func generateSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if req.Refresh {
|
||||||
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 生成后刷新媒体库", strmGenerationChanged(res))
|
||||||
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -206,6 +213,9 @@ func generateSTRMFromTreeHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if req.RefreshLibrary && !req.DryRun {
|
||||||
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 目录树生成后刷新媒体库", strmGenerationChanged(res))
|
||||||
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -234,10 +244,74 @@ func repairSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if req.RefreshLibrary && !req.DryRun {
|
||||||
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 修复后刷新媒体库", res.Repaired > 0)
|
||||||
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func strmGenerationChanged(res *service.GenerateSTRMResult) bool {
|
||||||
|
return res != nil && (res.Generated > 0 || res.Updated > 0 || res.Cleaned > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func queueSTRMRefreshAfterChanges(ctx context.Context, svc *service.Container, outputDir, taskName string, changed bool) *service.STRMRefreshResult {
|
||||||
|
refresh := &service.STRMRefreshResult{Requested: true}
|
||||||
|
if !changed {
|
||||||
|
refresh.Reason = "no strm changes"
|
||||||
|
return refresh
|
||||||
|
}
|
||||||
|
if svc == nil || svc.Scan == nil {
|
||||||
|
refresh.Reason = "scanner unavailable"
|
||||||
|
return refresh
|
||||||
|
}
|
||||||
|
targets, err := service.FindSTRMRefreshTargets(ctx, svc.Repo, outputDir)
|
||||||
|
if err != nil {
|
||||||
|
refresh.Reason = err.Error()
|
||||||
|
return refresh
|
||||||
|
}
|
||||||
|
if len(targets) == 0 {
|
||||||
|
refresh.Reason = "no matching local library"
|
||||||
|
return refresh
|
||||||
|
}
|
||||||
|
refresh.Targets = targets
|
||||||
|
for _, target := range targets {
|
||||||
|
key := target.LibraryID
|
||||||
|
if target.RootID != "" {
|
||||||
|
key += ":" + target.RootID
|
||||||
|
}
|
||||||
|
finishScan, ok := svc.Scan.TryBeginLocalScan(key)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
refresh.Queued = true
|
||||||
|
task := startScanHTTPTask(svc, taskName, target.Name, target.Path)
|
||||||
|
go runSTRMRefreshScan(svc, target, task, finishScan)
|
||||||
|
}
|
||||||
|
if !refresh.Queued {
|
||||||
|
refresh.Reason = "matching library already scanning"
|
||||||
|
}
|
||||||
|
return refresh
|
||||||
|
}
|
||||||
|
|
||||||
|
func runSTRMRefreshScan(svc *service.Container, target service.STRMRefreshTarget, task *service.TaskHandle, finish func()) {
|
||||||
|
defer finish()
|
||||||
|
var (
|
||||||
|
res *service.ScanResult
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if target.RootID != "" {
|
||||||
|
res, err = svc.Scan.ScanLibraryRoot(context.Background(), target.LibraryID, target.RootID)
|
||||||
|
} else {
|
||||||
|
res, err = svc.Scan.ScanLibrary(context.Background(), target.LibraryID)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
finishHTTPTask(task, err, "scan", "STRM 刷新媒体库失败", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
finishHTTPTask(task, nil, "completed", "STRM 刷新媒体库结束", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
||||||
|
}
|
||||||
|
|
||||||
func strmPlaybackTokenForRequest(c *gin.Context, svc *service.Container) string {
|
func strmPlaybackTokenForRequest(c *gin.Context, svc *service.Container) string {
|
||||||
if svc == nil || svc.Auth == nil || svc.Repo == nil || svc.Repo.User == nil {
|
if svc == nil || svc.Auth == nil || svc.Repo == nil || svc.Repo.User == nil {
|
||||||
return ""
|
return ""
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ type GenerateSTRMResult struct {
|
|||||||
Errors []string `json:"errors,omitempty"`
|
Errors []string `json:"errors,omitempty"`
|
||||||
IgnoredItems []string `json:"ignored_items,omitempty"`
|
IgnoredItems []string `json:"ignored_items,omitempty"`
|
||||||
Items []GenerateSTRMItem `json:"items,omitempty"`
|
Items []GenerateSTRMItem `json:"items,omitempty"`
|
||||||
|
Refresh *STRMRefreshResult `json:"refresh,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type GenerateSTRMItem struct {
|
type GenerateSTRMItem struct {
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/ShukeBta/MediaStationGo/internal/model"
|
||||||
|
"github.com/ShukeBta/MediaStationGo/internal/repository"
|
||||||
|
)
|
||||||
|
|
||||||
|
type STRMRefreshResult struct {
|
||||||
|
Requested bool `json:"requested"`
|
||||||
|
Queued bool `json:"queued"`
|
||||||
|
Reason string `json:"reason,omitempty"`
|
||||||
|
Targets []STRMRefreshTarget `json:"targets,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type STRMRefreshTarget struct {
|
||||||
|
LibraryID string `json:"library_id"`
|
||||||
|
RootID string `json:"root_id,omitempty"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func FindSTRMRefreshTargets(ctx context.Context, repo *repository.Container, outputDir string) ([]STRMRefreshTarget, error) {
|
||||||
|
if repo == nil || repo.Library == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
outputDir = resolveMappedDestinationPath(strings.TrimSpace(outputDir))
|
||||||
|
if outputDir == "" || outputDir == "." {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
libraries, err := repo.Library.List(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
targets := make([]STRMRefreshTarget, 0)
|
||||||
|
seen := map[string]struct{}{}
|
||||||
|
for i := range libraries {
|
||||||
|
lib := libraries[i]
|
||||||
|
if !lib.Enabled {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
roots, err := repo.Library.ListRoots(ctx, lib.ID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(roots) == 0 && strings.TrimSpace(lib.Path) != "" {
|
||||||
|
roots = []model.LibraryRoot{{LibraryID: lib.ID, Path: lib.Path, Enabled: lib.Enabled}}
|
||||||
|
}
|
||||||
|
for j := range roots {
|
||||||
|
root := roots[j]
|
||||||
|
if !root.Enabled || strings.TrimSpace(root.Path) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := ParseCloudLibraryMount(root.Path); ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !strmRefreshPathMatches(outputDir, root.Path) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := lib.ID + "\x00" + root.ID + "\x00" + strings.ToLower(filepath.Clean(root.Path))
|
||||||
|
if _, ok := seen[key]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[key] = struct{}{}
|
||||||
|
targets = append(targets, STRMRefreshTarget{
|
||||||
|
LibraryID: lib.ID,
|
||||||
|
RootID: root.ID,
|
||||||
|
Name: lib.Name,
|
||||||
|
Path: filepath.Clean(root.Path),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return targets, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func strmRefreshPathMatches(outputDir, libraryRoot string) bool {
|
||||||
|
outputDir = filepath.Clean(strings.TrimSpace(outputDir))
|
||||||
|
libraryRoot = filepath.Clean(strings.TrimSpace(libraryRoot))
|
||||||
|
if outputDir == "" || outputDir == "." || libraryRoot == "" || libraryRoot == "." {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return sameLibraryPath(outputDir, libraryRoot) || pathWithin(outputDir, libraryRoot) || pathWithin(libraryRoot, outputDir)
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package service
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/ShukeBta/MediaStationGo/internal/model"
|
||||||
|
"github.com/ShukeBta/MediaStationGo/internal/repository"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFindSTRMRefreshTargetsMatchesNestedLocalRoots(t *testing.T) {
|
||||||
|
db := newServiceTestDB(t, &model.Library{}, &model.LibraryRoot{})
|
||||||
|
repos := repository.New(db)
|
||||||
|
base := t.TempDir()
|
||||||
|
movieRoot := filepath.Join(base, "strm", "电影")
|
||||||
|
tvRoot := filepath.Join(base, "strm", "电视剧")
|
||||||
|
otherRoot := filepath.Join(base, "other")
|
||||||
|
cloudRoot := "cloud://openlist/电影"
|
||||||
|
|
||||||
|
movie := model.Library{Name: "电影 STRM", Path: movieRoot, Type: "movie", Enabled: true}
|
||||||
|
tv := model.Library{Name: "电视剧 STRM", Path: tvRoot, Type: "tv", Enabled: true}
|
||||||
|
other := model.Library{Name: "其他", Path: otherRoot, Type: "movie", Enabled: true}
|
||||||
|
cloud := model.Library{Name: "云盘", Path: cloudRoot, Type: "movie", Enabled: true}
|
||||||
|
disabled := model.Library{Name: "停用", Path: filepath.Join(base, "strm", "动漫"), Type: "tv", Enabled: false}
|
||||||
|
for _, lib := range []*model.Library{&movie, &tv, &other, &cloud, &disabled} {
|
||||||
|
if err := repos.Library.Create(t.Context(), lib); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := repos.DB.Model(&model.Library{}).Where("id = ?", disabled.ID).Update("enabled", false).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
targets, err := FindSTRMRefreshTargets(t.Context(), repos, filepath.Join(base, "strm"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(targets) != 2 {
|
||||||
|
t.Fatalf("targets = %#v, want movie and tv only", targets)
|
||||||
|
}
|
||||||
|
got := map[string]bool{}
|
||||||
|
for _, target := range targets {
|
||||||
|
got[target.LibraryID] = true
|
||||||
|
}
|
||||||
|
if !got[movie.ID] || !got[tv.ID] || got[other.ID] || got[cloud.ID] || got[disabled.ID] {
|
||||||
|
t.Fatalf("target libraries = %#v", targets)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFindSTRMRefreshTargetsDoesNotFallbackToAllLibraries(t *testing.T) {
|
||||||
|
db := newServiceTestDB(t, &model.Library{}, &model.LibraryRoot{})
|
||||||
|
repos := repository.New(db)
|
||||||
|
lib := model.Library{Name: "电影", Path: filepath.Join(t.TempDir(), "movies"), Type: "movie", Enabled: true}
|
||||||
|
if err := repos.Library.Create(t.Context(), &lib); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
targets, err := FindSTRMRefreshTargets(t.Context(), repos, filepath.Join(t.TempDir(), "strm"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(targets) != 0 {
|
||||||
|
t.Fatalf("targets = %#v, want no fallback target", targets)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,12 +17,13 @@ type RepairSTRMOptions struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type RepairSTRMResult struct {
|
type RepairSTRMResult struct {
|
||||||
OutputDir string `json:"output_dir"`
|
OutputDir string `json:"output_dir"`
|
||||||
Repaired int `json:"repaired"`
|
Repaired int `json:"repaired"`
|
||||||
Previewed int `json:"previewed,omitempty"`
|
Previewed int `json:"previewed,omitempty"`
|
||||||
Skipped int `json:"skipped"`
|
Skipped int `json:"skipped"`
|
||||||
Errors []string `json:"errors,omitempty"`
|
Errors []string `json:"errors,omitempty"`
|
||||||
Items []RepairSTRMItem `json:"items,omitempty"`
|
Items []RepairSTRMItem `json:"items,omitempty"`
|
||||||
|
Refresh *STRMRefreshResult `json:"refresh,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type RepairSTRMItem struct {
|
type RepairSTRMItem struct {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ export type GenerateSTRMInput = {
|
|||||||
overwrite?: boolean
|
overwrite?: boolean
|
||||||
include_local?: boolean
|
include_local?: boolean
|
||||||
preserve_tree?: boolean
|
preserve_tree?: boolean
|
||||||
|
refresh_library?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type GenerateSTRMResult = {
|
export type GenerateSTRMResult = {
|
||||||
@@ -24,6 +25,7 @@ export type GenerateSTRMResult = {
|
|||||||
previewed?: number
|
previewed?: number
|
||||||
errors?: string[]
|
errors?: string[]
|
||||||
ignored_items?: string[]
|
ignored_items?: string[]
|
||||||
|
refresh?: STRMRefreshResult
|
||||||
items?: Array<{
|
items?: Array<{
|
||||||
media_id: string
|
media_id: string
|
||||||
title: string
|
title: string
|
||||||
@@ -47,12 +49,14 @@ export type GenerateSTRMTreeInput = {
|
|||||||
dry_run?: boolean
|
dry_run?: boolean
|
||||||
batch_limit?: number
|
batch_limit?: number
|
||||||
transfer_subtitles?: boolean
|
transfer_subtitles?: boolean
|
||||||
|
refresh_library?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RepairSTRMInput = {
|
export type RepairSTRMInput = {
|
||||||
output_dir: string
|
output_dir: string
|
||||||
base_url?: string
|
base_url?: string
|
||||||
dry_run?: boolean
|
dry_run?: boolean
|
||||||
|
refresh_library?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RepairSTRMResult = {
|
export type RepairSTRMResult = {
|
||||||
@@ -61,6 +65,7 @@ export type RepairSTRMResult = {
|
|||||||
previewed?: number
|
previewed?: number
|
||||||
skipped: number
|
skipped: number
|
||||||
errors?: string[]
|
errors?: string[]
|
||||||
|
refresh?: STRMRefreshResult
|
||||||
items?: Array<{
|
items?: Array<{
|
||||||
file_path: string
|
file_path: string
|
||||||
before?: string
|
before?: string
|
||||||
@@ -70,6 +75,18 @@ export type RepairSTRMResult = {
|
|||||||
}>
|
}>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type STRMRefreshResult = {
|
||||||
|
requested: boolean
|
||||||
|
queued: boolean
|
||||||
|
reason?: string
|
||||||
|
targets?: Array<{
|
||||||
|
library_id: string
|
||||||
|
root_id?: string
|
||||||
|
name: string
|
||||||
|
path: string
|
||||||
|
}>
|
||||||
|
}
|
||||||
|
|
||||||
export const strmAPI = {
|
export const strmAPI = {
|
||||||
set: (mediaID: string, url: string) =>
|
set: (mediaID: string, url: string) =>
|
||||||
api.put(`/media/${mediaID}/strm`, { url }).then((r) => r.data),
|
api.put(`/media/${mediaID}/strm`, { url }).then((r) => r.data),
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ export type StrmGenerateSectionProps = {
|
|||||||
overwrite: boolean
|
overwrite: boolean
|
||||||
includeLocal: boolean
|
includeLocal: boolean
|
||||||
preserveTree: boolean
|
preserveTree: boolean
|
||||||
|
refreshLibrary: boolean
|
||||||
generating: boolean
|
generating: boolean
|
||||||
generateResult: GenerateSTRMResult | null
|
generateResult: GenerateSTRMResult | null
|
||||||
playbackStatus: string
|
playbackStatus: string
|
||||||
@@ -40,6 +41,7 @@ export type StrmGenerateSectionProps = {
|
|||||||
setOverwrite: (value: boolean) => void
|
setOverwrite: (value: boolean) => void
|
||||||
setIncludeLocal: (value: boolean) => void
|
setIncludeLocal: (value: boolean) => void
|
||||||
setPreserveTree: (value: boolean) => void
|
setPreserveTree: (value: boolean) => void
|
||||||
|
setRefreshLibrary: (value: boolean) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
export function StrmGenerateSection(props: StrmGenerateSectionProps) {
|
export function StrmGenerateSection(props: StrmGenerateSectionProps) {
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ type StrmGenerateFormProps = Pick<
|
|||||||
| 'overwrite'
|
| 'overwrite'
|
||||||
| 'includeLocal'
|
| 'includeLocal'
|
||||||
| 'preserveTree'
|
| 'preserveTree'
|
||||||
|
| 'refreshLibrary'
|
||||||
| 'generating'
|
| 'generating'
|
||||||
| 'onGenerate'
|
| 'onGenerate'
|
||||||
| 'setGenerateLibraryID'
|
| 'setGenerateLibraryID'
|
||||||
@@ -152,6 +153,7 @@ type StrmGenerateFormProps = Pick<
|
|||||||
| 'setOverwrite'
|
| 'setOverwrite'
|
||||||
| 'setIncludeLocal'
|
| 'setIncludeLocal'
|
||||||
| 'setPreserveTree'
|
| 'setPreserveTree'
|
||||||
|
| 'setRefreshLibrary'
|
||||||
>
|
>
|
||||||
|
|
||||||
export function StrmGenerateForm({
|
export function StrmGenerateForm({
|
||||||
@@ -162,6 +164,7 @@ export function StrmGenerateForm({
|
|||||||
overwrite,
|
overwrite,
|
||||||
includeLocal,
|
includeLocal,
|
||||||
preserveTree,
|
preserveTree,
|
||||||
|
refreshLibrary,
|
||||||
generating,
|
generating,
|
||||||
onGenerate,
|
onGenerate,
|
||||||
setGenerateLibraryID,
|
setGenerateLibraryID,
|
||||||
@@ -170,6 +173,7 @@ export function StrmGenerateForm({
|
|||||||
setOverwrite,
|
setOverwrite,
|
||||||
setIncludeLocal,
|
setIncludeLocal,
|
||||||
setPreserveTree,
|
setPreserveTree,
|
||||||
|
setRefreshLibrary,
|
||||||
}: StrmGenerateFormProps) {
|
}: StrmGenerateFormProps) {
|
||||||
return (
|
return (
|
||||||
<form onSubmit={onGenerate} className="grid gap-3 md:grid-cols-4">
|
<form onSubmit={onGenerate} className="grid gap-3 md:grid-cols-4">
|
||||||
@@ -188,10 +192,11 @@ export function StrmGenerateForm({
|
|||||||
>
|
>
|
||||||
使用当前访问地址
|
使用当前访问地址
|
||||||
</button>
|
</button>
|
||||||
<div className="grid gap-2 md:col-span-4 md:grid-cols-3">
|
<div className="grid gap-2 md:col-span-4 md:grid-cols-4">
|
||||||
<CompactOption checked={overwrite} label="覆盖已存在" onChange={setOverwrite} />
|
<CompactOption checked={overwrite} label="覆盖已存在" onChange={setOverwrite} />
|
||||||
<CompactOption checked={includeLocal} label="包含本地媒体" onChange={setIncludeLocal} />
|
<CompactOption checked={includeLocal} label="包含本地媒体" onChange={setIncludeLocal} />
|
||||||
<CompactOption checked={preserveTree} label="保留目录树" onChange={setPreserveTree} />
|
<CompactOption checked={preserveTree} label="保留目录树" onChange={setPreserveTree} />
|
||||||
|
<CompactOption checked={refreshLibrary} label="生成后刷新媒体库" onChange={setRefreshLibrary} />
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
className="input-base md:col-span-4"
|
className="input-base md:col-span-4"
|
||||||
@@ -279,6 +284,13 @@ export function StrmGenerateResultPanel({ result }: { result: GenerateSTRMResult
|
|||||||
{result.batch_limited && (
|
{result.batch_limited && (
|
||||||
<div className="mt-1 text-amber-600">本批已达到上限,剩余 {result.remaining || 0} 个可继续运行。</div>
|
<div className="mt-1 text-amber-600">本批已达到上限,剩余 {result.remaining || 0} 个可继续运行。</div>
|
||||||
)}
|
)}
|
||||||
|
{result.refresh && (
|
||||||
|
<div className={result.refresh.queued ? 'mt-1 text-emerald-600' : 'mt-1 text-amber-600'}>
|
||||||
|
{result.refresh.queued
|
||||||
|
? `媒体库刷新已排队:${result.refresh.targets?.map((target) => target.name).join('、') || '已匹配媒体库'}`
|
||||||
|
: `媒体库未刷新:${result.refresh.reason || '未匹配到可扫描媒体库'}`}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{result.ignored_items && result.ignored_items.length > 0 && (
|
{result.ignored_items && result.ignored_items.length > 0 && (
|
||||||
<div className="mt-1 text-amber-600">
|
<div className="mt-1 text-amber-600">
|
||||||
已忽略 {result.ignored || result.ignored_items.length} 个非视频/sidecar:{result.ignored_items.slice(0, 3).join(';')}
|
已忽略 {result.ignored || result.ignored_items.length} 个非视频/sidecar:{result.ignored_items.slice(0, 3).join(';')}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export function StrmPage() {
|
|||||||
overwrite={strm.generate.overwrite}
|
overwrite={strm.generate.overwrite}
|
||||||
includeLocal={strm.generate.includeLocal}
|
includeLocal={strm.generate.includeLocal}
|
||||||
preserveTree={strm.generate.preserveTree}
|
preserveTree={strm.generate.preserveTree}
|
||||||
|
refreshLibrary={strm.generate.refreshLibrary}
|
||||||
generating={strm.generate.generating}
|
generating={strm.generate.generating}
|
||||||
generateResult={strm.generate.generateResult}
|
generateResult={strm.generate.generateResult}
|
||||||
playbackStatus={strm.generate.playbackStatus}
|
playbackStatus={strm.generate.playbackStatus}
|
||||||
@@ -47,6 +48,7 @@ export function StrmPage() {
|
|||||||
setOverwrite={strm.generate.setOverwrite}
|
setOverwrite={strm.generate.setOverwrite}
|
||||||
setIncludeLocal={strm.generate.setIncludeLocal}
|
setIncludeLocal={strm.generate.setIncludeLocal}
|
||||||
setPreserveTree={strm.generate.setPreserveTree}
|
setPreserveTree={strm.generate.setPreserveTree}
|
||||||
|
setRefreshLibrary={strm.generate.setRefreshLibrary}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<StrmTreeGenerateSection {...strm.treeGenerate} />
|
<StrmTreeGenerateSection {...strm.treeGenerate} />
|
||||||
|
|||||||
@@ -9,12 +9,14 @@ export function StrmRepairSection({
|
|||||||
baseURL,
|
baseURL,
|
||||||
outputDir,
|
outputDir,
|
||||||
repairing,
|
repairing,
|
||||||
|
refreshLibrary,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
onPreview,
|
onPreview,
|
||||||
onRepair,
|
onRepair,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setOutputDir,
|
setOutputDir,
|
||||||
|
setRefreshLibrary,
|
||||||
}: StrmRepairSectionProps) {
|
}: StrmRepairSectionProps) {
|
||||||
return (
|
return (
|
||||||
<section className="glass-panel space-y-4">
|
<section className="glass-panel space-y-4">
|
||||||
@@ -43,6 +45,10 @@ export function StrmRepairSection({
|
|||||||
>
|
>
|
||||||
使用当前访问地址
|
使用当前访问地址
|
||||||
</button>
|
</button>
|
||||||
|
<label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
|
||||||
|
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(e.target.checked)} />
|
||||||
|
修复后刷新媒体库
|
||||||
|
</label>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={repairing || !outputDir.trim()}
|
disabled={repairing || !outputDir.trim()}
|
||||||
@@ -64,6 +70,13 @@ export function StrmRepairSection({
|
|||||||
{result.previewed ? `预检 ${result.previewed} · ` : ''}
|
{result.previewed ? `预检 ${result.previewed} · ` : ''}
|
||||||
修复 {result.repaired} · 跳过 {result.skipped}
|
修复 {result.repaired} · 跳过 {result.skipped}
|
||||||
</div>
|
</div>
|
||||||
|
{result.refresh && (
|
||||||
|
<div className={result.refresh.queued ? 'mt-1 text-emerald-600' : 'mt-1 text-amber-600'}>
|
||||||
|
{result.refresh.queued
|
||||||
|
? `媒体库刷新已排队:${result.refresh.targets?.map((target) => target.name).join('、') || '已匹配媒体库'}`
|
||||||
|
: `媒体库未刷新:${result.refresh.reason || '未匹配到可扫描媒体库'}`}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{result.errors && result.errors.length > 0 && (
|
{result.errors && result.errors.length > 0 && (
|
||||||
<div className="mt-2 text-red-500">
|
<div className="mt-2 text-red-500">
|
||||||
失败 {result.errors.length} 条:{result.errors.slice(0, 3).join(';')}
|
失败 {result.errors.length} 条:{result.errors.slice(0, 3).join(';')}
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ export function StrmTreeGenerateSection({
|
|||||||
overwrite,
|
overwrite,
|
||||||
pathsText,
|
pathsText,
|
||||||
provider,
|
provider,
|
||||||
|
refreshLibrary,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
@@ -50,6 +51,7 @@ export function StrmTreeGenerateSection({
|
|||||||
setOverwrite,
|
setOverwrite,
|
||||||
setPathsText,
|
setPathsText,
|
||||||
setProvider,
|
setProvider,
|
||||||
|
setRefreshLibrary,
|
||||||
setSourceRoot,
|
setSourceRoot,
|
||||||
setTreeText,
|
setTreeText,
|
||||||
setTransferSubtitles,
|
setTransferSubtitles,
|
||||||
@@ -185,6 +187,10 @@ export function StrmTreeGenerateSection({
|
|||||||
<input type="checkbox" checked={transferSubtitles} onChange={(e) => setTransferSubtitles(e.target.checked)} />
|
<input type="checkbox" checked={transferSubtitles} onChange={(e) => setTransferSubtitles(e.target.checked)} />
|
||||||
转移同名字幕链接
|
转移同名字幕链接
|
||||||
</label>
|
</label>
|
||||||
|
<label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
|
||||||
|
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(e.target.checked)} />
|
||||||
|
生成后刷新媒体库
|
||||||
|
</label>
|
||||||
<label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
|
<label className="flex min-h-10 items-center gap-2 rounded-2xl border border-gray-200 bg-white/70 px-3 py-2 text-sm text-ink-50 md:col-span-4">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
const [overwrite, setOverwrite] = useState(false)
|
const [overwrite, setOverwrite] = useState(false)
|
||||||
const [includeLocal, setIncludeLocal] = useState(true)
|
const [includeLocal, setIncludeLocal] = useState(true)
|
||||||
const [preserveTree, setPreserveTree] = useState(false)
|
const [preserveTree, setPreserveTree] = useState(false)
|
||||||
|
const [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
const [generating, setGenerating] = useState(false)
|
const [generating, setGenerating] = useState(false)
|
||||||
const [generateResult, setGenerateResult] = useState<GenerateSTRMResult | null>(null)
|
const [generateResult, setGenerateResult] = useState<GenerateSTRMResult | null>(null)
|
||||||
|
|
||||||
@@ -117,6 +118,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
enabled: autoGenerate,
|
enabled: autoGenerate,
|
||||||
include_local: includeLocal,
|
include_local: includeLocal,
|
||||||
preserve_tree: preserveTree,
|
preserve_tree: preserveTree,
|
||||||
|
refresh_library: refreshLibrary,
|
||||||
})
|
})
|
||||||
const nextOutputDir = result.output_dir || outputDir
|
const nextOutputDir = result.output_dir || outputDir
|
||||||
setGenerateResult(result)
|
setGenerateResult(result)
|
||||||
@@ -174,6 +176,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
includeLocal,
|
includeLocal,
|
||||||
overwrite,
|
overwrite,
|
||||||
preserveTree,
|
preserveTree,
|
||||||
|
refreshLibrary,
|
||||||
playbackStatus: playbackStatusText(strmPlaybackEnabled, redirectProxyEnabled, cloudPlaybackMode),
|
playbackStatus: playbackStatusText(strmPlaybackEnabled, redirectProxyEnabled, cloudPlaybackMode),
|
||||||
redirectProxyEnabled,
|
redirectProxyEnabled,
|
||||||
saveSTRMSettings,
|
saveSTRMSettings,
|
||||||
@@ -186,6 +189,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
setOutputDir: onOutputDirChange,
|
setOutputDir: onOutputDirChange,
|
||||||
setOverwrite,
|
setOverwrite,
|
||||||
setPreserveTree,
|
setPreserveTree,
|
||||||
|
setRefreshLibrary,
|
||||||
setRedirectProxyEnabled,
|
setRedirectProxyEnabled,
|
||||||
setStrmPlaybackEnabled,
|
setStrmPlaybackEnabled,
|
||||||
strmPlaybackEnabled,
|
strmPlaybackEnabled,
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { apiErrorMessage, isHTTPURL } from './strmPageUtils'
|
|||||||
export function useStrmRepairForm() {
|
export function useStrmRepairForm() {
|
||||||
const [baseURL, setBaseURL] = useState(currentOrigin())
|
const [baseURL, setBaseURL] = useState(currentOrigin())
|
||||||
const [outputDir, setOutputDir] = useState('data/strm/tree')
|
const [outputDir, setOutputDir] = useState('data/strm/tree')
|
||||||
|
const [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
const [runningMode, setRunningMode] = useState<'repair' | 'preview' | null>(null)
|
const [runningMode, setRunningMode] = useState<'repair' | 'preview' | null>(null)
|
||||||
const [result, setResult] = useState<RepairSTRMResult | null>(null)
|
const [result, setResult] = useState<RepairSTRMResult | null>(null)
|
||||||
|
|
||||||
@@ -28,6 +29,7 @@ export function useStrmRepairForm() {
|
|||||||
output_dir: outputDir.trim(),
|
output_dir: outputDir.trim(),
|
||||||
base_url: trimmedBaseURL.replace(/\/+$/, '') || undefined,
|
base_url: trimmedBaseURL.replace(/\/+$/, '') || undefined,
|
||||||
dry_run: dryRun,
|
dry_run: dryRun,
|
||||||
|
refresh_library: refreshLibrary,
|
||||||
})
|
})
|
||||||
setResult(next)
|
setResult(next)
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
@@ -55,11 +57,13 @@ export function useStrmRepairForm() {
|
|||||||
baseURL,
|
baseURL,
|
||||||
outputDir,
|
outputDir,
|
||||||
repairing: runningMode !== null,
|
repairing: runningMode !== null,
|
||||||
|
refreshLibrary,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
onPreview,
|
onPreview,
|
||||||
onRepair,
|
onRepair,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setOutputDir,
|
setOutputDir,
|
||||||
|
setRefreshLibrary,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
const [overwrite, setOverwrite] = useState(false)
|
const [overwrite, setOverwrite] = useState(false)
|
||||||
const [cleanup, setCleanup] = useState(false)
|
const [cleanup, setCleanup] = useState(false)
|
||||||
const [transferSubtitles, setTransferSubtitles] = useState(true)
|
const [transferSubtitles, setTransferSubtitles] = useState(true)
|
||||||
|
const [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
const [runningMode, setRunningMode] = useState<'generate' | 'preview' | null>(null)
|
const [runningMode, setRunningMode] = useState<'generate' | 'preview' | null>(null)
|
||||||
const [result, setResult] = useState<GenerateSTRMResult | null>(null)
|
const [result, setResult] = useState<GenerateSTRMResult | null>(null)
|
||||||
|
|
||||||
@@ -71,6 +72,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
dry_run: dryRun,
|
dry_run: dryRun,
|
||||||
batch_limit: parsedBatchLimit || undefined,
|
batch_limit: parsedBatchLimit || undefined,
|
||||||
transfer_subtitles: transferSubtitles,
|
transfer_subtitles: transferSubtitles,
|
||||||
|
refresh_library: refreshLibrary,
|
||||||
})
|
})
|
||||||
setResult(next)
|
setResult(next)
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
@@ -109,6 +111,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
provider,
|
provider,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
|
refreshLibrary,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setBatchLimit,
|
setBatchLimit,
|
||||||
setCleanup,
|
setCleanup,
|
||||||
@@ -117,6 +120,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
setOverwrite,
|
setOverwrite,
|
||||||
setPathsText,
|
setPathsText,
|
||||||
setProvider,
|
setProvider,
|
||||||
|
setRefreshLibrary,
|
||||||
setSourceRoot,
|
setSourceRoot,
|
||||||
setTreeText,
|
setTreeText,
|
||||||
setTransferSubtitles,
|
setTransferSubtitles,
|
||||||
|
|||||||
Reference in New Issue
Block a user