@nexrender/core 1.47.0 → 1.48.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,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nexrender/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.48.0",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"author": "Inlife",
|
|
6
6
|
"homepage": "https://www.nexrender.com",
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"@nexrender/action-upload": "^1.0.0",
|
|
31
31
|
"@nexrender/provider-ftp": "^1.17.2",
|
|
32
32
|
"@nexrender/provider-gs": "^1.21.3",
|
|
33
|
-
"@nexrender/provider-nx": "^1.
|
|
33
|
+
"@nexrender/provider-nx": "^1.47.0",
|
|
34
34
|
"@nexrender/provider-s3": "^1.21.4",
|
|
35
35
|
"@nexrender/provider-sftp": "^1.37.9"
|
|
36
36
|
},
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "2ccc2286c1776c3c0ae2e1ce752b5382fe385a7a"
|
|
41
41
|
}
|
package/src/assets/nexrender.jsx
CHANGED
|
@@ -17,7 +17,7 @@ nexrender.typesMatch = function (types, layer) {
|
|
|
17
17
|
}).length > 0;
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
nexrender.replaceFootage = function (layer, filepath) {
|
|
20
|
+
nexrender.replaceFootage = function (layer, filepath, sequence) {
|
|
21
21
|
if (!layer) { return false; }
|
|
22
22
|
|
|
23
23
|
var file = new File(filepath);
|
|
@@ -27,9 +27,10 @@ nexrender.replaceFootage = function (layer, filepath) {
|
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
var importOptions = new ImportOptions(file);
|
|
30
|
-
|
|
30
|
+
|
|
31
|
+
if (sequence) { importOptions.sequence = true;}
|
|
31
32
|
var theImport = app.project.importFile(importOptions);
|
|
32
|
-
|
|
33
|
+
|
|
33
34
|
var oldFootage = layer.source || null;
|
|
34
35
|
|
|
35
36
|
layer.replaceSource(theImport, true);
|
package/src/index.js
CHANGED
|
@@ -158,6 +158,7 @@ const render = (jobConfig, settings = {}) => {
|
|
|
158
158
|
.then(job => state(job, settings, postrender, 'postrender'))
|
|
159
159
|
.then(job => state(job, settings, cleanup, 'cleanup'))
|
|
160
160
|
.catch(e => {
|
|
161
|
+
console.log('catching the error internally')
|
|
161
162
|
state(job, settings, cleanup, 'cleanup');
|
|
162
163
|
throw e;
|
|
163
164
|
});
|
package/src/tasks/download.js
CHANGED
|
@@ -27,7 +27,7 @@ const download = (job, settings, asset) => {
|
|
|
27
27
|
|
|
28
28
|
/* prevent same name file collisions */
|
|
29
29
|
if (fs.existsSync(path.join(job.workpath, destName))) {
|
|
30
|
-
destName = Math.random().toString(36).substring(2) + path.extname(asset.src);
|
|
30
|
+
destName = Math.random().toString(36).substring(2) + path.extname(asset.src).split('?')[0];
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
|
|
@@ -3,8 +3,8 @@ const { checkForWSL } = require('../../helpers/path')
|
|
|
3
3
|
|
|
4
4
|
const wrapFootage = (job, settings, { dest, ...asset }) => (`(function() {
|
|
5
5
|
${selectLayers(job, asset, `function(layer) {
|
|
6
|
-
nexrender.replaceFootage(layer, '${checkForWSL(dest.replace(/\\/g, "\\\\"), settings)}')
|
|
6
|
+
nexrender.replaceFootage(layer, '${checkForWSL(dest.replace(/\\/g, "\\\\"), settings)}', ${asset.sequence ? 'true' : 'false'})
|
|
7
7
|
}`)}
|
|
8
8
|
})();\n`)
|
|
9
9
|
|
|
10
|
-
module.exports = wrapFootage
|
|
10
|
+
module.exports = wrapFootage
|