X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fvideo-watch%2Fvideo-watch.component.ts;h=db3e1cdd6e9f3795c9dc128121b4b9701c9661bd;hb=2ed6a0aedc2d2f6b1ac2fd9a1ac137772831f713;hp=d4b60b001dfdb597f35345892accca6eaa0313d5;hpb=66dd264f7b15c05006faa00694c88c56794edc54;p=github%2FChocobozzz%2FPeerTube.git 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 d4b60b001..db3e1cdd6 100644 --- a/client/src/app/videos/video-watch/video-watch.component.ts +++ b/client/src/app/videos/video-watch/video-watch.component.ts @@ -1,334 +1,299 @@ -import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; -import { Subscription } from 'rxjs/Subscription'; - -import * as videojs from 'video.js'; -import { MetaService } from '@nglibs/meta'; -import { NotificationsService } from 'angular2-notifications'; - -import { AuthService, ConfirmService } from '../../core'; -import { VideoMagnetComponent } from './video-magnet.component'; -import { VideoShareComponent } from './video-share.component'; -import { VideoReportComponent } from './video-report.component'; -import { RateType, Video, VideoService } from '../shared'; -import { WebTorrentService } from './webtorrent.service'; +import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' +import { ActivatedRoute, Router } from '@angular/router' +import { Observable } from 'rxjs/Observable' +import { Subscription } from 'rxjs/Subscription' + +import videojs from 'video.js' +import '../../../assets/player/peertube-videojs-plugin' + +import { MetaService } from '@ngx-meta/core' +import { NotificationsService } from 'angular2-notifications' + +import { AuthService, ConfirmService } from '../../core' +import { VideoMagnetComponent } from './video-magnet.component' +import { VideoShareComponent } from './video-share.component' +import { VideoReportComponent } from './video-report.component' +import { Video, VideoService } from '../shared' +import { WebTorrentService } from './webtorrent.service' +import { UserVideoRateType, VideoRateType } from '../../../../../shared' @Component({ selector: 'my-video-watch', templateUrl: './video-watch.component.html', styleUrls: [ './video-watch.component.scss' ] }) - export class VideoWatchComponent implements OnInit, OnDestroy { - private static LOADTIME_TOO_LONG: number = 20000; - - @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent; - @ViewChild('videoShareModal') videoShareModal: VideoShareComponent; - @ViewChild('videoReportModal') videoReportModal: VideoReportComponent; - - downloadSpeed: number; - error: boolean = false; - loading: boolean = false; - numPeers: number; - player: VideoJSPlayer; - playerElement: Element; - uploadSpeed: number; - userRating: RateType = null; - video: Video = null; - videoNotFound = false; - - private errorTimer: number; - private paramsSub: Subscription; - private errorsSub: Subscription; - private warningsSub: Subscription; - private torrentInfosInterval: number; - - constructor( + @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent + @ViewChild('videoShareModal') videoShareModal: VideoShareComponent + @ViewChild('videoReportModal') videoReportModal: VideoReportComponent + + downloadSpeed: number + error = false + loading = false + numPeers: number + player: videojs.Player + playerElement: HTMLMediaElement + uploadSpeed: number + userRating: UserVideoRateType = null + video: Video = null + videoNotFound = false + + private paramsSub: Subscription + + constructor ( private elementRef: ElementRef, - private ngZone: NgZone, private route: ActivatedRoute, private router: Router, private videoService: VideoService, private confirmService: ConfirmService, private metaService: MetaService, - private webTorrentService: WebTorrentService, private authService: AuthService, private notificationsService: NotificationsService ) {} - ngOnInit() { + ngOnInit () { this.paramsSub = this.route.params.subscribe(routeParams => { - let id = routeParams['id']; - this.videoService.getVideo(id).subscribe( + let uuid = routeParams['uuid'] + this.videoService.getVideo(uuid).subscribe( video => this.onVideoFetched(video), - error => this.videoNotFound = true - ); - }); - - this.playerElement = this.elementRef.nativeElement.querySelector('#video-container'); - - const videojsOptions = { - controls: true, - autoplay: false - }; - - const self = this; - videojs(this.playerElement, videojsOptions, function () { - self.player = this; - }); - - this.errorsSub = this.webTorrentService.errors.subscribe(err => this.notificationsService.error('Error', err.message)); - this.warningsSub = this.webTorrentService.errors.subscribe(err => this.notificationsService.alert('Warning', err.message)); + error => { + console.error(error) + this.videoNotFound = true + } + ) + }) } - ngOnDestroy() { - // Remove WebTorrent stuff - console.log('Removing video from webtorrent.'); - window.clearInterval(this.torrentInfosInterval); - window.clearTimeout(this.errorTimer); - - if (this.video !== null && this.webTorrentService.has(this.video.magnetUri)) { - this.webTorrentService.remove(this.video.magnetUri); + ngOnDestroy () { + // Remove player if it exists + if (this.videoNotFound === false) { + videojs(this.playerElement).dispose() } - // Remove player - videojs(this.playerElement).dispose(); - // Unsubscribe subscriptions - this.paramsSub.unsubscribe(); - this.errorsSub.unsubscribe(); - this.warningsSub.unsubscribe(); - } - - loadVideo() { - // Reset the error - this.error = false; - // We are loading the video - this.loading = true; - - console.log('Adding ' + this.video.magnetUri + '.'); - - // The callback might never return if there are network issues - // So we create a timer to inform the user the load is abnormally long - this.errorTimer = window.setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG); - - this.webTorrentService.add(this.video.magnetUri, (torrent) => { - // Clear the error timer - window.clearTimeout(this.errorTimer); - // Maybe the error was fired by the timer, so reset it - this.error = false; - - // We are not loading the video anymore - this.loading = false; - - console.log('Added ' + this.video.magnetUri + '.'); - torrent.files[0].renderTo(this.playerElement, { autoplay: true }, (err) => { - if (err) { - this.notificationsService.error('Error', 'Cannot append the file in the video element.'); - console.error(err); - } - }); - - this.runInProgress(torrent); - }); + this.paramsSub.unsubscribe() } - setLike() { - if (this.isUserLoggedIn() === false) return; + setLike () { + if (this.isUserLoggedIn() === false) return // Already liked this video - if (this.userRating === 'like') return; + if (this.userRating === 'like') return this.videoService.setVideoLike(this.video.id) .subscribe( () => { // Update the video like attribute - this.updateVideoRating(this.userRating, 'like'); - this.userRating = 'like'; + this.updateVideoRating(this.userRating, 'like') + this.userRating = 'like' }, - err => this.notificationsService.error('Error', err.text) - ); + err => this.notificationsService.error('Error', err.message) + ) } - setDislike() { - if (this.isUserLoggedIn() === false) return; + setDislike () { + if (this.isUserLoggedIn() === false) return // Already disliked this video - if (this.userRating === 'dislike') return; + if (this.userRating === 'dislike') return this.videoService.setVideoDislike(this.video.id) .subscribe( () => { // Update the video dislike attribute - this.updateVideoRating(this.userRating, 'dislike'); - this.userRating = 'dislike'; + this.updateVideoRating(this.userRating, 'dislike') + this.userRating = 'dislike' }, - err => this.notificationsService.error('Error', err.text) - ); + err => this.notificationsService.error('Error', err.message) + ) } - removeVideo(event: Event) { - event.preventDefault(); + removeVideo (event: Event) { + event.preventDefault() this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe( res => { - if (res === false) return; + if (res === false) return this.videoService.removeVideo(this.video.id) .subscribe( status => { - this.notificationsService.success('Success', `Video ${this.video.name} deleted.`); + this.notificationsService.success('Success', `Video ${this.video.name} deleted.`) // Go back to the video-list. - this.router.navigate(['/videos/list']); + this.router.navigate(['/videos/list']) }, error => this.notificationsService.error('Error', error.text) - ); + ) } - ); + ) } - blacklistVideo(event: Event) { - event.preventDefault(); + blacklistVideo (event: Event) { + event.preventDefault() this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe( res => { - if (res === false) return; + if (res === false) return this.videoService.blacklistVideo(this.video.id) .subscribe( status => { - this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`); - this.router.navigate(['/videos/list']); + this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`) + this.router.navigate(['/videos/list']) }, error => this.notificationsService.error('Error', error.text) - ); + ) } - ); + ) } - showReportModal(event: Event) { - event.preventDefault(); - this.videoReportModal.show(); + showReportModal (event: Event) { + event.preventDefault() + this.videoReportModal.show() } - showShareModal() { - this.videoShareModal.show(); + showShareModal () { + this.videoShareModal.show() } - showMagnetUriModal(event: Event) { - event.preventDefault(); - this.videoMagnetModal.show(); + showMagnetUriModal (event: Event) { + event.preventDefault() + this.videoMagnetModal.show() } - isUserLoggedIn() { - return this.authService.isLoggedIn(); + isUserLoggedIn () { + return this.authService.isLoggedIn() } - canUserUpdateVideo() { - return this.video.isUpdatableBy(this.authService.getUser()); + canUserUpdateVideo () { + return this.video.isUpdatableBy(this.authService.getUser()) } - isVideoRemovable() { - return this.video.isRemovableBy(this.authService.getUser()); + isVideoRemovable () { + return this.video.isRemovableBy(this.authService.getUser()) } - isVideoBlacklistable() { - return this.video.isBlackistableBy(this.authService.getUser()); + isVideoBlacklistable () { + return this.video.isBlackistableBy(this.authService.getUser()) + } + + private handleError (err: any) { + const errorMessage: string = typeof err === 'string' ? err : err.message + let message = '' + + if (errorMessage.indexOf('http error') !== -1) { + message = 'Cannot fetch video from server, maybe down.' + } else { + message = errorMessage + } + + this.notificationsService.error('Error', message) } - private checkUserRating() { + private checkUserRating () { // Unlogged users do not have ratings - if (this.isUserLoggedIn() === false) return; + if (this.isUserLoggedIn() === false) return this.videoService.getUserVideoRating(this.video.id) .subscribe( ratingObject => { if (ratingObject) { - this.userRating = ratingObject.rating; + this.userRating = ratingObject.rating } }, - err => this.notificationsService.error('Error', err.text) - ); + err => this.notificationsService.error('Error', err.message) + ) } - private onVideoFetched(video: Video) { - this.video = video; + private onVideoFetched (video: Video) { + this.video = video - let observable; + let observable if (this.video.isVideoNSFWForUser(this.authService.getUser())) { - observable = this.confirmService.confirm('This video is not safe for work. Are you sure you want to watch it?', 'NSFW'); + observable = this.confirmService.confirm('This video is not safe for work. Are you sure you want to watch it?', 'NSFW') } else { - observable = Observable.of(true); + observable = Observable.of(true) } observable.subscribe( res => { if (res === false) { - return this.router.navigate([ '/videos/list' ]); + return this.router.navigate([ '/videos/list' ]) + } + + this.playerElement = this.elementRef.nativeElement.querySelector('#video-container') + + const videojsOptions = { + controls: true, + autoplay: true, + plugins: { + peertube: { + videoFiles: this.video.files, + playerElement: this.playerElement, + autoplay: true, + peerTubeLink: false + } + } } - this.setOpenGraphTags(); - this.loadVideo(); - this.checkUserRating(); + const self = this + videojs(this.playerElement, videojsOptions, function () { + self.player = this + this.on('customError', (event, data) => { + self.handleError(data.err) + }) + + this.on('torrentInfo', (event, data) => { + self.downloadSpeed = data.downloadSpeed + self.numPeers = data.numPeers + self.uploadSpeed = data.uploadSpeed + }) + }) + + this.setOpenGraphTags() + this.checkUserRating() } - ); + ) } - private updateVideoRating(oldRating: RateType, newRating: RateType) { - let likesToIncrement = 0; - let dislikesToIncrement = 0; + private updateVideoRating (oldRating: UserVideoRateType, newRating: VideoRateType) { + let likesToIncrement = 0 + let dislikesToIncrement = 0 if (oldRating) { - if (oldRating === 'like') likesToIncrement--; - if (oldRating === 'dislike') dislikesToIncrement--; + if (oldRating === 'like') likesToIncrement-- + if (oldRating === 'dislike') dislikesToIncrement-- } - if (newRating === 'like') likesToIncrement++; - if (newRating === 'dislike') dislikesToIncrement++; + if (newRating === 'like') likesToIncrement++ + if (newRating === 'dislike') dislikesToIncrement++ - this.video.likes += likesToIncrement; - this.video.dislikes += dislikesToIncrement; + this.video.likes += likesToIncrement + this.video.dislikes += dislikesToIncrement } - private loadTooLong() { - this.error = true; - console.error('The video load seems to be abnormally long.'); - } - - private setOpenGraphTags() { - this.metaService.setTitle(this.video.name); + private setOpenGraphTags () { + this.metaService.setTitle(this.video.name) - this.metaService.setTag('og:type', 'video'); + this.metaService.setTag('og:type', 'video') - this.metaService.setTag('og:title', this.video.name); - this.metaService.setTag('name', this.video.name); + this.metaService.setTag('og:title', this.video.name) + this.metaService.setTag('name', this.video.name) - this.metaService.setTag('og:description', this.video.description); - this.metaService.setTag('description', this.video.description); + this.metaService.setTag('og:description', this.video.description) + this.metaService.setTag('description', this.video.description) - this.metaService.setTag('og:image', this.video.thumbnailPath); + this.metaService.setTag('og:image', this.video.previewPath) - this.metaService.setTag('og:duration', this.video.duration.toString()); + this.metaService.setTag('og:duration', this.video.duration.toString()) - this.metaService.setTag('og:site_name', 'PeerTube'); - - this.metaService.setTag('og:url', window.location.href); - this.metaService.setTag('url', window.location.href); - } + this.metaService.setTag('og:site_name', 'PeerTube') - private runInProgress(torrent: any) { - // Refresh each second - this.torrentInfosInterval = window.setInterval(() => { - this.ngZone.run(() => { - this.downloadSpeed = torrent.downloadSpeed; - this.numPeers = torrent.numPeers; - this.uploadSpeed = torrent.uploadSpeed; - }); - }, 1000); + this.metaService.setTag('og:url', window.location.href) + this.metaService.setTag('url', window.location.href) } }