Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support seeding a file from filesystem (path string) #209

Merged
merged 6 commits into from Dec 17, 2014
Merged

use correct tracker option `tracker`; not `trackers`

  • Loading branch information
feross committed Dec 16, 2014
commit 455e2bdffb40331c4b12cd0a872b4e88b03bc1b8
@@ -36,7 +36,7 @@ function WebTorrent (opts) {
if (!debug.enabled) self.setMaxListeners(0)

self.torrentPort = opts.torrentPort || 0
self.tracker = (opts.tracker !== undefined) ? opts.tracker : true
self.tracker = opts.tracker !== undefined ? opts.tracker : true
self.torrents = []

self.downloadSpeed = speedometer()
@@ -21,7 +21,7 @@ test('client.add (http url to a torrent file (string))', function (t) {
if (err) throw err
server.listen(port, function () {
var url = 'http://127.0.0.1:' + port
var client = new WebTorrent({ dht: false, trackers: false })
var client = new WebTorrent({ dht: false, tracker: false })
client.add(url, function (torrent) {
t.equal(torrent.infoHash, leavesTorrent.infoHash)
client.destroy()
@@ -34,7 +34,7 @@ test('client.add (http url to a torrent file (string))', function (t) {
test('client.add (filesystem path to a torrent file (string))', function (t) {
t.plan(1)

var client = new WebTorrent({ dht: false, trackers: false })
var client = new WebTorrent({ dht: false, tracker: false })
client.add(leavesPath, function (torrent) {
t.equal(torrent.infoHash, leavesTorrent.infoHash)
client.destroy()
@@ -44,7 +44,7 @@ test('client.add (filesystem path to a torrent file (string))', function (t) {
test('client.seed (filesystem path to file (string))', function (t) {
t.plan(1)

var client = new WebTorrent({ dht: false, trackers: false })
var client = new WebTorrent({ dht: false, tracker: false })
client.seed(leavesBookPath, function (torrent) {
t.equal(torrent.infoHash, leavesTorrent.infoHash)
client.destroy()
@@ -16,23 +16,23 @@ test('client.add (magnet uri, torrent file, info hash, and parsed torrent)', fun
t.plan(5)

// magnet uri (utf8 string)
var client1 = new WebTorrent({ dht: false, trackers: false })
var client1 = new WebTorrent({ dht: false, tracker: false })
verify(t, client1, client1.add('magnet:?xt=urn:btih:' + leavesTorrent.infoHash))

// torrent file (buffer)
var client2 = new WebTorrent({ dht: false, trackers: false })
var client2 = new WebTorrent({ dht: false, tracker: false })
verify(t, client2, client2.add(leaves))

// info hash (hex string)
var client3 = new WebTorrent({ dht: false, trackers: false })
var client3 = new WebTorrent({ dht: false, tracker: false })
verify(t, client3, client3.add(leavesTorrent.infoHash))

// info hash (buffer)
var client4 = new WebTorrent({ dht: false, trackers: false })
var client4 = new WebTorrent({ dht: false, tracker: false })
verify(t, client4, client4.add(new Buffer(leavesTorrent.infoHash, 'hex')))

// parsed torrent (from parse-torrent)
var client5 = new WebTorrent({ dht: false, trackers: false })
var client5 = new WebTorrent({ dht: false, tracker: false })
verify(t, client5, client5.add(leavesTorrent))
})

@@ -44,15 +44,15 @@ test('client.seed (Buffer, Blob)', function (t) {
}

// torrent file (Buffer)
var client1 = new WebTorrent({ dht: false, trackers: false })
var client1 = new WebTorrent({ dht: false, tracker: false })
client1.seed(leavesBook, opts, function (torrent) {
verify(t, client1, torrent)
})

// Blob
if (typeof Blob !== 'undefined') {
var client2 = new WebTorrent({ dht: false, trackers: false })
client2.seed(new Blob([ leavesBook ]), opts, function (torrent) {
var client2 = new WebTorrent({ dht: false, tracker: false })
verify(t, client2, torrent)
})
} else {
@@ -1,6 +1,5 @@
var auto = require('run-auto')
var WebTorrent = require('../')
var BlockStream = require('block-stream')
var DHT = require('bittorrent-dht/client')
var fs = require('fs')
var parseTorrent = require('parse-torrent')
@@ -212,7 +211,7 @@ test('Simple download using DHT', function (t) {
},
client1: ['dhtPort', function (cb, r) {
var client1 = new WebTorrent({
trackers: false,
tracker: false,
dht: { bootstrap: '127.0.0.1:' + r.dhtPort }
})
client1.on('error', function (err) { t.fail(err) })
@@ -245,7 +244,7 @@ test('Simple download using DHT', function (t) {

client2: ['client1', function (cb, r) {
var client2 = new WebTorrent({
trackers: false,
tracker: false,
dht: { bootstrap: '127.0.0.1:' + r.dhtPort }
})
client2.on('error', function (err) { t.fail(err) })
@@ -9,8 +9,8 @@ var leavesTorrent = parseTorrent(leaves)
test('ut_metadata transfer', function (t) {
t.plan(5)

var client1 = new WebTorrent({ dht: false, trackers: false })
var client2 = new WebTorrent({ dht: false, trackers: false })
var client1 = new WebTorrent({ dht: false, tracker: false })
var client2 = new WebTorrent({ dht: false, tracker: false })

client1.on('torrent', function (torrent) {
t.pass('client1 emits torrent event') // even though it started with metadata
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.