Revert "Make generate args optional (#1801)" (#1808)

This reverts commit 1e89e9dd82.
This commit is contained in:
WithoutPants 2021-10-06 13:44:15 +11:00 committed by GitHub
parent 1e89e9dd82
commit 428c6442d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions

View file

@ -1,15 +1,15 @@
scalar Upload scalar Upload
input GenerateMetadataInput { input GenerateMetadataInput {
sprites: Boolean! = false sprites: Boolean!
previews: Boolean! = false previews: Boolean!
imagePreviews: Boolean! = false imagePreviews: Boolean!
previewOptions: GeneratePreviewOptionsInput previewOptions: GeneratePreviewOptionsInput
markers: Boolean! = false markers: Boolean!
markerImagePreviews: Boolean! = false markerImagePreviews: Boolean!
markerScreenshots: Boolean! = false markerScreenshots: Boolean!
transcodes: Boolean! = false transcodes: Boolean!
phashes: Boolean! = false phashes: Boolean!
"""scene ids to generate for""" """scene ids to generate for"""
sceneIDs: [ID!] sceneIDs: [ID!]
@ -17,7 +17,7 @@ input GenerateMetadataInput {
markerIDs: [ID!] markerIDs: [ID!]
"""overwrite existing media""" """overwrite existing media"""
overwrite: Boolean! = false overwrite: Boolean
} }
input GeneratePreviewOptionsInput { input GeneratePreviewOptionsInput {

View file

@ -237,7 +237,10 @@ func (s *singleton) Generate(ctx context.Context, input models.GenerateMetadataI
fileNamingAlgo := config.GetVideoFileNamingAlgorithm() fileNamingAlgo := config.GetVideoFileNamingAlgorithm()
overwrite := input.Overwrite overwrite := false
if input.Overwrite != nil {
overwrite = *input.Overwrite
}
generatePreviewOptions := input.PreviewOptions generatePreviewOptions := input.PreviewOptions
if generatePreviewOptions == nil { if generatePreviewOptions == nil {
@ -644,7 +647,10 @@ func (s *singleton) neededGenerate(scenes []*models.Scene, input models.Generate
}() }()
fileNamingAlgo := config.GetInstance().GetVideoFileNamingAlgorithm() fileNamingAlgo := config.GetInstance().GetVideoFileNamingAlgorithm()
overwrite := input.Overwrite overwrite := false
if input.Overwrite != nil {
overwrite = *input.Overwrite
}
logger.Infof("Counting content to generate...") logger.Infof("Counting content to generate...")
for _, scene := range scenes { for _, scene := range scenes {