studio/flamenco
studio/flamenco
11
29
Fork 38
Code Issues 62 Pull Requests 8 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 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09b95037a6 - Show all commits

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

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