From c323efb9cdc6a605242d112ac0c9db9f67eabaad Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 12 Aug 2016 17:35:00 +0200 Subject: Update webtorrent -> 0.96 --- client/package.json | 2 +- client/src/app/shared/search/search.component.ts | 2 +- .../app/videos/video-watch/video-watch.component.ts | 21 ++++++++++++++------- package.json | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/client/package.json b/client/package.json index b01e768b3..46cbb9441 100644 --- a/client/package.json +++ b/client/package.json @@ -63,7 +63,7 @@ "webpack-md5-hash": "0.0.5", "webpack-merge": "^0.13.0", "webpack-notifier": "^1.3.0", - "webtorrent": "^0.93.2", + "webtorrent": "^0.96.0", "zone.js": "0.6.12" }, "devDependencies": { diff --git a/client/src/app/shared/search/search.component.ts b/client/src/app/shared/search/search.component.ts index e864fbc17..219997e85 100644 --- a/client/src/app/shared/search/search.component.ts +++ b/client/src/app/shared/search/search.component.ts @@ -28,7 +28,7 @@ export class SearchComponent implements OnInit { constructor(private searchService: SearchService) {} ngOnInit() { - // Subscribe is the search changed + // Subscribe if the search changed // Usually changed by videos list component this.searchService.updateSearch.subscribe( newSearchCriterias => { diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts index 09255de5d..bc0e3157d 100644 --- a/client/src/app/videos/video-watch/video-watch.component.ts +++ b/client/src/app/videos/video-watch/video-watch.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; +import { Component, ElementRef, NgZone, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; @@ -31,6 +31,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { constructor( private elementRef: ElementRef, + private ngZone: NgZone, private route: ActivatedRoute, private videoService: VideoService, private webTorrentService: WebTorrentService @@ -65,12 +66,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } }); - // Refresh each second - this.torrentInfosInterval = setInterval(() => { - this.downloadSpeed = torrent.downloadSpeed; - this.numPeers = torrent.numPeers; - this.uploadSpeed = torrent.uploadSpeed; - }, 1000); + this.runInProgress(torrent); }); } @@ -99,4 +95,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.error = true; console.error('The video load seems to be abnormally long.'); } + + private runInProgress(torrent: any) { + // Refresh each second + this.torrentInfosInterval = setInterval(() => { + this.ngZone.run(() => { + this.downloadSpeed = torrent.downloadSpeed; + this.numPeers = torrent.numPeers; + this.uploadSpeed = torrent.uploadSpeed; + }); + }, 1000); + } } diff --git a/package.json b/package.json index 310810377..c83ede5c2 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "scripty": "^1.5.0", "segfault-handler": "^1.0.0", "ursa": "^0.9.1", - "webtorrent": "^0.93.2", + "webtorrent": "^0.96.0", "winston": "^2.1.1", "ws": "^1.1.1" }, -- cgit v1.2.3