From 428c6442d5fc1716386394081e91f87c6410feca Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Wed, 6 Oct 2021 13:44:15 +1100 Subject: [PATCH] Revert "Make generate args optional (#1801)" (#1808) This reverts commit 1e89e9dd821044195c25ae4cd7779f96c671c718. --- graphql/schema/types/metadata.graphql | 18 +++++++++--------- pkg/manager/manager_tasks.go | 10 ++++++++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/graphql/schema/types/metadata.graphql b/graphql/schema/types/metadata.graphql index eaf78078e..9a57ea9fe 100644 --- a/graphql/schema/types/metadata.graphql +++ b/graphql/schema/types/metadata.graphql @@ -1,15 +1,15 @@ scalar Upload input GenerateMetadataInput { - sprites: Boolean! = false - previews: Boolean! = false - imagePreviews: Boolean! = false + sprites: Boolean! + previews: Boolean! + imagePreviews: Boolean! previewOptions: GeneratePreviewOptionsInput - markers: Boolean! = false - markerImagePreviews: Boolean! = false - markerScreenshots: Boolean! = false - transcodes: Boolean! = false - phashes: Boolean! = false + markers: Boolean! + markerImagePreviews: Boolean! + markerScreenshots: Boolean! + transcodes: Boolean! + phashes: Boolean! """scene ids to generate for""" sceneIDs: [ID!] @@ -17,7 +17,7 @@ input GenerateMetadataInput { markerIDs: [ID!] """overwrite existing media""" - overwrite: Boolean! = false + overwrite: Boolean } input GeneratePreviewOptionsInput { diff --git a/pkg/manager/manager_tasks.go b/pkg/manager/manager_tasks.go index a4550dee4..27f341428 100644 --- a/pkg/manager/manager_tasks.go +++ b/pkg/manager/manager_tasks.go @@ -237,7 +237,10 @@ func (s *singleton) Generate(ctx context.Context, input models.GenerateMetadataI fileNamingAlgo := config.GetVideoFileNamingAlgorithm() - overwrite := input.Overwrite + overwrite := false + if input.Overwrite != nil { + overwrite = *input.Overwrite + } generatePreviewOptions := input.PreviewOptions if generatePreviewOptions == nil { @@ -644,7 +647,10 @@ func (s *singleton) neededGenerate(scenes []*models.Scene, input models.Generate }() fileNamingAlgo := config.GetInstance().GetVideoFileNamingAlgorithm() - overwrite := input.Overwrite + overwrite := false + if input.Overwrite != nil { + overwrite = *input.Overwrite + } logger.Infof("Counting content to generate...") for _, scene := range scenes {