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