internal: simplify how storage opts are passed

1 files changed, 9 insertions, 13 deletions

diff --git a/lib/fs-storage.js b/lib/fs-storage.js
index 7923791..51e5ea5 100644
--- a/lib/fs-storage.js
+++ b/lib/fs-storage.js
@@ -1,6 +1,5 @@
 module.exports = FSStorage
 
-var extend = require('xtend')
 var fs = require('fs')
 var inherits = require('inherits')
 var mkdirp = require('mkdirp')
@@ -11,8 +10,7 @@ var rimraf = require('rimraf')
 var Storage = require('./storage')
 var thunky = require('thunky')
 
-var TMP = fs.existsSync('/tmp') ? '/tmp' : os.tmpDir()
-function noop () {}
+var TMP = path.join(fs.existsSync('/tmp') ? '/tmp' : os.tmpDir(), 'webtorrent')
 
 inherits(FSStorage, Storage)
 
@@ -24,18 +22,16 @@ inherits(FSStorage, Storage)
  */
 function FSStorage (parsedTorrent, opts) {
   var self = this
-  opts = extend({
-    nobuffer: true,
-    tmp: TMP,
-    name: 'webtorrent'
-  }, opts)
-  Storage.call(self, parsedTorrent, opts)
 
-  self.path = opts.path || path.join(opts.tmp, opts.name, parsedTorrent.infoHash)
-  self.piecesMap = []
+  self.tmp = opts.tmp || TMP
+  self.path = opts.path || path.join(self.tmp, parsedTorrent.infoHash)
 
+  self.piecesMap = []
   self.nonExistentError = new Error('Cannot read from non-existent file')
 
+  opts.nobuffer = true
+  Storage.call(self, parsedTorrent, opts)
+
   self.files.forEach(function (file) {
     var fileStart = file.offset
     var fileEnd = fileStart + file.length
@@ -179,7 +175,7 @@ FSStorage.prototype._onPieceDone = function (piece) {
  */
 FSStorage.prototype.remove = function (cb) {
   var self = this
-  if (!cb) cb = noop
+  if (!cb) cb = function () {}
 
   self.close(function (err) {
     if (err) return cb(err)
@@ -193,7 +189,7 @@ FSStorage.prototype.remove = function (cb) {
  */
 FSStorage.prototype.close = function (cb) {
   var self = this
-  if (!cb) cb = noop
+  if (!cb) cb = function () {}
   if (self.closed) return cb()
 
   Storage.prototype.close.call(self, function (err) {