X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fvideo-watch%2Fvideo-watch.component.ts;h=d4b60b001dfdb597f35345892accca6eaa0313d5;hb=66dd264f7b15c05006faa00694c88c56794edc54;hp=3dab2bbb7f1432262bdec720d65f497b72528497;hpb=9c89a45cb2a7bb46e68fb084723a2046b12c7617;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 3dab2bbb7..d4b60b001 100644 --- a/client/src/app/videos/video-watch/video-watch.component.ts +++ b/client/src/app/videos/video-watch/video-watch.component.ts @@ -1,11 +1,17 @@ import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; +import { Observable } from 'rxjs/Observable'; +import { Subscription } from 'rxjs/Subscription'; -import { ModalDirective } from 'ng2-bootstrap/components/modal'; -import { MetaService } from 'ng2-meta'; import * as videojs from 'video.js'; - -import { Video, VideoService } from '../shared'; +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'; @Component({ @@ -15,10 +21,11 @@ import { WebTorrentService } from './webtorrent.service'; }) export class VideoWatchComponent implements OnInit, OnDestroy { - private static LOADTIME_TOO_LONG: number = 30000; + private static LOADTIME_TOO_LONG: number = 20000; - @ViewChild('magnetUriModal') magnetUriModal: ModalDirective; - @ViewChild('shareModal') shareModal: ModalDirective; + @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent; + @ViewChild('videoShareModal') videoShareModal: VideoShareComponent; + @ViewChild('videoReportModal') videoReportModal: VideoReportComponent; downloadSpeed: number; error: boolean = false; @@ -27,34 +34,36 @@ export class VideoWatchComponent implements OnInit, OnDestroy { player: VideoJSPlayer; playerElement: Element; uploadSpeed: number; + userRating: RateType = null; video: Video = null; videoNotFound = false; - private errorTimer: NodeJS.Timer; - private sub: any; - private torrentInfosInterval: NodeJS.Timer; + private errorTimer: number; + private paramsSub: Subscription; + private errorsSub: Subscription; + private warningsSub: Subscription; + private torrentInfosInterval: number; 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 webTorrentService: WebTorrentService, + private authService: AuthService, + private notificationsService: NotificationsService ) {} ngOnInit() { - this.sub = this.route.params.subscribe(routeParams => { + this.paramsSub = this.route.params.subscribe(routeParams => { let id = routeParams['id']; this.videoService.getVideo(id).subscribe( - video => { - this.video = video; - this.setOpenGraphTags(); - this.loadVideo(); - }, - error => { - this.videoNotFound = true; - } + video => this.onVideoFetched(video), + + error => this.videoNotFound = true ); }); @@ -69,23 +78,28 @@ export class VideoWatchComponent implements OnInit, OnDestroy { 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)); } ngOnDestroy() { // Remove WebTorrent stuff console.log('Removing video from webtorrent.'); - clearInterval(this.torrentInfosInterval); - clearTimeout(this.errorTimer); + window.clearInterval(this.torrentInfosInterval); + window.clearTimeout(this.errorTimer); - if (this.video !== null) { + if (this.video !== null && this.webTorrentService.has(this.video.magnetUri)) { this.webTorrentService.remove(this.video.magnetUri); } // Remove player videojs(this.playerElement).dispose(); - // Unsubscribe route subscription - this.sub.unsubscribe(); + // Unsubscribe subscriptions + this.paramsSub.unsubscribe(); + this.errorsSub.unsubscribe(); + this.warningsSub.unsubscribe(); } loadVideo() { @@ -98,11 +112,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { // 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 = setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG); + this.errorTimer = window.setTimeout(() => this.loadTooLong(), VideoWatchComponent.LOADTIME_TOO_LONG); this.webTorrentService.add(this.video.magnetUri, (torrent) => { // Clear the error timer - clearTimeout(this.errorTimer); + window.clearTimeout(this.errorTimer); // Maybe the error was fired by the timer, so reset it this.error = false; @@ -112,7 +126,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { console.log('Added ' + this.video.magnetUri + '.'); torrent.files[0].renderTo(this.playerElement, { autoplay: true }, (err) => { if (err) { - alert('Cannot append the file.'); + this.notificationsService.error('Error', 'Cannot append the file in the video element.'); console.error(err); } }); @@ -121,31 +135,164 @@ export class VideoWatchComponent implements OnInit, OnDestroy { }); } - showMagnetUriModal() { - this.magnetUriModal.show(); + setLike() { + if (this.isUserLoggedIn() === false) return; + // Already liked this video + 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'; + }, + + err => this.notificationsService.error('Error', err.text) + ); + } + + setDislike() { + if (this.isUserLoggedIn() === false) return; + // Already disliked this video + 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'; + }, + + err => this.notificationsService.error('Error', err.text) + ); + } + + removeVideo(event: Event) { + event.preventDefault(); + + this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe( + res => { + if (res === false) return; + + this.videoService.removeVideo(this.video.id) + .subscribe( + status => { + this.notificationsService.success('Success', `Video ${this.video.name} deleted.`); + // Go back to the video-list. + this.router.navigate(['/videos/list']); + }, + + error => this.notificationsService.error('Error', error.text) + ); + } + ); + } + + blacklistVideo(event: Event) { + event.preventDefault(); + + this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe( + res => { + 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']); + }, + + error => this.notificationsService.error('Error', error.text) + ); + } + ); } - hideMagnetUriModal() { - this.magnetUriModal.hide(); + showReportModal(event: Event) { + event.preventDefault(); + this.videoReportModal.show(); } showShareModal() { - this.shareModal.show(); + this.videoShareModal.show(); } - hideShareModal() { - this.shareModal.hide(); + showMagnetUriModal(event: Event) { + event.preventDefault(); + this.videoMagnetModal.show(); } - getVideoIframeCode() { - return ''; + isUserLoggedIn() { + return this.authService.isLoggedIn(); } - getVideoUrl() { - return window.location.href; + canUserUpdateVideo() { + return this.video.isUpdatableBy(this.authService.getUser()); + } + + isVideoRemovable() { + return this.video.isRemovableBy(this.authService.getUser()); + } + + isVideoBlacklistable() { + return this.video.isBlackistableBy(this.authService.getUser()); + } + + private checkUserRating() { + // Unlogged users do not have ratings + if (this.isUserLoggedIn() === false) return; + + this.videoService.getUserVideoRating(this.video.id) + .subscribe( + ratingObject => { + if (ratingObject) { + this.userRating = ratingObject.rating; + } + }, + + err => this.notificationsService.error('Error', err.text) + ); + } + + private onVideoFetched(video: Video) { + this.video = video; + + 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'); + } else { + observable = Observable.of(true); + } + + observable.subscribe( + res => { + if (res === false) { + return this.router.navigate([ '/videos/list' ]); + } + + this.setOpenGraphTags(); + this.loadVideo(); + this.checkUserRating(); + } + ); + } + + private updateVideoRating(oldRating: RateType, newRating: RateType) { + let likesToIncrement = 0; + let dislikesToIncrement = 0; + + if (oldRating) { + if (oldRating === 'like') likesToIncrement--; + if (oldRating === 'dislike') dislikesToIncrement--; + } + + if (newRating === 'like') likesToIncrement++; + if (newRating === 'dislike') dislikesToIncrement++; + + this.video.likes += likesToIncrement; + this.video.dislikes += dislikesToIncrement; } private loadTooLong() { @@ -154,6 +301,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } private setOpenGraphTags() { + this.metaService.setTitle(this.video.name); + this.metaService.setTag('og:type', 'video'); this.metaService.setTag('og:title', this.video.name); @@ -164,7 +313,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.metaService.setTag('og:image', this.video.thumbnailPath); - this.metaService.setTag('og:duration', this.video.duration); + this.metaService.setTag('og:duration', this.video.duration.toString()); this.metaService.setTag('og:site_name', 'PeerTube'); @@ -174,7 +323,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private runInProgress(torrent: any) { // Refresh each second - this.torrentInfosInterval = setInterval(() => { + this.torrentInfosInterval = window.setInterval(() => { this.ngZone.run(() => { this.downloadSpeed = torrent.downloadSpeed; this.numPeers = torrent.numPeers;