image-size - npm Package Compare versions

Comparing version 0.2.5 to 0.3.0

Contributors.md

@@ -7,1 +7,3 @@ ##### Contributors
 * [Linus Unnebäck](https://github.com/LinusU)
+* [Ross Johnson](https://github.com/rossj) (Mazira, LLC)
+

lib/index.js

@@ -21,3 +21,3 @@ 'use strict';
 
-function lookup (buffer, filepath, callback) {
+function lookup (buffer, filepath) {
   // detect the file type.. don't rely on the extension
@@ -30,5 +30,2 @@ var type = detector(buffer, filepath);
     if (size !== false) {
-      if (callback) {
-        callback(null, size);
-      }
       return size;
@@ -39,8 +36,3 @@ }
   // throw up, if we don't understand the file
-  var err = new TypeError('unsupported file type');
-  if (callback) {
-    callback(err);
-  } else {
-    throw err;
-  }
+  throw new TypeError('unsupported file type');
 }
@@ -51,12 +43,8 @@
   fs.open(filepath, 'r', function (err, descriptor) {
-    if (err) { throw err; }
+    if (err) { return callback(err); }
     // read first buffer block from the file, asynchronously
     fs.read(descriptor, buffer, 0, bufferSize, 0, function (err) {
-      if (err) { throw err; }
+      if (err) { return callback(err); }
       // close the file, we are done
-      fs.close(descriptor, function (err) {
-        if (err) { throw err; }
-        // no errors, return the buffer
-        callback();
-      });
+      fs.close(descriptor, callback);
     });
@@ -96,5 +84,11 @@ });
   if (typeof callback === 'function') {
-    asyncFileToBuffer(filepath, buffer, function () {
+    asyncFileToBuffer(filepath, buffer, function (err) {
+      if (err) { return callback(err); }
+
       // return the dimensions
-      lookup(buffer, filepath, callback);
+      try {
+        callback(null, lookup(buffer, filepath));
+      } catch (err) {
+        callback(err);
+      }
     });
@@ -101,0 +95,0 @@ } else {

package.json

 {
   "name": "image-size",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "get dimensions of any image file",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Worsened metrics

Total package byte prevSize

16725

-0.3%

Lines of code

379

-1.81%

No dependency changes