Use buffer list and fix tests

Author: bcomnes

main/lib/artwork-cache/index.js

@@ -4,7 +4,8 @@ var path = require('path')
 var pump = require('pump')
 var crypto = require('crypto')
 var mkdirp = require('mkdirp')
-var { artwork, fromBuffer } = require('./util')
+var { artwork } = require('./util')
+var BufferList = require('bl')
 
 // var configPath = (electron.app || electron.remote.app).getPath('userData')
 // var artworkCachePath = path.join(configPath, 'artwork-cache')
@@ -37,7 +38,7 @@ class ArtworkCache {
           return cb(null, blobPath)
         } else {
           var writeStream = self._blobs.createWriteStream()
-          pump(fromBuffer(buff), writeStream, function (err) {
+          pump((new BufferList()).append(buff), writeStream, function (err) {
             if (err) return cb(err)
             return self._blobs.resolve(writeStream.key, cb)
           })

main/lib/artwork-cache/test.js

@@ -1,5 +1,5 @@
 var test = require('tape')
-var {artwork, fromBuffer} = require('./util')
+var {artwork} = require('./util')
 var path = require('path')
 var concatStream = require('concat-stream')
 var isBuffer = require('is-buffer')
@@ -8,6 +8,7 @@ var bufferEqual = require('buffer-equal')
 var tmp = require('temporary-directory')
 var ArtworkCache = require('./index.js')
 var testData = require('./test-data')
+var BufferList = require('bl')
 
 test('get artwork from file', function (t) {
   artwork(testData.mp3WithArtwork, function (err, imageBuf) {
@@ -22,7 +23,8 @@ test('can stream buffers', function (t) {
 
   function bufferTests (err, imageBuf) {
     t.error(err, 'got artwork buffer')
-    var imageBufferStream = fromBuffer(imageBuf)
+    var imageBufferStream = new BufferList()
+    imageBufferStream.append(imageBuf)
     var concat = concatStream(gotPic)
     var streamedBuff
 

main/lib/artwork-cache/util.js

@@ -1,28 +1,19 @@
-var from = require('from2')
 var mm = require('music-metadata')
 var get = require('lodash.get')
-
-exports.fromBuffer = fromBuffer
-
-function fromBuffer (buffer) {
-  // TODO: Use https://github.com/rvagg/bl ?
-  return from(function (size, next) {
-    if (buffer.length <= 0) return next(null, null)
-    var chunk = buffer.slice(0, size)
-    buffer = buffer.slice(size)
-    next(null, chunk)
-  })
-}
+var fs = require('fs')
 
 function metadata (path, cb) {
-  mm.parseFile(path, {
-    native: true,
-    duration: true,
-    skipCovers: false
-  }).then(function (md) {
-    return cb(null, md)
-  }).catch(function (err) {
-    return cb(err)
+  fs.stat(path, function (err, stats) {
+    if (err) return cb(err)
+    mm.parseFile(path, {
+      native: true,
+      duration: true,
+      skipCovers: false
+    }).then(function (md) {
+      return cb(null, md)
+    }).catch(function (err) {
+      return cb(err)
+    })
   })
 }
 

package.json

@@ -34,6 +34,7 @@
   ],
   "dependencies": {
     "@bret/truthy": "^1.0.1",
+    "bl": "^1.2.1",
     "choo": "^6.0.0",
     "choo-devtools": "^1.5.0",
     "choo-log": "^7.2.1",
@@ -53,7 +54,6 @@
     "flush-write-stream": "^1.0.2",
     "folder-walker": "^3.0.0",
     "format-duration": "^1.0.0",
-    "from2": "^2.3.0",
     "fy-shuffle": "^1.0.0",
     "global": "^4.3.2",
     "lodash.debounce": "^4.0.8",