OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Update webtorrent -> 0.96

pull/10/head
Chocobozzz 2016-08-12 17:35:00 +02:00
parent 602eb142be
commit c323efb9cd
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/package.json
View File

@ -63,7 +63,7 @@
"webpack-md5-hash": "0.0.5", "webpack-md5-hash": "0.0.5",
"webpack-merge": "^0.13.0", "webpack-merge": "^0.13.0",
"webpack-notifier": "^1.3.0", "webpack-notifier": "^1.3.0",
"webtorrent": "^0.93.2", "webtorrent": "^0.96.0",
"zone.js": "0.6.12" "zone.js": "0.6.12"
}, },
"devDependencies": { "devDependencies": {

2
client/src/app/shared/search/search.component.ts
View File

@ -28,7 +28,7 @@ export class SearchComponent implements OnInit {
constructor(private searchService: SearchService) {} constructor(private searchService: SearchService) {}
ngOnInit() { ngOnInit() {
// Subscribe is the search changed // Subscribe if the search changed
// Usually changed by videos list component // Usually changed by videos list component
this.searchService.updateSearch.subscribe( this.searchService.updateSearch.subscribe(
newSearchCriterias => { newSearchCriterias => {

21
client/src/app/videos/video-watch/video-watch.component.ts
View File

@ -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 { ActivatedRoute } from '@angular/router';
import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
@ -31,6 +31,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
constructor( constructor(
private elementRef: ElementRef, private elementRef: ElementRef,
private ngZone: NgZone,
private route: ActivatedRoute, private route: ActivatedRoute,
private videoService: VideoService, private videoService: VideoService,
private webTorrentService: WebTorrentService private webTorrentService: WebTorrentService
@ -65,12 +66,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
} }
}); });
// Refresh each second this.runInProgress(torrent);
this.torrentInfosInterval = setInterval(() => {
this.downloadSpeed = torrent.downloadSpeed;
this.numPeers = torrent.numPeers;
this.uploadSpeed = torrent.uploadSpeed;
}, 1000);
}); });
} }
@ -99,4 +95,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.error = true; this.error = true;
console.error('The video load seems to be abnormally long.'); 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);
}
} }

2
package.json
View File

@ -60,7 +60,7 @@
"scripty": "^1.5.0", "scripty": "^1.5.0",
"segfault-handler": "^1.0.0", "segfault-handler": "^1.0.0",
"ursa": "^0.9.1", "ursa": "^0.9.1",
"webtorrent": "^0.93.2", "webtorrent": "^0.96.0",
"winston": "^2.1.1", "winston": "^2.1.1",
"ws": "^1.1.1" "ws": "^1.1.1"
}, },