1602 Commits

Author SHA1 Message Date
Sybren A. Stüvel
2e1c0b83bf Simple Blender Render: refuse to render videos
The original idea behind this job type was that it would work equally
well for videos as for images, but that was never really well tested.
It's currently broken, so this commit removes video support altogether.
2022-08-31 16:25:23 +02:00
Sybren A. Stüvel
eb89984db8 Simple Blender Render: remove blender_cmd setting
Remove the `blender_cmd` setting, and just hard-code it to `{blender}`.
The Blender add-on was already passing this string, and it's very unlikely
that people are already writing custom add-ons to pass something different.
It provided flexibility that was untested, so it's better to simplify
things.
2022-08-31 16:24:34 +02:00
Sybren A. Stüvel
25dd7b214b Manager: remove superfluous "error compiling job: " prefix from message
The wrapped error already mentioned it was about job compilation.
2022-08-31 16:23:10 +02:00
Sybren A. Stüvel
fa69cc102b Add-on: clearer error message when job compiler refuses the job
Blender now shows the actual returned error from the Manager when job
submission fails, rather than a generic "failed" message.
2022-08-31 16:22:34 +02:00
Sybren A. Stüvel
6f876658c1 Add-on: remove debug print 2022-08-31 16:04:00 +02:00
Sybren A. Stüvel
4fda35f563 Webapp: don't log all task updates to the JavaScript console
Just a little performance tweak.
2022-08-31 15:57:01 +02:00
Sam Miller
5a25952167 Website: Fix documentation of Flamenco Worker YAML task types list
The example on the project website is incorrect:

```
task_types: blender, ffmpeg, file-management, misc
```

It results in an error:

```
loading configuration: yaml: unmarshal errors:\n line 2:
  cannot unmarshal ||str "blender..." into []string
```

The fix seems to be adding square brackets around the list of comma
delineated tasks:

```
task_types: [blender, ffmpeg, file-management, misc]
```

This results in output with the confirmation that
`taskType=["blender","ffmpeg","file-management","misc"]`
2022-08-31 15:42:58 +02:00
Sybren A. Stüvel
6e401f882f Worker: fix typo 'FFmepg' -> 'FFmpeg'
Just a logging message fix, no functional changes.
2022-08-31 15:34:42 +02:00
Sybren A. Stüvel
e394e75f64 update-version: also update latest version on project website
`make update-version` now also updates
`web/project-website/data/flamenco.yaml` so that the new version is
listed as the latest one on flamenco.blender.org.

Note that such a change will only be visible online after publishing the
site with `make project-website`. Be sure to only do this after the
build has been uploaded there, to avoid dead links.
2022-08-31 15:14:46 +02:00
Sybren A. Stüvel
f64ba3e0be Update CHANGELOG.md 2022-08-31 15:08:32 +02:00
Sybren A. Stüvel
9da75eef04 Worker: fix issue running FFmpeg
The `exeArg` command parameter was incorrectly always expected. It's now
optional, as it should be.
2022-08-31 15:00:46 +02:00
Sybren A. Stüvel
a70bfb87d0 Make: prevent repeating version strings
In the case where the current git HEAD matches the latest release tag,
the version reported by Flamenco was something like
`3.0-beta2-3.0-beta2`, where the first is `$VERSION` and the other is
`$GITHASH`.

