From ae8988848f4328727b321079922a2a5ed735d6ec Mon Sep 17 00:00:00 2001 From: John Hiesey Date: Tue, 19 Mar 2019 16:17:14 -0700 Subject: Add torrent.rescanFiles() to allow manual verify Useful if files are modified externally to webtorrent. --- lib/torrent.js | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/torrent.js b/lib/torrent.js index 8f667ff..14b2caf 100644 --- a/lib/torrent.js +++ b/lib/torrent.js @@ -505,6 +505,12 @@ class Torrent extends EventEmitter { this._markAllVerified() this._onStore() } else { + const onPiecesVerified = (err) => { + if (err) return this._destroy(err) + this._debug('done verifying') + this._onStore() + } + this._debug('verifying existing torrent data') if (this._fileModtimes && this._store === FSChunkStore) { // don't verify if the files haven't been modified since we last checked @@ -517,11 +523,11 @@ class Torrent extends EventEmitter { this._markAllVerified() this._onStore() } else { - this._verifyPieces() + this._verifyPieces(onPiecesVerified) } }) } else { - this._verifyPieces() + this._verifyPieces(onPiecesVerified) } } @@ -547,8 +553,8 @@ class Torrent extends EventEmitter { }) } - _verifyPieces () { - parallelLimit(this.pieces.map((_, index) => cb => { + _verifyPieces (cb) { + parallelLimit(this.pieces.map((piece, index) => cb => { if (this.destroyed) return cb(new Error('torrent is destroyed')) this.store.get(index, (err, buf) => { @@ -568,10 +574,21 @@ class Torrent extends EventEmitter { cb(null) }) }) - }), FILESYSTEM_CONCURRENCY, err => { - if (err) return this._destroy(err) - this._debug('done verifying') - this._onStore() + }), FILESYSTEM_CONCURRENCY, cb) + } + + rescanFiles (cb) { + if (this.destroyed) throw new Error('torrent is destroyed') + if (!cb) cb = noop + + this._verifyPieces((err) => { + if (err) { + this._destroy(err) + return cb(err) + } + + this._checkDone() + cb(null) }) } -- cgit v1.2.3