From 5aec789e5b051d85785fc168c3f167c75d68ac90 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Fri, 10 Apr 2020 14:20:13 -0400 Subject: [PATCH 1/3] direct JPG saving --- src/api/v2/util/process-multisequencer.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/api/v2/util/process-multisequencer.js b/src/api/v2/util/process-multisequencer.js index 56c6cb1..7265d87 100644 --- a/src/api/v2/util/process-multisequencer.js +++ b/src/api/v2/util/process-multisequencer.js @@ -63,21 +63,22 @@ let cb = (out) => { } else { changeStatus("uploading"); console.log("Done processing for " + pid); - var html = `` - html += `` - html += `` - fs.writeFileSync(path.join(__dirname, `../../../../temp/export${pid}.html`), html); - mapknitterBucket.upload(path.join(__dirname, `../../../../temp/export${pid}.html`), { + var data = out.replace(/^data:image\/\w+;base64,/, ""); // strip off the data: url prefix to get just the base64-encoded bytes + var buf = new Buffer(data, 'base64'); + var filename = `export${pid}.jpg` + var imgPath = path.join(__dirname, `../../../../temp/${filename}`); + fs.writeFileSync(imgPath, buf); + mapknitterBucket.upload(imgPath, { gzip: true }).then(() => { mapknitterBucket - .file(`export${pid}.html`) + .file(filename) .makePublic(); - fs.unlinkSync(path.join(__dirname, `../../../../temp/export${pid}.html`)); - mapknitterBucket.file(`export${pid}.html`) + fs.unlinkSync(path.join(__dirname, imgPath)); + mapknitterBucket.file(filename) .getMetadata() .then((data) => changeStatus("uploaded", data[0].mediaLink)); - }); + }); } } @@ -105,4 +106,4 @@ function changeStatus(newStatus, exportLink) { console.log("Successfully removed local files!"); }); }); -} \ No newline at end of file +} From 9b7a32481b3933632305c4c76d716aed9604a0c8 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Fri, 10 Apr 2020 14:24:16 -0400 Subject: [PATCH 2/3] bump to v1.1.1 for JPG file saving tweak --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e113704..04bdece 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "is", - "version": "1.1.0", + "version": "1.1.1", "description": "", "main": "src/server.js", "scripts": { From 544f27a90d8346539bb66c9a8269a2c7f80dd2c8 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Fri, 10 Apr 2020 15:35:53 -0400 Subject: [PATCH 3/3] writeFileSync => writeFile --- src/api/v2/util/process-multisequencer.js | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/api/v2/util/process-multisequencer.js b/src/api/v2/util/process-multisequencer.js index 7265d87..fe2a9fd 100644 --- a/src/api/v2/util/process-multisequencer.js +++ b/src/api/v2/util/process-multisequencer.js @@ -67,18 +67,19 @@ let cb = (out) => { var buf = new Buffer(data, 'base64'); var filename = `export${pid}.jpg` var imgPath = path.join(__dirname, `../../../../temp/${filename}`); - fs.writeFileSync(imgPath, buf); - mapknitterBucket.upload(imgPath, { - gzip: true - }).then(() => { - mapknitterBucket - .file(filename) - .makePublic(); - fs.unlinkSync(path.join(__dirname, imgPath)); - mapknitterBucket.file(filename) - .getMetadata() - .then((data) => changeStatus("uploaded", data[0].mediaLink)); - }); + fs.writeFile(imgPath, buf, onWrote() { + mapknitterBucket.upload(imgPath, { + gzip: true + }).then(() => { + mapknitterBucket + .file(filename) + .makePublic(); + fs.unlinkSync(path.join(__dirname, imgPath)); + mapknitterBucket.file(filename) + .getMetadata() + .then((data) => changeStatus("uploaded", data[0].mediaLink)); + }); + }); } }