This is now prevented, and `$GITHASH` will always be something that's
not a repeat of `$VERSION`.
2022-08-31 14:27:53 +02:00
Sybren A. Stüvel
f2947cc133 Website: add instructions on how to release a new version of Flamenco 2022-08-31 12:43:16 +02:00
Sybren A. Stüvel
5402444d5b Website: add link to SHA256 checksum file 2022-08-31 12:37:24 +02:00
Sybren A. Stüvel
e4a7708cb6 Make: include sha256sum when publishing packages 2022-08-31 12:34:25 +02:00
Sybren A. Stüvel
f16c62abc0 Make: fix publishing of packages
Fix some path inconsistencies between Windows package and the others.
2022-08-31 12:34:09 +02:00
Sybren A. Stüvel
5ff13265a0 Website: bump latest available Flamenco version to 3.0-beta2 2022-08-31 12:26:10 +02:00
Sybren A. Stüvel
fae82d32fc Website: add upgrade information
Add steps on how to upgrade to the download page. This is aimed at
upgrading beta1 to beta2, and thus suggests nuking the install and
starting afresh.
2022-08-31 12:26:01 +02:00
Sybren A. Stüvel
db3e3f0d12 Update CHANGELOG.md
Add a few links to commits, and mark 3.0-beta2 as released today.
2022-08-31 12:15:56 +02:00
Sybren A. Stüvel
de8da6eac5 Bumped version to 3.0-beta2 2022-08-31 12:10:02 +02:00
Sybren A. Stüvel
3ecdeacc80 Add-on: fix wrong parameter being passed 2022-08-31 12:08:46 +02:00
Sybren A. Stüvel
31cf0a4ecc Implement getSharedStorage operation & use it in the add-on
Implement the `getSharedStorage` operation in the Manager, and use it in
the add-on to get the shared storage location in a way that makes sense
for the platform of the user.

Manifest task: T100196
2022-08-31 11:44:37 +02:00
Sybren A. Stüvel
31769bcdf2 Manager: always set config.currentGOOS
This variable is used in tests to mock the current OS, but wasn't set
during normal operation of the Manager. This caused issues with the
two-way variable system.
2022-08-31 11:43:28 +02:00
Sybren A. Stüvel
0a1e1efc41 OAPI: regenerate code 2022-08-31 11:42:46 +02:00
Sybren A. Stüvel
48a1c06277 OAPI: add operation to get the shared storage, for current platform
Add an operation `getSharedStorage` that can return the shared storage
location, adjusted for the given audience & platform. This uses the
two-way variables system to adjust the Manager's configuration.
2022-08-31 11:38:14 +02:00
Sybren A. Stüvel
bb377e7572 Add-on: fix typo causing an AttributeError 2022-08-31 11:37:16 +02:00
Sybren A. Stüvel
413e5c71e2 Add-on: fix mypy warning
No functional changes.
2022-08-31 11:35:31 +02:00
Sybren A. Stüvel
59f41d0546 Add-on: show warning when versions are not matching
Before submitting a job, the add-on now checks the version of the Manager.
If this is not the same version of the add-on, a warning is shown and a
"Force Submit" button appears. This makes it both explicit that something
is iffy and still allows for pushing forward.

This is important when upgrading Flamenco, because I'm sure many people
will forget to actually redownload and reinstall the add-on.
2022-08-31 09:27:50 +02:00
Sybren A. Stüvel
2eae682b9a Manager: actually return the short version in the GetVersion operation 2022-08-31 08:58:59 +02:00
Sybren A. Stüvel
ffaaf78c8c OAPI: regenerate code 2022-08-31 08:58:47 +02:00
Sybren A. Stüvel
f7366c87ce OAPI: include "short version" in the FlamencoVersion schema
Include a `shortversion` property in the `FlamencoVersion` schema, which
will just be the version number with the release phase (and not the git
hash, the number of commits since the last tag, and the `-dirty` suffix).
2022-08-31 08:58:05 +02:00
Sybren A. Stüvel
0b176eda96 Add-on: include error cause in "Error performing BAT pack" message
The error can get cryptic, but without opening the terminal people
otherwise would have no idea what's going on.
2022-08-31 08:09:11 +02:00
Sybren A. Stüvel
a7510f4042 Cleanup: addon, split ping_manager() into two functions
Split the `comms.ping_manager()` function into two: one that returns the
version & config of the Manager, and the other that reports on it.

