diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02e66d0a..428a03ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ bugs in actually-released versions.
## 3.3 - in development
- Upgrade bundled FFmpeg from 5.0 to 5.1.
+- Rename the add-on download to `flamenco-addon.zip` (it used to be `flamenco3-addon.zip`). It still contains the same files as before, and in Blender the name of the add-on has not changed.
- Improve speed of queueing up >100 simultaneous job deletions.
- Improve logging of job deletion.
- Add Worker Tag support. Workers can be members of any number of tags. Workers will only work on jobs that are assigned to that tag. Jobs that do not have a tag will be available to all workers, regardless of their tag assignment. As a result, tagless workers will only work on tagless jobs.
diff --git a/Makefile b/Makefile
index 44f0fb50..e304cca9 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ webapp-static: addon-packer
# in `cmd/flamenco-manager/main.go`
yarn --cwd web/app build --outDir ../static --base=/app/ --logLevel warn
# yarn --cwd web/app build --outDir ../static --base=/app/ --minify false
- ./addon-packer -filename ${WEB_STATIC}/flamenco3-addon.zip
+ ./addon-packer -filename ${WEB_STATIC}/flamenco-addon.zip
@echo "Web app has been installed into ${WEB_STATIC}"
generate:
diff --git a/cmd/addon-packer/addon-packer.go b/cmd/addon-packer/addon-packer.go
index bfcbc82b..5b842ae3 100644
--- a/cmd/addon-packer/addon-packer.go
+++ b/cmd/addon-packer/addon-packer.go
@@ -147,7 +147,7 @@ func parseCliArgs() {
flag.BoolVar(&cliArgs.quiet, "quiet", false, "Only log warning-level and worse.")
flag.BoolVar(&cliArgs.debug, "debug", false, "Enable debug-level logging.")
flag.BoolVar(&cliArgs.trace, "trace", false, "Enable trace-level logging.")
- flag.StringVar(&cliArgs.filename, "filename", "web/static/flamenco3-addon.zip", "Filename to save the add-on to.")
+ flag.StringVar(&cliArgs.filename, "filename", "web/static/flamenco-addon.zip", "Filename to save the add-on to.")
flag.Parse()
}
diff --git a/cmd/flamenco-manager/webservice.go b/cmd/flamenco-manager/webservice.go
index df6359b7..295cb230 100644
--- a/cmd/flamenco-manager/webservice.go
+++ b/cmd/flamenco-manager/webservice.go
@@ -136,7 +136,11 @@ func buildWebService(
})
// Serve the Blender add-on. It's contained in the static files of the webapp.
- e.GET("/flamenco3-addon.zip", echo.WrapHandler(webAppHandler))
+ e.GET("/flamenco-addon.zip", echo.WrapHandler(webAppHandler))
+ e.GET("/flamenco3-addon.zip", func(c echo.Context) error {
+ return c.Redirect(http.StatusPermanentRedirect, "/flamenco-addon.zip")
+ })
+
// The favicons are also in the static files of the webapp.
e.GET("/favicon.png", echo.WrapHandler(webAppHandler))
e.GET("/favicon.ico", echo.WrapHandler(webAppHandler))
diff --git a/deploy.sh b/deploy.sh
index b4192a33..da26b930 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,7 +1,7 @@
#!/bin/bash
MY_DIR="$(dirname "$(readlink -e "$0")")"
-ADDON_ZIP="$MY_DIR/web/static/flamenco3-addon.zip"
+ADDON_ZIP="$MY_DIR/web/static/flamenco-addon.zip"
WORKER_TARGET=/shared/software/flamenco3-worker/flamenco-worker
TIMESTAMP=$(date +'%Y-%m-%d-%H%M%S')
diff --git a/web/app/src/App.vue b/web/app/src/App.vue
index 51da6358..c8a26ebd 100644
--- a/web/app/src/App.vue
+++ b/web/app/src/App.vue
@@ -16,7 +16,7 @@
Get the Blender add-on and submit a job.
- +Use the URL below in the add-on preferences. Click on it to copy.
{{ api() }}