diff options
-rw-r--r-- | client/angular/videos/components/watch/videos-watch.component.ts | 3 | ||||
-rw-r--r-- | client/package.json | 1 | ||||
-rw-r--r-- | package.json | 1 | ||||
-rw-r--r-- | server/tests/api/utils.js | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/client/angular/videos/components/watch/videos-watch.component.ts b/client/angular/videos/components/watch/videos-watch.component.ts index da7f942db..1a17e2b1a 100644 --- a/client/angular/videos/components/watch/videos-watch.component.ts +++ b/client/angular/videos/components/watch/videos-watch.component.ts | |||
@@ -39,8 +39,9 @@ export class VideosWatchComponent implements OnInit, CanDeactivate { | |||
39 | 39 | ||
40 | loadVideo(video: Video) { | 40 | loadVideo(video: Video) { |
41 | this.video = video; | 41 | this.video = video; |
42 | 42 | console.log('Adding ' + this.video.magnetUri + '.'); | |
43 | this.client.add(this.video.magnetUri, (torrent) => { | 43 | this.client.add(this.video.magnetUri, (torrent) => { |
44 | console.log('Added ' + this.video.magnetUri + '.'); | ||
44 | torrent.files[0].appendTo(this._elementRef.nativeElement, (err) => { | 45 | torrent.files[0].appendTo(this._elementRef.nativeElement, (err) => { |
45 | if (err) { | 46 | if (err) { |
46 | alert('Cannot append the file.'); | 47 | alert('Cannot append the file.'); |
diff --git a/client/package.json b/client/package.json index 78abde752..dbb065974 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -30,6 +30,7 @@ | |||
30 | "reflect-metadata": "0.1.2", | 30 | "reflect-metadata": "0.1.2", |
31 | "rxjs": "5.0.0-beta.2", | 31 | "rxjs": "5.0.0-beta.2", |
32 | "systemjs": "0.19.22", | 32 | "systemjs": "0.19.22", |
33 | "webtorrent": "^0.85.1", | ||
33 | "zone.js": "0.5.15" | 34 | "zone.js": "0.5.15" |
34 | }, | 35 | }, |
35 | "devDependencies": { | 36 | "devDependencies": { |
diff --git a/package.json b/package.json index 383e6165c..1b83f5eca 100644 --- a/package.json +++ b/package.json | |||
@@ -41,6 +41,7 @@ | |||
41 | "async": "^1.2.1", | 41 | "async": "^1.2.1", |
42 | "bittorrent-tracker": "^7.0.0", | 42 | "bittorrent-tracker": "^7.0.0", |
43 | "body-parser": "^1.12.4", | 43 | "body-parser": "^1.12.4", |
44 | "concurrently": "^2.0.0", | ||
44 | "config": "^1.14.0", | 45 | "config": "^1.14.0", |
45 | "connect-livereload": "^0.5.3", | 46 | "connect-livereload": "^0.5.3", |
46 | "debug": "^2.2.0", | 47 | "debug": "^2.2.0", |
diff --git a/server/tests/api/utils.js b/server/tests/api/utils.js index c70696571..60c3c8d4e 100644 --- a/server/tests/api/utils.js +++ b/server/tests/api/utils.js | |||
@@ -176,7 +176,7 @@ function uploadVideo (url, name, description, fixture, end) { | |||
176 | .field('name', name) | 176 | .field('name', name) |
177 | .field('description', description) | 177 | .field('description', description) |
178 | .attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture)) | 178 | .attach('input_video', pathUtils.join(__dirname, 'fixtures', fixture)) |
179 | .expect(201) | 179 | .expect(204) |
180 | .end(end) | 180 | .end(end) |
181 | } | 181 | } |
182 | 182 | ||