This will make it possible to do the former without the latter in certain
other situations where we want to refresh the manager info in the
background.
2022-08-31 08:08:06 +02:00
Sybren A. Stüvel
4761e3d76e Website: replace note-hint with 'expand' block
It's slightly less distracting now.
2022-08-30 18:03:17 +02:00
Sybren A. Stüvel
d88587f989 Website: split up variables section & adjust for argument split
Split up the "Variables" section, and adjust the wording for the splitting
of `{blender}` into `{blender}` and `{blenderArgs}` (rFe5a20425c474).
2022-08-30 18:01:10 +02:00
Sybren A. Stüvel
5634ed3a6b Website: some more info about the Windows installation of NodeJS 2022-08-30 17:15:49 +02:00
Sybren A. Stüvel
ab14c97b2e Manager: fix tests on Windows
Fix some tests that were failing because some parts of Flamenco now use
native path separators instead of always-forward ones.
2022-08-30 15:44:14 +02:00
Sybren A. Stüvel
cbd8754595 Website: add link to 7Zip, necessary to get MingW-W64 installed 2022-08-30 15:43:39 +02:00
Sybren A. Stüvel
c499105424 Website: small wording change 2022-08-30 15:27:21 +02:00
Sybren A. Stüvel
fde1403c22 Website: fix header number 2022-08-30 15:25:30 +02:00
Sybren A. Stüvel
2dccfd195a Website: document how to get make
This is now only written for Debian/Ubuntu and Windows, and not for other
Linux flavours or macOS. Also the Windows documentation is very minimal,
but at least contains the info I always tend to forget.
2022-08-30 15:23:59 +02:00
Sybren A. Stüvel
e5a20425c4 Separate variables for Blender executable and its arguments.
Split "executable" from "its arguments" in blender & ffmpeg commands.

Use `{blenderArgs}` variable to hold the default Blender arguments,
instead of having both the executable and its arguments in `{blender}`.

The reason for this is to support backslashes in the Blender executable
path. These were interpreted as escape characters by the shell lexer.
The shell lexer based splitting is now only performed on the default
arguments, with the result that `C:\Program Files\Blender
Foundation\3.3\blender.exe` is now a valid value for `{blender}`.

This does mean that this is backward incompatible change, and that it
requires setting up Flamenco Manager again, and that older jobs will not
be able to be rerun.

It is recommended to remove `flamenco-manager.yaml`, restart Flamenco
Manager, and reconfigure via the setup assistant.
2022-08-30 14:58:16 +02:00
Sybren A. Stüvel
db9aca4a37 Add-on: allow setting job priority when submitting
The job priority was always intended to be settable when submitting, and
editable afterwards. This commit implements the former.
2022-08-30 14:51:48 +02:00
Sybren A. Stüvel
87684a0d92 Worker: change "running command" to "running Flamenco command" in log
There are Flamenco "commands" and CLI "commands", and it's nice to be
explicit about which is which. I'm sure this is needed in some other
areas as well.
2022-08-30 10:34:40 +02:00
Sybren A. Stüvel
afdbbcc1d8 Cleanup: explain a bit more in a comment 2022-08-30 10:34:05 +02:00
Sybren A. Stüvel
84cff6919a Worker: also log job UUID when running a task
Having both the job and task UUIDs in the log output helps when debugging.
2022-08-30 10:18:32 +02:00
Sybren A. Stüvel
c504e68d8e Manager: store the jobs implicit variable in platform-native notation
Don't change backslashes to forward slashes on Windows. Trying to use
forward slashes everywhere was a mistake, and this is one of the steps to
make it right.
2022-08-29 17:51:20 +02:00
Sybren A. Stüvel
20395e0e26 Manager: always start the variable lookup table with a fresh map
If the loaded config doesn't define the default variables, the latter
should not be found in the lookup table any more; this is now fixed.
2022-08-29 17:44:47 +02:00
Sybren A. Stüvel
4a201d47b4 Cleanup: add unit test for parsing backslashes in variable values
Backslashes can be included in two ways, as-is (which works fine) and
between double quotes (in which case they need escaping). This test checks
for both.
2022-08-29 17:28:40 +02:00
Sybren A. Stüvel
0c91fe93d0 Manager: only do pathsep localisation on two-way variables
By accident the Manager was performing slash localisation on all
command parameters, causing some math expressions for FFmpeg to fail.
2022-08-25 15:02:56 +02:00