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

Client: fix video timeout

pull/40/head
Chocobozzz 2017-01-27 11:30:36 +01:00
parent 9a5d2a3f54
commit 0d4fb7e6d4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,3 @@
import { setInterval, setTimeout } from 'timers'
import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
@ -19,7 +18,7 @@ import { WebTorrentService } from './webtorrent.service';
}) })
export class VideoWatchComponent implements OnInit, OnDestroy { export class VideoWatchComponent implements OnInit, OnDestroy {
private static LOADTIME_TOO_LONG: number = 30000; private static LOADTIME_TOO_LONG: number = 20000;
@ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent; @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent;
@ViewChild('videoShareModal') videoShareModal: VideoShareComponent; @ViewChild('videoShareModal') videoShareModal: VideoShareComponent;
@ -35,9 +34,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
video: Video = null; video: Video = null;
videoNotFound = false; videoNotFound = false;
private errorTimer: NodeJS.Timer; private errorTimer: number;
private sub: any; private sub: any;
private torrentInfosInterval: NodeJS.Timer; private torrentInfosInterval: number;
constructor( constructor(
private elementRef: ElementRef, private elementRef: ElementRef,
@ -80,8 +79,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
ngOnDestroy() { ngOnDestroy() {
// Remove WebTorrent stuff // Remove WebTorrent stuff
console.log('Removing video from webtorrent.'); console.log('Removing video from webtorrent.');
clearInterval(this.torrentInfosInterval); window.clearInterval(this.torrentInfosInterval);
clearTimeout(this.errorTimer); window.clearTimeout(this.errorTimer);
if (this.video !== null) { if (this.video !== null) {
this.webTorrentService.remove(this.video.magnetUri); this.webTorrentService.remove(this.video.magnetUri);
@ -104,11 +103,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
// The callback might never return if there are network issues // The callback might never return if there are network issues
// So we create a timer to inform the user the load is abnormally long // So we create a timer to inform the user the load is abnormally long
this.errorTimer = setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG); this.errorTimer = window.setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG);
this.webTorrentService.add(this.video.magnetUri, (torrent) => { this.webTorrentService.add(this.video.magnetUri, (torrent) => {
// Clear the error timer // Clear the error timer
clearTimeout(this.errorTimer); window.clearTimeout(this.errorTimer);
// Maybe the error was fired by the timer, so reset it // Maybe the error was fired by the timer, so reset it
this.error = false; this.error = false;
@ -170,7 +169,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
private runInProgress(torrent: any) { private runInProgress(torrent: any) {
// Refresh each second // Refresh each second
this.torrentInfosInterval = setInterval(() => { this.torrentInfosInterval = window.setInterval(() => {
this.ngZone.run(() => { this.ngZone.run(() => {
this.downloadSpeed = torrent.downloadSpeed; this.downloadSpeed = torrent.downloadSpeed;
this.numPeers = torrent.numPeers; this.numPeers = torrent.numPeers;