mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-02 07:01:30 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡ Further improve composite operation

Browse source
This commit is contained in:
Jan Oberhauser 2020-12-26 21:30:15 +01:00
parent 062210d8b9
commit a19be309f7
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
packages/nodes-base/nodes/EditImage.node.ts
View file

@ -18,7 +18,6 @@ import {
} from 'path'; } from 'path';
import { import {
writeFile as fsWriteFile, writeFile as fsWriteFile,
writeFileSync as fsWriteFileSync,
} from 'fs'; } from 'fs';
import { promisify } from 'util'; import { promisify } from 'util';
const fsWriteFileAsync = promisify(fsWriteFile); const fsWriteFileAsync = promisify(fsWriteFile);
@ -1090,7 +1089,13 @@ export class EditImage implements INodeType {
cleanupFunctions.push(cleanup); cleanupFunctions.push(cleanup);
await fsWriteFileAsync(fd, Buffer.from(item.binary![operationData.dataPropertyNameComposite as string].data, BINARY_ENCODING)); await fsWriteFileAsync(fd, Buffer.from(item.binary![operationData.dataPropertyNameComposite as string].data, BINARY_ENCODING));
gmInstance = gmInstance!.composite(path).geometry(geometryString); if (operations[0].operation === 'create') {
// It seems like if the image gets created newly we have to create a new gm instance
// else it fails for some reason
gmInstance = gm(gmInstance!.stream('png')).geometry(geometryString).composite(path);
} else {
gmInstance = gmInstance!.geometry(geometryString).composite(path);
}
if (operations.length !== i + 1) { if (operations.length !== i + 1) {
// If there are other operations after the current one create a new gm instance // If there are other operations after the current one create a new gm instance
@ -1179,13 +1184,15 @@ export class EditImage implements INodeType {
// but the incoming data does not get changed. // but the incoming data does not get changed.
Object.assign(newItem.binary, item.binary); Object.assign(newItem.binary, item.binary);
// Make a deep copy of the binary data we change // Make a deep copy of the binary data we change
newItem.binary![dataPropertyName as string] = JSON.parse(JSON.stringify(newItem.binary![dataPropertyName as string])); if (newItem.binary![dataPropertyName as string]) {
} else { newItem.binary![dataPropertyName as string] = JSON.parse(JSON.stringify(newItem.binary![dataPropertyName as string]));
newItem.binary = { }
[dataPropertyName as string]: { }
data: '',
mimeType: '', if (newItem.binary![dataPropertyName as string] === undefined) {
}, newItem.binary![dataPropertyName as string] = {
data: '',
mimeType: '',
}; };
} }