@nexrender/core 1.39.8 → 1.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "@nexrender/core",
3
- "version": "1.39.8",
3
+ "version": "1.40.0",
4
4
  "main": "src/index.js",
5
5
  "author": "Inlife",
6
6
  "scripts": {
7
7
  "pkg-prelink": "node ../../misc/prelink.js"
8
8
  },
9
9
  "dependencies": {
10
- "@nexrender/types": "^1.38.0",
10
+ "@nexrender/types": "^1.40.0",
11
11
  "data-uri-to-buffer": "^3.0.0",
12
12
  "file-uri-to-path": "^2.0.0",
13
13
  "is-wsl": "^2.2.0",
@@ -30,5 +30,5 @@
30
30
  "publishConfig": {
31
31
  "access": "public"
32
32
  },
33
- "gitHead": "a2bfede0125fcc1d13113df5f3de48b99fcb4348"
33
+ "gitHead": "9c2ab173beeed9a531a924841576ee71943817d3"
34
34
  }
@@ -1,4 +1,5 @@
1
1
  const rimraf = require('rimraf')
2
+ const path = require('path')
2
3
 
3
4
  /**
4
5
  * Clean up all workpath files and remove folder
@@ -11,12 +12,12 @@ module.exports = function(job, settings) {
11
12
 
12
13
  return new Promise((resolve) => {
13
14
  settings.logger.log(`[${job.uid}] cleaning up...`);
14
-
15
+
15
16
  // sometimes this attribute (workpath) is undefined
16
17
  if (!job.workpath) {
17
- job.workpath = settings.workpath.concat('/', job.uid, '/')
18
+ job.workpath = path.join(settings.workpath, job.uid)
18
19
  }
19
-
20
+
20
21
  rimraf(job.workpath, {glob: false}, (err) => {
21
22
  if (!err) {
22
23
  settings.logger.log(`[${job.uid}] Temporary AfterEffects project deleted. If you want to inspect it for debugging, use "--skip-cleanup"`)
@@ -190,6 +190,13 @@ module.exports = (job, settings) => {
190
190
  const existsMovOutputFile = fs.existsSync(movOutputFile)
191
191
  if (existsMovOutputFile) {
192
192
  job.output = movOutputFile
193
+ } else {
194
+ // AE 2023 use mp4 output files
195
+ const mp4OutputFile = outputFile.replace(/\.avi$/g, '.mp4')
196
+ const existsMp4OutputFile = fs.existsSync(mp4OutputFile)
197
+ if (existsMp4OutputFile) {
198
+ job.output = mp4OutputFile
199
+ }
193
200
  }
194
201
 
195
202
  if (!fs.existsSync(job.output)) {