Manager: allow setup to finish without Blender #104306
@ -265,9 +265,11 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error {
|
||||
|
||||
logger = logger.With().Interface("config", setupAssistantCfg).Logger()
|
||||
|
||||
if setupAssistantCfg.StorageLocation == "" ||
|
||||
isConfigIncomplete := setupAssistantCfg.StorageLocation == "" ||
|
||||
!setupAssistantCfg.BlenderExecutable.IsUsable ||
|
||||
setupAssistantCfg.BlenderExecutable.Path == "" {
|
||||
setupAssistantCfg.BlenderExecutable.Path == ""
|
||||
|
||||
if isConfigIncomplete && setupAssistantCfg.BlenderExecutable.Source != "default" {
|
||||
logger.Warn().Msg("setup assistant: configuration is incomplete, unable to accept")
|
||||
return sendAPIError(e, http.StatusBadRequest, "configuration is incomplete")
|
||||
}
|
||||
@ -277,7 +279,7 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error {
|
||||
|
||||
var executable string
|
||||
switch setupAssistantCfg.BlenderExecutable.Source {
|
||||
case api.BlenderPathSourceFileAssociation:
|
||||
case api.BlenderPathSourceFileAssociation, api.BlenderPathSourceDefault:
|
||||
// The Worker will try to use the file association when the command is set
|
||||
// to the string "blender".
|
||||
executable = "blender"
|
||||
|
@ -355,11 +355,11 @@ export default {
|
||||
},
|
||||
blenderFromDefaultSource() {
|
||||
return {
|
||||
input: 'blender',
|
||||
path: 'blender',
|
||||
input: '',
|
||||
path: '',
|
||||
source: 'default',
|
||||
is_usable: true,
|
||||
cause: 'blender',
|
||||
cause: '',
|
||||
};
|
||||
},
|
||||
setupConfirmIsClickable() {
|
||||
|
Loading…
Reference in New Issue
Block a user