allow specifying fs for ObservFile and ObservDirectory

mmckegg · Dec 30, 2017 · fb37ecc · fb37ecc
1 parent 3a6834a
commit fb37ecc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/lib/file-object.js b/lib/file-object.js
@@ -146,7 +146,7 @@ function FileObject (parentContext) {
       loading = true
       initialized = false
       onceIdle(() => { initialized = true })
-      obs.file = ObservFile(path)
+      obs.file = ObservFile(path, context.fs)
       releaseRename = watch(obs.file.path, obs.path.set)
       context.cwd.set(getDirName(path))
       releaseClose = obs.file.onClose(onClose)

diff --git a/lib/observ-audio-buffer.js b/lib/observ-audio-buffer.js
@@ -26,7 +26,7 @@ function ObservAudioBuffer (context) {
 
       context.fs.exists(path, function (exists) {
         if (exists) {
-          var file = ObservFile(path, 'arraybuffer')
+          var file = ObservFile(path, context.fs, 'arraybuffer')
           parseAudioBuffer(file, obs.currentValue.set, context.audio)
           releases.push(file.close)
         } else {
@@ -36,7 +36,7 @@ function ObservAudioBuffer (context) {
 
       context.fs.exists(timePath, function (exists) {
         if (exists) {
-          var file = ObservFile(timePath, 'arraybuffer')
+          var file = ObservFile(timePath, context.fs, 'arraybuffer')
           parseFloat32Array(file, obs.cuePoints.set)
           releases.push(file.close)
         } else {

diff --git a/lib/observ-directory.js b/lib/observ-directory.js
@@ -1,12 +1,11 @@
 var Observ = require('mutant/value')
 var join = require('path').join
-var fs = require('fs')
 var Event = require('geval')
 var MutantMap = require('mutant/map')
 
 module.exports = ObservDirectory
 
-function ObservDirectory (path, cb) {
+function ObservDirectory (path, fs, cb) {
   var entries = Observ([])
   var refreshing = false
   var watcher = null
@@ -57,7 +56,7 @@ function ObservDirectory (path, cb) {
   function refresh (init) {
     refreshing = false
     var current = entries()
-    getDirectories(path, (err, dirs) => {
+    getDirectories(path, fs, (err, dirs) => {
       if (err) return init && cb && cb(err)
       if (dirs.length !== current.length || !dirs.every(x => current.includes(x))) {
         dirs.sort((a, b) => a.localeCompare(b))
@@ -70,7 +69,7 @@ function ObservDirectory (path, cb) {
   }
 }
 
-function getDirectories (path, cb) {
+function getDirectories (path, fs, cb) {
   fs.readdir(path, (err, files) => {
     if (err) return cb && cb(err)
     var remaining = files.length

diff --git a/lib/observ-file.js b/lib/observ-file.js
@@ -1,6 +1,5 @@
 var Value = require('mutant/value')
 var Event = require('geval')
-var fs = require('fs')
 var join = require('path').join
 var getDirectory = require('path').dirname
 var onceIdle = require('mutant/once-idle')
@@ -12,7 +11,7 @@ var readQueue = []
 var caches = {}
 var encodings = ['utf8', 'arraybuffer', 'buffer']
 
-function ObservFile (path, encoding, cb) {
+function ObservFile (path, fs, encoding, cb) {
   encoding = encodings.includes(encoding) ? encoding : encodings[0]
   var cacheKey = encoding + ':' + path
   var cache = caches[cacheKey]
@@ -139,7 +138,7 @@ function read (item) {
       })
     })
   } else if (item.encoding === 'arraybuffer') {
-    item.fs.readFile(item.path, function (err, result) {
+    item.fs.readFile(item.path, 'binary', function (err, result) {
       onceIdle(() => {
         item.reading = false
         result = result ? result.buffer : null
@@ -149,7 +148,7 @@ function read (item) {
       })
     })
   } else {
-    item.fs.readFile(item.path, function (err, result) {
+    item.fs.readFile(item.path, 'binary', function (err, result) {
       onceIdle(() => {
         item.reading = false
         item.lastValue = result

diff --git a/nodes/external-chunk/object.js b/nodes/external-chunk/object.js
@@ -180,7 +180,7 @@ function External (parentContext) {
         initialized = false
         onceIdle(() => { initialized = true })
         loading = true
-        obs.file = ObservFile(path)
+        obs.file = ObservFile(path, context.fs)
         updateFile = JsonFile(obs.file, updateNode)
         context.cwd.set(Path.dirname(path))
         fileReleases.push(

diff --git a/nodes/project/object.js b/nodes/project/object.js
@@ -81,9 +81,9 @@ function Project (parentContext) {
   obs.renaming = Observ(false)
   obs.duplicating = Observ(false)
 
-  obs.entries = ObservDirectory(resolve(context.cwd))
+  obs.entries = ObservDirectory(resolve(context.cwd), context.fs)
 
-  obs.recordingEntries = ObservDirectory(resolvePath(resolve(context.cwd), '~recordings'))
+  obs.recordingEntries = ObservDirectory(resolvePath(resolve(context.cwd), '~recordings'), context.fs)
 
   obs.outputRms = ObservRms(masterOutput)