Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-02-25 16:54:44 +01:00
Code Issues Projects Releases Wiki Activity

Correctly load generate options when generating from tasks page (#6139)

Browse source
This commit is contained in:
WithoutPants 2025-10-15 16:52:54 +11:00 committed by GitHub
parent eb816d2e4f
commit e1b3b33c24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
View file

@ -160,30 +160,6 @@ export const LibraryTasks: React.FC = () => {
setGenerateOptions(withoutTypename(generate));
}
if (configuration?.general) {
const { general } = configuration;
setGenerateOptions((existing) => ({
...existing,
previewOptions: {
...existing.previewOptions,
previewSegments:
general.previewSegments ??
existing.previewOptions?.previewSegments,
previewSegmentDuration:
general.previewSegmentDuration ??
existing.previewOptions?.previewSegmentDuration,
previewExcludeStart:
general.previewExcludeStart ??
existing.previewOptions?.previewExcludeStart,
previewExcludeEnd:
general.previewExcludeEnd ??
existing.previewOptions?.previewExcludeEnd,
previewPreset:
general.previewPreset ?? existing.previewOptions?.previewPreset,
},
}));
}
setConfigRead(true);
}
}, [configuration, configRead, taskDefaults, loading]);
@ -291,7 +267,30 @@ export const LibraryTasks: React.FC = () => {
async function onGenerateClicked() {
try {
await mutateMetadataGenerate(generateOptions);
// insert preview options here instead of loading them
const general = configuration?.general;
await mutateMetadataGenerate({
...generateOptions,
previewOptions: {
...generateOptions.previewOptions,
previewSegments:
general?.previewSegments ??
generateOptions.previewOptions?.previewSegments,
previewSegmentDuration:
general?.previewSegmentDuration ??
generateOptions.previewOptions?.previewSegmentDuration,
previewExcludeStart:
general?.previewExcludeStart ??
generateOptions.previewOptions?.previewExcludeStart,
previewExcludeEnd:
general?.previewExcludeEnd ??
generateOptions.previewOptions?.previewExcludeEnd,
previewPreset:
general?.previewPreset ??
generateOptions.previewOptions?.previewPreset,
},
});
Toast.success(
intl.formatMessage(
{ id: "config.tasks.added_job_to_queue" },