Allow optional cropping of images while uploading;

robinluog · May 19, 2016 · 95e5952 · 95e5952
1 parent 882135a
commit 95e5952
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/Helpers.js b/Helpers.js
@@ -32,6 +32,11 @@ const Helpers = {
     res.setHeader('Access-Control-Allow-Method', 'GET');
     next();
   },
+  send400(res, message = '') {
+    log.log('warning', `Invalid request was done: ${message}`);
+    res.statusCode = 400;
+    res.end(message);
+  },
   send404(res, url, error = true) {
     if (error) {
       log.log('warning', `404 Error for ${url}`);

diff --git a/index.js b/index.js
@@ -270,7 +270,7 @@ const Image = {
     // Upload the RAW image to disk, stripped of its extension
     // First check the token
     const sentToken = req.headers['x-token'];
-    const matches = req.url.match(/^\/(.*)\.([^.]+)$/);
+    const matches = req.path.match(/^\/(.*)\.([^.]+)$/);
     log.log('info', `Requested image upload for image_id ${matches[1]} with token ${sentToken}`);
     if (!parsing.supportedFileType(matches[2])) {
       helpers.send415(res, matches[2]);
@@ -295,9 +295,19 @@ const Image = {
           const temp_path = files.image.path;
           const destination_path = `${config.get('originals_dir')}/${matches[1]}`;
 
-          im(temp_path)
-            .autoOrient()
-            .write(destination_path, (err) => {
+          let oriented = im(temp_path).autoOrient();
+          if ( req.query.x && req.query.y && req.query.width && req.query.height ) {
+            const x = parseInt(req.query.x, 10);
+            const y = parseInt(req.query.y, 10);
+            const width = parseInt(req.query.width, 10);
+            const height = parseInt(req.query.height, 10);
+            if ( isNaN(x) || isNaN(y) || isNaN(width) || isNaN(height)) {
+              helpers.send400('Given crop parameters are invalid');
+              return;
+            }
+            oriented = oriented.crop(width, height, x, y);
+          }
+          oriented.write(destination_path, (err) => {
               if (err) {
                 helpers.send500(res, err);
                 return;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "live-image-resize",
-  "version": "0.1.1",
+  "version": "1.1.0",
   "description": "Dynamic image resizing service, using AWS S3 as a cache",
   "main": "index.js",
   "dependencies": {