studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 64 Pull Requests 5 Releases Wiki Activity

Manager: allow setup to finish without Blender #104306

Manually merged
Sybren A. Stüvel merged 34 commits from abelli/flamenco:issue100195 into main 2024-09-09 11:22:42 +02:00
Conversation 17 Commits 34 Files Changed 9 +8 -7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 30aa468621 - Show all commits

15
internal/manager/api_impl/meta.go
View File

@ -274,14 +274,15 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error {
logger = logger.With().Interface("config", setupAssistantCfg).Logger() logger = logger.With().Interface("config", setupAssistantCfg).Logger()
isConfigIncomplete := setupAssistantCfg.BlenderExecutable.Cause == nil || isConfigInvalid := setupAssistantCfg.StorageLocation == "" ||
setupAssistantCfg.BlenderExecutable.Input == nil || setupAssistantCfg.BlenderExecutable.IsUsable == nil
setupAssistantCfg.BlenderExecutable.IsUsable == nil ||
setupAssistantCfg.BlenderExecutable.Path == nil
if setupAssistantCfg.BlenderExecutable.Source != "default" && isConfigIncomplete { isConfigIncomplete := setupAssistantCfg.BlenderExecutable.Path == nil ||
logger.Warn().Msg("setup assistant: configuration is incomplete, unable to accept") setupAssistantCfg.BlenderExecutable.Input == nil
return sendAPIError(e, http.StatusBadRequest, "configuration is incomplete")
if isConfigInvalid || setupAssistantCfg.BlenderExecutable.Source != "default" && isConfigIncomplete {
logger.Warn().Msg("setup assistant: configuration is invalid or incomplete, unable to accept")
return sendAPIError(e, http.StatusBadRequest, "configuration is invalid or incomplete")
} }
conf := f.config.Get() conf := f.config.Get()