Add software that allows for specification of both the dat directory as

well as the directory for the dat secrets.

Author: brandonedens

index.js

@@ -32,7 +32,8 @@ function createDat (dirOrStorage, opts, cb) {
 
   var archive
   var key = opts.key
-  var dir = (typeof dirOrStorage === 'string') ? dirOrStorage : null
+  var dir = (typeof dirOrStorage === 'string') ? dirOrStorage :
+    (typeof dirOrStorage === 'object') ? dirOrStorage.dir : null
   var storage = datStore(dirOrStorage, opts)
   var createIfMissing = !(opts.createIfMissing === false)
   var errorIfExists = opts.errorIfExists || false

lib/storage.js

@@ -20,7 +20,8 @@ module.exports = defaultStorage
  */
 function defaultStorage (storage, opts) {
   // Use custom storage or ram
-  if (typeof storage !== 'string') return storage
+  if (typeof storage !== 'string' &&
+      typeof storage !== 'object') return storage
   if (opts.temp) return ram
   if (opts.latest === false) {
     // Store as SLEEP files inluding content.data
@@ -38,13 +39,20 @@ function defaultStorage (storage, opts) {
 
   try {
     // Store in .dat with secret in ~/.dat
-    if (fs.statSync(storage).isDirectory()) {
+    if ((typeof storage === 'object' &&
+         fs.statSync(storage.dir).isDirectory()) ||
+        fs.statSync(storage).isDirectory()) {
       return datStore(storage)
     }
   } catch (e) {
     // Does not exist, make dir
     try {
-      fs.mkdirSync(storage)
+      if (typeof storage === 'object') {
+        fs.mkdirSync(storage.dir)
+        fs.mkdirSync(storage.secret_dir)
+      } else {
+        fs.mkdirSync(storage)
+      }
     } catch (e) {
       // Invalid path
       throw new Error('Invalid storage path')

readme.md

@@ -102,24 +102,31 @@ We'll go through what these are for and a few of the common usages of each eleme
 
 ### Storage
 
-Every dat archive has **storage**, this is the required first argument for dat-node. By default, we use [dat-storage](http://github.com/datproject/dat-storage) which stores the secret key in `~/.dat/` and the rest of the ddata in `dir/.dat`. Other common options are:
+Every dat archive has **storage**, this is the required first argument for dat-node. By default, we use [dat-storage](http://github.com/datproject/dat-storage) which stores the secret key in `~/.dat/` and the rest of the data in `dir/.dat`. Other common options are:
 
 * **Persistent storage**: Stored files in `/my-dir` and metadata in `my-dir/.dat` by passing `/my-dir` as the first argument.
 * **Temporary Storage**: Use the `temp: true` option to keep metadata stored in memory.
+* **Secret Key Dir**: Specify first argument as object in the form of {dir: '/my-dir', secret_dir: '/my-secrets'} to store files
+  in /my-dir and secrets in /my-secrets respectively.
 
 ```js
 // Permanent Storage
 Dat('/my-dir', function (err, dat) {
   // Do Dat Stuff
 })
 
+// Secret Storage
+Dat({dir: '/my-dir', secret_dir: '/my-secrets'}, function (err, dat) {
+  // Do Dat Stuff
+})
+
 // Temporary Storage
 Dat('/my-dir', {temp: true}, function (err, dat) {
   // Do Dat Stuff
 })
 ```
 
-Both of these will import files from `/my-dir` when doing `dat.importFiles()` but only the first will make a `.dat` folder and keep the metadata on disk.
+All of these will import files from `/my-dir` when doing `dat.importFiles()` but only the first two will make a `.dat` folder and keep the metadata on disk.
 
 The storage argument can also be passed through to hyperdrive for more advanced storage use cases.