diff --git a/cli.js b/cli.js index 079139f..8e72665 100755 --- a/cli.js +++ b/cli.js @@ -40,12 +40,14 @@ function runDat () { } var network = dat.joinNetwork() - network.once('connection', function () { - console.log('new connection') - }) if (dat.owner) share() - else download() + else { + network.once('connection', function () { + console.log('connected to peer!') + download() + }) + } function download () { console.log(`Downloading: ${dat.key.toString('hex')}`) @@ -60,7 +62,10 @@ function runDat () { } function share () { - console.log('sharing', path.resolve(src)) + network.on('connection', function () { + console.log('new connection') + }) + console.log('Sharing', path.resolve(src)) var progress = dat.importFiles(src, { ignore: ['node_modules', '.dat'] @@ -72,7 +77,7 @@ function runDat () { console.log('Added', dest.name) }) - console.log(`Sharing: ${dat.key.toString('hex')}\n`) + console.log(`KEY: ${dat.key.toString('hex')}\n`) } }) } diff --git a/index.js b/index.js index 2c4ea1a..9b90683 100644 --- a/index.js +++ b/index.js @@ -19,6 +19,8 @@ function run (src, dest, opts, cb) { return cb(new Error('Invalid dat link')) } src = null + + opts.sparse = true opts.temp= true // use memory for downloads right now } @@ -28,7 +30,6 @@ function run (src, dest, opts, cb) { return cb(new Error('Not archive owner and no destination provided.')) } - dat.joinNetwork() // TODO // dat.trackStats() // if (dat.owner) { diff --git a/package-lock.json b/package-lock.json index 257a060..3b32abc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -574,16 +574,6 @@ "call-me-maybe": "1.0.1", "concat-stream": "1.6.2", "debug": "2.6.9" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - } } }, "dat-encoding": { @@ -621,19 +611,11 @@ "requires": { "safe-buffer": "5.1.1" } - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } } } }, "dat-node": { - "version": "github:datproject/dat-node#867220368f1360474f9168090541cd27f25fc47d", + "version": "github:datproject/dat-node#802b0366d846736c68ba1a5289af1f43e5f1bd6c", "requires": { "dat-ignore": "2.1.0", "dat-link-resolve": "2.1.0", @@ -655,18 +637,6 @@ "xtend": "4.0.1" }, "dependencies": { - "dat-storage": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dat-storage/-/dat-storage-1.0.4.tgz", - "integrity": "sha512-THxtCBzrt+AJzhGxXedlxLYeW+AVi5eFLi9Ke9JQ7fTA/j84m1Ci7KPuZ1q44Um/BeIYZ3LO01FWS2MlAOTFRg==", - "requires": { - "append-tree": "2.4.1", - "dat-secret-storage": "4.0.1", - "hyperdrive": "github:mafintosh/hyperdrive#e8c27246180a2478d0ab81b630aac7a5f7a5c2a3", - "multi-random-access": "2.1.1", - "random-access-file": "2.0.1" - } - }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -674,24 +644,6 @@ "requires": { "ms": "2.0.0" } - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" - }, - "random-access-memory": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/random-access-memory/-/random-access-memory-2.4.0.tgz", - "integrity": "sha1-cvPYZbS1WiWYeUc+L7LeNWnGnuI=", - "requires": { - "process-nextick-args": "1.0.7" - } - }, - "speedometer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz", - "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI=" } } }, @@ -804,14 +756,6 @@ "thunky": "0.1.0" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, "thunky": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz", @@ -832,16 +776,6 @@ "pump": "1.0.3", "to-buffer": "1.1.0", "utp-native": "1.7.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - } } }, "dns-discovery": { @@ -861,14 +795,6 @@ "unordered-set": "1.1.0" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, "lru": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz", @@ -877,11 +803,6 @@ "inherits": "2.0.3" } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -891,11 +812,6 @@ "once": "1.4.0" } }, - "speedometer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz", - "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI=" - }, "unordered-set": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/unordered-set/-/unordered-set-1.1.0.tgz", @@ -1638,11 +1554,6 @@ "requires": { "ms": "2.0.0" } - }, - "speedometer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz", - "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI=" } } }, @@ -2564,21 +2475,6 @@ "requires": { "mkdirp": "0.5.1", "random-access-storage": "1.1.1" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } - } } }, "random-access-memory": { diff --git a/readme.md b/readme.md index 1184b1c..2d2e33d 100644 --- a/readme.md +++ b/readme.md @@ -6,6 +6,17 @@ The next version of the `dat` command line tool. Current version at [datproject/dat](https://github.com/datproject/dat). +**Warning: many bugs and not stable. May delete all your data!** + +#### Known Bugs: + +* Not really much UI +* Resuming doesn't work +* weird importing stuff going on +* No files storage + - sharing: files copied to db storage (takes up double size on HD) + - downloading: db in memory and copied to files + ## Install: ``` @@ -18,13 +29,11 @@ npm install -g dat-next ``` dat-next [options] - --temp,-t keep sleep data in memory - --watch, -w watch folder for changes + auto import + --temp,-t keep data in memory ``` ### Download `key` to `dir`: ``` dat-next [options] - --live keep running + update changes ```