mirror of
https://github.com/truewhile/MeBox.git
synced 2026-10-07 22:06:38 +08:00
feat: scrape STRM libraries after refresh
This commit is contained in:
+100
-10
@@ -108,6 +108,7 @@ type generateSTRMReq struct {
|
|||||||
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"`
|
Refresh bool `json:"refresh_library"`
|
||||||
|
ScrapeAfter bool `json:"scrape_after"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type generateSTRMTreeReq struct {
|
type generateSTRMTreeReq struct {
|
||||||
@@ -125,6 +126,7 @@ type generateSTRMTreeReq struct {
|
|||||||
TransferSubtitles bool `json:"transfer_subtitles"`
|
TransferSubtitles bool `json:"transfer_subtitles"`
|
||||||
MissingOnly bool `json:"missing_only"`
|
MissingOnly bool `json:"missing_only"`
|
||||||
RefreshLibrary bool `json:"refresh_library"`
|
RefreshLibrary bool `json:"refresh_library"`
|
||||||
|
ScrapeAfter bool `json:"scrape_after"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type repairSTRMReq struct {
|
type repairSTRMReq struct {
|
||||||
@@ -132,6 +134,7 @@ type repairSTRMReq struct {
|
|||||||
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"`
|
RefreshLibrary bool `json:"refresh_library"`
|
||||||
|
ScrapeAfter bool `json:"scrape_after"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func listSTRMOutputPresetsHandler(svc *service.Container) gin.HandlerFunc {
|
func listSTRMOutputPresetsHandler(svc *service.Container) gin.HandlerFunc {
|
||||||
@@ -186,7 +189,11 @@ func generateSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if req.Refresh {
|
if req.Refresh {
|
||||||
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 生成后刷新媒体库", strmGenerationChanged(res))
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, strmRefreshQueueOptions{
|
||||||
|
TaskName: "STRM 生成后刷新媒体库",
|
||||||
|
Changed: strmGenerationChanged(res),
|
||||||
|
ScrapeAfter: req.ScrapeAfter,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
@@ -227,7 +234,11 @@ func generateSTRMFromTreeHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if req.RefreshLibrary && !req.DryRun {
|
if req.RefreshLibrary && !req.DryRun {
|
||||||
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 目录树生成后刷新媒体库", strmGenerationChanged(res))
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, strmRefreshQueueOptions{
|
||||||
|
TaskName: "STRM 目录树生成后刷新媒体库",
|
||||||
|
Changed: strmGenerationChanged(res),
|
||||||
|
ScrapeAfter: req.ScrapeAfter,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
@@ -258,7 +269,11 @@ func repairSTRMHandler(svc *service.Container) gin.HandlerFunc {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if req.RefreshLibrary && !req.DryRun {
|
if req.RefreshLibrary && !req.DryRun {
|
||||||
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, "STRM 修复后刷新媒体库", res.Repaired > 0)
|
res.Refresh = queueSTRMRefreshAfterChanges(c.Request.Context(), svc, res.OutputDir, strmRefreshQueueOptions{
|
||||||
|
TaskName: "STRM 修复后刷新媒体库",
|
||||||
|
Changed: res.Repaired > 0,
|
||||||
|
ScrapeAfter: req.ScrapeAfter,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
c.JSON(http.StatusOK, res)
|
c.JSON(http.StatusOK, res)
|
||||||
}
|
}
|
||||||
@@ -268,26 +283,43 @@ func strmGenerationChanged(res *service.GenerateSTRMResult) bool {
|
|||||||
return res != nil && (res.Generated > 0 || res.Updated > 0 || res.Cleaned > 0)
|
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 {
|
type strmRefreshQueueOptions struct {
|
||||||
refresh := &service.STRMRefreshResult{Requested: true}
|
TaskName string
|
||||||
if !changed {
|
Changed bool
|
||||||
|
ScrapeAfter bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type strmRefreshRunOptions struct {
|
||||||
|
ScrapeAfter bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func queueSTRMRefreshAfterChanges(ctx context.Context, svc *service.Container, outputDir string, options strmRefreshQueueOptions) *service.STRMRefreshResult {
|
||||||
|
refresh := &service.STRMRefreshResult{Requested: true, ScrapeRequested: options.ScrapeAfter}
|
||||||
|
if !options.Changed {
|
||||||
refresh.Reason = "no strm changes"
|
refresh.Reason = "no strm changes"
|
||||||
|
refresh.ScrapeReason = strmRefreshScrapeSkipReason(refresh)
|
||||||
return refresh
|
return refresh
|
||||||
}
|
}
|
||||||
if svc == nil || svc.Scan == nil {
|
if svc == nil || svc.Scan == nil {
|
||||||
refresh.Reason = "scanner unavailable"
|
refresh.Reason = "scanner unavailable"
|
||||||
|
refresh.ScrapeReason = strmRefreshScrapeSkipReason(refresh)
|
||||||
return refresh
|
return refresh
|
||||||
}
|
}
|
||||||
targets, err := service.FindSTRMRefreshTargets(ctx, svc.Repo, outputDir)
|
targets, err := service.FindSTRMRefreshTargets(ctx, svc.Repo, outputDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
refresh.Reason = err.Error()
|
refresh.Reason = err.Error()
|
||||||
|
refresh.ScrapeReason = strmRefreshScrapeSkipReason(refresh)
|
||||||
return refresh
|
return refresh
|
||||||
}
|
}
|
||||||
if len(targets) == 0 {
|
if len(targets) == 0 {
|
||||||
refresh.Reason = "no matching local library"
|
refresh.Reason = "no matching local library"
|
||||||
|
refresh.ScrapeReason = strmRefreshScrapeSkipReason(refresh)
|
||||||
return refresh
|
return refresh
|
||||||
}
|
}
|
||||||
refresh.Targets = targets
|
refresh.Targets = targets
|
||||||
|
if options.ScrapeAfter && svc.Scraper == nil {
|
||||||
|
refresh.ScrapeReason = "scraper unavailable"
|
||||||
|
}
|
||||||
for _, target := range targets {
|
for _, target := range targets {
|
||||||
key := target.LibraryID
|
key := target.LibraryID
|
||||||
if target.RootID != "" {
|
if target.RootID != "" {
|
||||||
@@ -298,16 +330,21 @@ func queueSTRMRefreshAfterChanges(ctx context.Context, svc *service.Container, o
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
refresh.Queued = true
|
refresh.Queued = true
|
||||||
task := startScanHTTPTask(svc, taskName, target.Name, target.Path)
|
runOptions := strmRefreshRunOptions{ScrapeAfter: options.ScrapeAfter && svc.Scraper != nil}
|
||||||
go runSTRMRefreshScan(svc, target, task, finishScan)
|
if runOptions.ScrapeAfter {
|
||||||
|
refresh.ScrapeQueued = true
|
||||||
|
}
|
||||||
|
task := startScanHTTPTask(svc, options.TaskName, target.Name, target.Path)
|
||||||
|
go runSTRMRefreshScan(svc, target, task, finishScan, runOptions)
|
||||||
}
|
}
|
||||||
if !refresh.Queued {
|
if !refresh.Queued {
|
||||||
refresh.Reason = "matching library already scanning"
|
refresh.Reason = "matching library already scanning"
|
||||||
|
refresh.ScrapeReason = strmRefreshScrapeSkipReason(refresh)
|
||||||
}
|
}
|
||||||
return refresh
|
return refresh
|
||||||
}
|
}
|
||||||
|
|
||||||
func runSTRMRefreshScan(svc *service.Container, target service.STRMRefreshTarget, task *service.TaskHandle, finish func()) {
|
func runSTRMRefreshScan(svc *service.Container, target service.STRMRefreshTarget, task *service.TaskHandle, finish func(), options strmRefreshRunOptions) {
|
||||||
defer finish()
|
defer finish()
|
||||||
var (
|
var (
|
||||||
res *service.ScanResult
|
res *service.ScanResult
|
||||||
@@ -322,7 +359,60 @@ func runSTRMRefreshScan(svc *service.Container, target service.STRMRefreshTarget
|
|||||||
finishHTTPTask(task, err, "scan", "STRM 刷新媒体库失败", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
finishHTTPTask(task, err, "scan", "STRM 刷新媒体库失败", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
finishHTTPTask(task, nil, "completed", "STRM 刷新媒体库结束", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
if !options.ScrapeAfter {
|
||||||
|
finishHTTPTask(task, nil, "completed", "STRM 刷新媒体库结束", scanTaskMetrics(res), scanTaskDetails(res, 20))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
scrape, reclassified, scrapeErr := runSTRMRefreshScrape(svc, target, task)
|
||||||
|
metrics := strmRefreshTaskMetrics(res, scrape, reclassified)
|
||||||
|
if scrapeErr != nil {
|
||||||
|
finishHTTPTask(task, scrapeErr, "scrape", "STRM 刷新媒体库完成,刮削失败", metrics, scanTaskDetails(res, 20))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
finishHTTPTask(task, nil, "completed", "STRM 刷新媒体库和刮削结束", metrics, scanTaskDetails(res, 20))
|
||||||
|
}
|
||||||
|
|
||||||
|
func runSTRMRefreshScrape(svc *service.Container, target service.STRMRefreshTarget, task *service.TaskHandle) (service.EnrichLibraryResult, int, error) {
|
||||||
|
if task != nil {
|
||||||
|
task.Update(service.TaskUpdate{
|
||||||
|
Stage: "scrape",
|
||||||
|
SourcePath: target.Path,
|
||||||
|
Message: "正在刮削 STRM 媒体库",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
result, err := svc.Scraper.EnrichLibraryDetailedWithOptions(context.Background(), target.LibraryID, service.ScrapeOptions{RetryNoMatch: true})
|
||||||
|
reclassified := 0
|
||||||
|
if result.Processed > 0 {
|
||||||
|
reclassified = reclassifyLibraryAfterScrape(context.Background(), svc, target.LibraryID)
|
||||||
|
}
|
||||||
|
return result, reclassified, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func strmRefreshTaskMetrics(scan *service.ScanResult, scrape service.EnrichLibraryResult, reclassified int) map[string]int64 {
|
||||||
|
metrics := scanTaskMetrics(scan)
|
||||||
|
if metrics == nil {
|
||||||
|
metrics = map[string]int64{}
|
||||||
|
}
|
||||||
|
metrics["scrape_matched"] = int64(scrape.Matched)
|
||||||
|
metrics["scrape_processed"] = int64(scrape.Processed)
|
||||||
|
metrics["scrape_candidates"] = int64(scrape.Candidates)
|
||||||
|
if scrape.Failed > 0 {
|
||||||
|
metrics["scrape_failed"] = int64(scrape.Failed)
|
||||||
|
}
|
||||||
|
if reclassified > 0 {
|
||||||
|
metrics["scrape_reclassified"] = int64(reclassified)
|
||||||
|
}
|
||||||
|
return metrics
|
||||||
|
}
|
||||||
|
|
||||||
|
func strmRefreshScrapeSkipReason(refresh *service.STRMRefreshResult) string {
|
||||||
|
if refresh == nil || !refresh.ScrapeRequested {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if refresh.Reason != "" {
|
||||||
|
return "refresh not queued: " + refresh.Reason
|
||||||
|
}
|
||||||
|
return "refresh not queued"
|
||||||
}
|
}
|
||||||
|
|
||||||
func strmPlaybackTokenForRequest(c *gin.Context, svc *service.Container) string {
|
func strmPlaybackTokenForRequest(c *gin.Context, svc *service.Container) string {
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/ShukeBta/MediaStationGo/internal/service"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSTRMRefreshTaskMetricsIncludesScanAndScrape(t *testing.T) {
|
||||||
|
metrics := strmRefreshTaskMetrics(
|
||||||
|
&service.ScanResult{Visited: 3, Added: 2, Updated: 1, ErrorCount: 1},
|
||||||
|
service.EnrichLibraryResult{Matched: 4, Processed: 5, Candidates: 6, Failed: 1},
|
||||||
|
2,
|
||||||
|
)
|
||||||
|
|
||||||
|
want := map[string]int64{
|
||||||
|
"visited": 3,
|
||||||
|
"added": 2,
|
||||||
|
"updated": 1,
|
||||||
|
"errors": 1,
|
||||||
|
"scrape_matched": 4,
|
||||||
|
"scrape_processed": 5,
|
||||||
|
"scrape_candidates": 6,
|
||||||
|
"scrape_failed": 1,
|
||||||
|
"scrape_reclassified": 2,
|
||||||
|
}
|
||||||
|
for key, value := range want {
|
||||||
|
if metrics[key] != value {
|
||||||
|
t.Fatalf("metrics[%q] = %d, want %d in %#v", key, metrics[key], value, metrics)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSTRMRefreshScrapeSkipReasonRequiresScrapeRequest(t *testing.T) {
|
||||||
|
if got := strmRefreshScrapeSkipReason(&service.STRMRefreshResult{Requested: true, Reason: "no strm changes"}); got != "" {
|
||||||
|
t.Fatalf("skip reason without scrape request = %q, want empty", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
got := strmRefreshScrapeSkipReason(&service.STRMRefreshResult{
|
||||||
|
Requested: true,
|
||||||
|
ScrapeRequested: true,
|
||||||
|
Reason: "no matching local library",
|
||||||
|
})
|
||||||
|
if got != "refresh not queued: no matching local library" {
|
||||||
|
t.Fatalf("skip reason = %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,10 +10,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type STRMRefreshResult struct {
|
type STRMRefreshResult struct {
|
||||||
Requested bool `json:"requested"`
|
Requested bool `json:"requested"`
|
||||||
Queued bool `json:"queued"`
|
Queued bool `json:"queued"`
|
||||||
Reason string `json:"reason,omitempty"`
|
Reason string `json:"reason,omitempty"`
|
||||||
Targets []STRMRefreshTarget `json:"targets,omitempty"`
|
ScrapeRequested bool `json:"scrape_requested,omitempty"`
|
||||||
|
ScrapeQueued bool `json:"scrape_queued,omitempty"`
|
||||||
|
ScrapeReason string `json:"scrape_reason,omitempty"`
|
||||||
|
Targets []STRMRefreshTarget `json:"targets,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type STRMRefreshTarget struct {
|
type STRMRefreshTarget struct {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ export type GenerateSTRMInput = {
|
|||||||
include_local?: boolean
|
include_local?: boolean
|
||||||
preserve_tree?: boolean
|
preserve_tree?: boolean
|
||||||
refresh_library?: boolean
|
refresh_library?: boolean
|
||||||
|
scrape_after?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type GenerateSTRMResult = {
|
export type GenerateSTRMResult = {
|
||||||
@@ -51,6 +52,7 @@ export type GenerateSTRMTreeInput = {
|
|||||||
transfer_subtitles?: boolean
|
transfer_subtitles?: boolean
|
||||||
missing_only?: boolean
|
missing_only?: boolean
|
||||||
refresh_library?: boolean
|
refresh_library?: boolean
|
||||||
|
scrape_after?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RepairSTRMInput = {
|
export type RepairSTRMInput = {
|
||||||
@@ -58,6 +60,7 @@ export type RepairSTRMInput = {
|
|||||||
base_url?: string
|
base_url?: string
|
||||||
dry_run?: boolean
|
dry_run?: boolean
|
||||||
refresh_library?: boolean
|
refresh_library?: boolean
|
||||||
|
scrape_after?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RepairSTRMResult = {
|
export type RepairSTRMResult = {
|
||||||
@@ -80,6 +83,9 @@ export type STRMRefreshResult = {
|
|||||||
requested: boolean
|
requested: boolean
|
||||||
queued: boolean
|
queued: boolean
|
||||||
reason?: string
|
reason?: string
|
||||||
|
scrape_requested?: boolean
|
||||||
|
scrape_queued?: boolean
|
||||||
|
scrape_reason?: string
|
||||||
targets?: Array<{
|
targets?: Array<{
|
||||||
library_id: string
|
library_id: string
|
||||||
root_id?: string
|
root_id?: string
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ export type StrmGenerateSectionProps = {
|
|||||||
includeLocal: boolean
|
includeLocal: boolean
|
||||||
preserveTree: boolean
|
preserveTree: boolean
|
||||||
refreshLibrary: boolean
|
refreshLibrary: boolean
|
||||||
|
scrapeAfter: boolean
|
||||||
generating: boolean
|
generating: boolean
|
||||||
generateResult: GenerateSTRMResult | null
|
generateResult: GenerateSTRMResult | null
|
||||||
playbackStatus: string
|
playbackStatus: string
|
||||||
@@ -43,6 +44,7 @@ export type StrmGenerateSectionProps = {
|
|||||||
setIncludeLocal: (value: boolean) => void
|
setIncludeLocal: (value: boolean) => void
|
||||||
setPreserveTree: (value: boolean) => void
|
setPreserveTree: (value: boolean) => void
|
||||||
setRefreshLibrary: (value: boolean) => void
|
setRefreshLibrary: (value: boolean) => void
|
||||||
|
setScrapeAfter: (value: boolean) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
export function StrmGenerateSection(props: StrmGenerateSectionProps) {
|
export function StrmGenerateSection(props: StrmGenerateSectionProps) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Loader2, Save, Wand2 } from 'lucide-react'
|
import { Loader2, Save, Wand2 } from 'lucide-react'
|
||||||
|
|
||||||
import type { GenerateSTRMResult } from '../api/strm'
|
import type { GenerateSTRMResult, STRMRefreshResult } from '../api/strm'
|
||||||
import type { Library } from '../types'
|
import type { Library } from '../types'
|
||||||
import { currentOrigin, type CloudPlaybackMode } from './strmPageModel'
|
import { currentOrigin, type CloudPlaybackMode } from './strmPageModel'
|
||||||
import type { StrmGenerateSectionProps } from './StrmGenerateSection'
|
import type { StrmGenerateSectionProps } from './StrmGenerateSection'
|
||||||
@@ -147,6 +147,7 @@ type StrmGenerateFormProps = Pick<
|
|||||||
| 'includeLocal'
|
| 'includeLocal'
|
||||||
| 'preserveTree'
|
| 'preserveTree'
|
||||||
| 'refreshLibrary'
|
| 'refreshLibrary'
|
||||||
|
| 'scrapeAfter'
|
||||||
| 'generating'
|
| 'generating'
|
||||||
| 'onGenerate'
|
| 'onGenerate'
|
||||||
| 'setGenerateLibraryID'
|
| 'setGenerateLibraryID'
|
||||||
@@ -156,6 +157,7 @@ type StrmGenerateFormProps = Pick<
|
|||||||
| 'setIncludeLocal'
|
| 'setIncludeLocal'
|
||||||
| 'setPreserveTree'
|
| 'setPreserveTree'
|
||||||
| 'setRefreshLibrary'
|
| 'setRefreshLibrary'
|
||||||
|
| 'setScrapeAfter'
|
||||||
>
|
>
|
||||||
|
|
||||||
export function StrmGenerateForm({
|
export function StrmGenerateForm({
|
||||||
@@ -168,6 +170,7 @@ export function StrmGenerateForm({
|
|||||||
includeLocal,
|
includeLocal,
|
||||||
preserveTree,
|
preserveTree,
|
||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
|
scrapeAfter,
|
||||||
generating,
|
generating,
|
||||||
onGenerate,
|
onGenerate,
|
||||||
setGenerateLibraryID,
|
setGenerateLibraryID,
|
||||||
@@ -177,6 +180,7 @@ export function StrmGenerateForm({
|
|||||||
setIncludeLocal,
|
setIncludeLocal,
|
||||||
setPreserveTree,
|
setPreserveTree,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary,
|
||||||
|
setScrapeAfter,
|
||||||
}: 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">
|
||||||
@@ -195,11 +199,17 @@ export function StrmGenerateForm({
|
|||||||
>
|
>
|
||||||
使用当前访问地址
|
使用当前访问地址
|
||||||
</button>
|
</button>
|
||||||
<div className="grid gap-2 md:col-span-4 md:grid-cols-4">
|
<div className="grid gap-2 md:col-span-4 md:grid-cols-5">
|
||||||
<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} />
|
<CompactOption checked={refreshLibrary} label="生成后刷新媒体库" onChange={setRefreshLibrary} />
|
||||||
|
<CompactOption
|
||||||
|
checked={refreshLibrary && scrapeAfter}
|
||||||
|
disabled={!refreshLibrary}
|
||||||
|
label="刷新后自动刮削"
|
||||||
|
onChange={setScrapeAfter}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<StrmOutputDirPicker
|
<StrmOutputDirPicker
|
||||||
className="md:col-span-4"
|
className="md:col-span-4"
|
||||||
@@ -218,16 +228,18 @@ export function StrmGenerateForm({
|
|||||||
|
|
||||||
type CompactOptionProps = {
|
type CompactOptionProps = {
|
||||||
checked: boolean
|
checked: boolean
|
||||||
|
disabled?: boolean
|
||||||
label: string
|
label: string
|
||||||
onChange: (value: boolean) => void
|
onChange: (value: boolean) => void
|
||||||
}
|
}
|
||||||
|
|
||||||
function CompactOption({ checked, label, onChange }: CompactOptionProps) {
|
function CompactOption({ checked, disabled, label, onChange }: CompactOptionProps) {
|
||||||
return (
|
return (
|
||||||
<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">
|
<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 ${disabled ? 'cursor-not-allowed opacity-50' : ''}`}>
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={checked}
|
checked={checked}
|
||||||
|
disabled={disabled}
|
||||||
onChange={(e) => onChange(e.target.checked)}
|
onChange={(e) => onChange(e.target.checked)}
|
||||||
/>
|
/>
|
||||||
{label}
|
{label}
|
||||||
@@ -288,13 +300,7 @@ 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 && (
|
<StrmRefreshStatus refresh={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(';')}
|
||||||
@@ -308,3 +314,25 @@ export function StrmGenerateResultPanel({ result }: { result: GenerateSTRMResult
|
|||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function StrmRefreshStatus({ refresh }: { refresh?: STRMRefreshResult }) {
|
||||||
|
if (!refresh) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className={refresh.queued ? 'mt-1 text-emerald-600' : 'mt-1 text-amber-600'}>
|
||||||
|
{refresh.queued
|
||||||
|
? `媒体库刷新已排队:${refresh.targets?.map((target) => target.name).join('、') || '已匹配媒体库'}`
|
||||||
|
: `媒体库未刷新:${refresh.reason || '未匹配到可扫描媒体库'}`}
|
||||||
|
</div>
|
||||||
|
{refresh.scrape_requested && (
|
||||||
|
<div className={refresh.scrape_queued ? 'mt-1 text-emerald-600' : 'mt-1 text-amber-600'}>
|
||||||
|
{refresh.scrape_queued
|
||||||
|
? '扫描完成后将自动刮削'
|
||||||
|
: `未安排刮削:${refresh.scrape_reason || '媒体库未刷新'}`}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ export function StrmPage() {
|
|||||||
includeLocal={strm.generate.includeLocal}
|
includeLocal={strm.generate.includeLocal}
|
||||||
preserveTree={strm.generate.preserveTree}
|
preserveTree={strm.generate.preserveTree}
|
||||||
refreshLibrary={strm.generate.refreshLibrary}
|
refreshLibrary={strm.generate.refreshLibrary}
|
||||||
|
scrapeAfter={strm.generate.scrapeAfter}
|
||||||
generating={strm.generate.generating}
|
generating={strm.generate.generating}
|
||||||
generateResult={strm.generate.generateResult}
|
generateResult={strm.generate.generateResult}
|
||||||
playbackStatus={strm.generate.playbackStatus}
|
playbackStatus={strm.generate.playbackStatus}
|
||||||
@@ -50,6 +51,7 @@ export function StrmPage() {
|
|||||||
setIncludeLocal={strm.generate.setIncludeLocal}
|
setIncludeLocal={strm.generate.setIncludeLocal}
|
||||||
setPreserveTree={strm.generate.setPreserveTree}
|
setPreserveTree={strm.generate.setPreserveTree}
|
||||||
setRefreshLibrary={strm.generate.setRefreshLibrary}
|
setRefreshLibrary={strm.generate.setRefreshLibrary}
|
||||||
|
setScrapeAfter={strm.generate.setScrapeAfter}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<StrmTreeGenerateSection {...strm.treeGenerate} outputPresets={strm.outputPresets} />
|
<StrmTreeGenerateSection {...strm.treeGenerate} outputPresets={strm.outputPresets} />
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Loader2, RotateCcw, Wrench } from 'lucide-react'
|
|||||||
|
|
||||||
import type { STRMOutputPreset } from '../api/strm'
|
import type { STRMOutputPreset } from '../api/strm'
|
||||||
import { currentOrigin } from './strmPageModel'
|
import { currentOrigin } from './strmPageModel'
|
||||||
|
import { StrmRefreshStatus } from './StrmGenerateSectionParts'
|
||||||
import { StrmOutputDirPicker } from './StrmOutputDirPicker'
|
import { StrmOutputDirPicker } from './StrmOutputDirPicker'
|
||||||
import type { useStrmRepairForm } from './useStrmRepairForm'
|
import type { useStrmRepairForm } from './useStrmRepairForm'
|
||||||
|
|
||||||
@@ -17,11 +18,13 @@ export function StrmRepairSection({
|
|||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
|
scrapeAfter,
|
||||||
onPreview,
|
onPreview,
|
||||||
onRepair,
|
onRepair,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setOutputDir,
|
setOutputDir,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary,
|
||||||
|
setScrapeAfter,
|
||||||
}: StrmRepairSectionProps) {
|
}: StrmRepairSectionProps) {
|
||||||
return (
|
return (
|
||||||
<section className="glass-panel space-y-4">
|
<section className="glass-panel space-y-4">
|
||||||
@@ -55,6 +58,15 @@ export function StrmRepairSection({
|
|||||||
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(e.target.checked)} />
|
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(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 ${!refreshLibrary ? 'cursor-not-allowed opacity-50' : ''}`}>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={refreshLibrary && scrapeAfter}
|
||||||
|
disabled={!refreshLibrary}
|
||||||
|
onChange={(e) => setScrapeAfter(e.target.checked)}
|
||||||
|
/>
|
||||||
|
刷新后自动刮削
|
||||||
|
</label>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={repairing || !outputDir.trim()}
|
disabled={repairing || !outputDir.trim()}
|
||||||
@@ -76,13 +88,7 @@ export function StrmRepairSection({
|
|||||||
{result.previewed ? `预检 ${result.previewed} · ` : ''}
|
{result.previewed ? `预检 ${result.previewed} · ` : ''}
|
||||||
修复 {result.repaired} · 跳过 {result.skipped}
|
修复 {result.repaired} · 跳过 {result.skipped}
|
||||||
</div>
|
</div>
|
||||||
{result.refresh && (
|
<StrmRefreshStatus refresh={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(';')}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ export function StrmTreeGenerateSection({
|
|||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
|
scrapeAfter,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setBatchLimit,
|
setBatchLimit,
|
||||||
setCleanup,
|
setCleanup,
|
||||||
@@ -59,6 +60,7 @@ export function StrmTreeGenerateSection({
|
|||||||
setPathsText,
|
setPathsText,
|
||||||
setProvider,
|
setProvider,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary,
|
||||||
|
setScrapeAfter,
|
||||||
setSourceRoot,
|
setSourceRoot,
|
||||||
setTreeText,
|
setTreeText,
|
||||||
setTransferSubtitles,
|
setTransferSubtitles,
|
||||||
@@ -203,6 +205,15 @@ export function StrmTreeGenerateSection({
|
|||||||
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(e.target.checked)} />
|
<input type="checkbox" checked={refreshLibrary} onChange={(e) => setRefreshLibrary(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 ${!refreshLibrary ? 'cursor-not-allowed opacity-50' : ''}`}>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={refreshLibrary && scrapeAfter}
|
||||||
|
disabled={!refreshLibrary}
|
||||||
|
onChange={(e) => setScrapeAfter(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"
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
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 [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
|
const [scrapeAfter, setScrapeAfter] = useState(false)
|
||||||
const [generating, setGenerating] = useState(false)
|
const [generating, setGenerating] = useState(false)
|
||||||
const [generateResult, setGenerateResult] = useState<GenerateSTRMResult | null>(null)
|
const [generateResult, setGenerateResult] = useState<GenerateSTRMResult | null>(null)
|
||||||
|
|
||||||
@@ -119,6 +120,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
include_local: includeLocal,
|
include_local: includeLocal,
|
||||||
preserve_tree: preserveTree,
|
preserve_tree: preserveTree,
|
||||||
refresh_library: refreshLibrary,
|
refresh_library: refreshLibrary,
|
||||||
|
scrape_after: refreshLibrary && scrapeAfter,
|
||||||
})
|
})
|
||||||
const nextOutputDir = result.output_dir || outputDir
|
const nextOutputDir = result.output_dir || outputDir
|
||||||
setGenerateResult(result)
|
setGenerateResult(result)
|
||||||
@@ -135,6 +137,11 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const setRefreshLibraryEnabled = (value: boolean) => {
|
||||||
|
setRefreshLibrary(value)
|
||||||
|
if (!value) setScrapeAfter(false)
|
||||||
|
}
|
||||||
|
|
||||||
const saveSTRMSettings = async () => {
|
const saveSTRMSettings = async () => {
|
||||||
setSavingSettings(true)
|
setSavingSettings(true)
|
||||||
try {
|
try {
|
||||||
@@ -177,6 +184,7 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
overwrite,
|
overwrite,
|
||||||
preserveTree,
|
preserveTree,
|
||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
|
scrapeAfter,
|
||||||
playbackStatus: playbackStatusText(strmPlaybackEnabled, redirectProxyEnabled, cloudPlaybackMode),
|
playbackStatus: playbackStatusText(strmPlaybackEnabled, redirectProxyEnabled, cloudPlaybackMode),
|
||||||
redirectProxyEnabled,
|
redirectProxyEnabled,
|
||||||
saveSTRMSettings,
|
saveSTRMSettings,
|
||||||
@@ -189,7 +197,8 @@ export function useStrmGenerateForm(libraries: Library[]) {
|
|||||||
setOutputDir: onOutputDirChange,
|
setOutputDir: onOutputDirChange,
|
||||||
setOverwrite,
|
setOverwrite,
|
||||||
setPreserveTree,
|
setPreserveTree,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary: setRefreshLibraryEnabled,
|
||||||
|
setScrapeAfter,
|
||||||
setRedirectProxyEnabled,
|
setRedirectProxyEnabled,
|
||||||
setStrmPlaybackEnabled,
|
setStrmPlaybackEnabled,
|
||||||
strmPlaybackEnabled,
|
strmPlaybackEnabled,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ 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 [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
|
const [scrapeAfter, setScrapeAfter] = useState(false)
|
||||||
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)
|
||||||
|
|
||||||
@@ -30,6 +31,7 @@ export function useStrmRepairForm() {
|
|||||||
base_url: trimmedBaseURL.replace(/\/+$/, '') || undefined,
|
base_url: trimmedBaseURL.replace(/\/+$/, '') || undefined,
|
||||||
dry_run: dryRun,
|
dry_run: dryRun,
|
||||||
refresh_library: refreshLibrary,
|
refresh_library: refreshLibrary,
|
||||||
|
scrape_after: !dryRun && refreshLibrary && scrapeAfter,
|
||||||
})
|
})
|
||||||
setResult(next)
|
setResult(next)
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
@@ -53,17 +55,24 @@ export function useStrmRepairForm() {
|
|||||||
await runRepair(true)
|
await runRepair(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const setRefreshLibraryEnabled = (value: boolean) => {
|
||||||
|
setRefreshLibrary(value)
|
||||||
|
if (!value) setScrapeAfter(false)
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
baseURL,
|
baseURL,
|
||||||
outputDir,
|
outputDir,
|
||||||
repairing: runningMode !== null,
|
repairing: runningMode !== null,
|
||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
|
scrapeAfter,
|
||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
onPreview,
|
onPreview,
|
||||||
onRepair,
|
onRepair,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setOutputDir,
|
setOutputDir,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary: setRefreshLibraryEnabled,
|
||||||
|
setScrapeAfter,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
const [transferSubtitles, setTransferSubtitles] = useState(true)
|
const [transferSubtitles, setTransferSubtitles] = useState(true)
|
||||||
const [missingOnly, setMissingOnly] = useState(false)
|
const [missingOnly, setMissingOnly] = useState(false)
|
||||||
const [refreshLibrary, setRefreshLibrary] = useState(true)
|
const [refreshLibrary, setRefreshLibrary] = useState(true)
|
||||||
|
const [scrapeAfter, setScrapeAfter] = useState(false)
|
||||||
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)
|
||||||
|
|
||||||
@@ -75,6 +76,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
transfer_subtitles: transferSubtitles,
|
transfer_subtitles: transferSubtitles,
|
||||||
missing_only: missingOnly,
|
missing_only: missingOnly,
|
||||||
refresh_library: refreshLibrary,
|
refresh_library: refreshLibrary,
|
||||||
|
scrape_after: !dryRun && refreshLibrary && scrapeAfter,
|
||||||
})
|
})
|
||||||
setResult(next)
|
setResult(next)
|
||||||
if (dryRun) {
|
if (dryRun) {
|
||||||
@@ -98,6 +100,11 @@ export function useStrmTreeGenerateForm() {
|
|||||||
await runGenerate(true)
|
await runGenerate(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const setRefreshLibraryEnabled = (value: boolean) => {
|
||||||
|
setRefreshLibrary(value)
|
||||||
|
if (!value) setScrapeAfter(false)
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
baseURL,
|
baseURL,
|
||||||
batchLimit,
|
batchLimit,
|
||||||
@@ -115,6 +122,7 @@ export function useStrmTreeGenerateForm() {
|
|||||||
result,
|
result,
|
||||||
runningMode,
|
runningMode,
|
||||||
refreshLibrary,
|
refreshLibrary,
|
||||||
|
scrapeAfter,
|
||||||
setBaseURL,
|
setBaseURL,
|
||||||
setBatchLimit,
|
setBatchLimit,
|
||||||
setCleanup,
|
setCleanup,
|
||||||
@@ -124,7 +132,8 @@ export function useStrmTreeGenerateForm() {
|
|||||||
setOverwrite,
|
setOverwrite,
|
||||||
setPathsText,
|
setPathsText,
|
||||||
setProvider,
|
setProvider,
|
||||||
setRefreshLibrary,
|
setRefreshLibrary: setRefreshLibraryEnabled,
|
||||||
|
setScrapeAfter,
|
||||||
setSourceRoot,
|
setSourceRoot,
|
||||||
setTreeText,
|
setTreeText,
|
||||||
setTransferSubtitles,
|
setTransferSubtitles,
|
||||||
|
|||||||
Reference in New Issue
Block a user