fromBuffer

roygdavis · Jul 29, 2018 · a245736 · a245736
1 parent 4f25e76
commit a245736
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 15 deletions.
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/src/index.js b/src/index.js
@@ -230,18 +230,15 @@ function APPnHandler(buffer) {
 }
 
 /**
- * @param file {String}
+ * @param buffer {Buffer}
  * @returns {Object}
  * @example
- * var exif = sync("~/Picture/IMG_1981.JPG");
- * console.log(exif.createTime);
  */
-function sync(file) {
-  if (!file) {
-    throw new Error('File not found');
+function fromBuffer(buffer) {
+  if (!buffer) {
+    throw new Error('buffer not found');
   }
   data = undefined;
-  let buffer = fs.readFileSync(file);
   if (isValid(buffer)) {
     buffer = buffer.slice(SOIMarkerLength);
     data = {};
@@ -250,6 +247,21 @@ function sync(file) {
   return data;
 }
 
+/**
+ * @param file {String}
+ * @returns {Object}
+ * @example
+ * var exif = sync("~/Picture/IMG_1981.JPG");
+ * console.log(exif.createTime);
+ */
+function sync(file) {
+  if (!file) {
+    throw new Error('File not found');
+  }
+  let buffer = fs.readFileSync(file);
+  return fromBuffer(buffer);
+}
+
 /**
  * @param file {String}
  * @param callback {Function}
@@ -296,5 +308,6 @@ function async(file, callback) {
   });
 }
 
+exports.fromBuffer = fromBuffer;
 exports.parse = async;
 exports.parseSync = sync;
diff --git a/test/index.test.js b/test/index.test.js
@@ -1,4 +1,5 @@
 /* global it, describe */
+const fs = require('fs');
 const { expect } = require('chai');
 const exif = require('../lib/index.js');
 
@@ -68,3 +69,28 @@ describe('.parseSync()', () => {
     expect(data.GPSInfo).to.be.an('object');
   });
 });
+describe('.fromBuffer()', () => {
+  it('file {undefined}', () => {
+    expect(exif.fromBuffer).to.throw(Error);
+  });
+  it('APP1:#0xffe1', () => {
+    const buffer = fs.readFileSync('./test/IMG_0001.JPG');
+    const data = exif.fromBuffer(buffer);
+    expect(data).to.be.an('object');
+  });
+  it('!APP1:#0xffe1', () => {
+    const buffer = fs.readFileSync('./test/IMG_0003.JPG');
+    const data = exif.fromBuffer(buffer);
+    expect(data).to.be.an('object');
+  });
+  it('[SubExif]', () => {
+    const buffer = fs.readFileSync('./test/IMG_0001.JPG');
+    const data = exif.fromBuffer(buffer);
+    expect(data.SubExif).to.be.an('object');
+  });
+  it('[GPSInfo]', () => {
+    const buffer = fs.readFileSync('./test/IMG_0001.JPG');
+    const data = exif.fromBuffer(buffer);
+    expect(data.GPSInfo).to.be.an('object');
+  });
+});