X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fvideo-watch.component.ts;h=df5b8d02d6f18c8a3c01fdd8fabe4abd0942985d;hb=f37bad639b36d35c29a464dc52123a1e7c9cd28a;hp=3965bade862a34155cc65387e8ab9490759ca5b7;hpb=20b40b195aa89778a8b6dc22f76a2ea76ef406a8;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 3965bade8..df5b8d02d 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -1,12 +1,14 @@ import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' +import { RedirectService } from '@app/core/routing/redirect.service' +import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage' import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component' import { MetaService } from '@ngx-meta/core' import { NotificationsService } from 'angular2-notifications' -import { Observable } from 'rxjs/Observable' import { Subscription } from 'rxjs/Subscription' import * as videojs from 'video.js' import 'videojs-hotkeys' +import * as WebTorrent from 'webtorrent' import { UserVideoRateType, VideoRateType } from '../../../../../shared' import '../../../assets/player/peertube-videojs-plugin' import { AuthService, ConfirmService } from '../../core' @@ -19,6 +21,7 @@ import { MarkdownService } from '../shared' import { VideoDownloadComponent } from './modal/video-download.component' import { VideoReportComponent } from './modal/video-report.component' import { VideoShareComponent } from './modal/video-share.component' +import { getVideojsOptions } from '../../../assets/player/peertube-player' @Component({ selector: 'my-video-watch', @@ -26,6 +29,8 @@ import { VideoShareComponent } from './modal/video-share.component' styleUrls: [ './video-watch.component.scss' ] }) export class VideoWatchComponent implements OnInit, OnDestroy { + private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern' + @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent @ViewChild('videoShareModal') videoShareModal: VideoShareComponent @ViewChild('videoReportModal') videoReportModal: VideoReportComponent @@ -33,12 +38,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { otherVideosDisplayed: Video[] = [] - error = false player: videojs.Player playerElement: HTMLVideoElement userRating: UserVideoRateType = null video: VideoDetails = null - videoPlayerLoaded = false videoNotFound = false descriptionLoading = false @@ -47,6 +50,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { shortVideoDescription: string videoHTMLDescription = '' likesBarTooltipText = '' + hasAlreadyAcceptedPrivacyConcern = false private otherVideos: Video[] = [] private paramsSub: Subscription @@ -62,7 +66,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { private authService: AuthService, private notificationsService: NotificationsService, private markdownService: MarkdownService, - private zone: NgZone + private zone: NgZone, + private redirectService: RedirectService ) {} get user () { @@ -70,6 +75,13 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } ngOnInit () { + if ( + WebTorrent.WEBRTC_SUPPORT === false || + peertubeLocalStorage.getItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY) === 'true' + ) { + this.hasAlreadyAcceptedPrivacyConcern = true + } + this.videoService.getVideos({ currentPage: 1, itemsPerPage: 5 }, '-createdAt') .subscribe( data => { @@ -81,7 +93,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ) this.paramsSub = this.route.params.subscribe(routeParams => { - if (this.videoPlayerLoaded) { + if (this.player) { this.player.pause() } @@ -90,7 +102,11 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (this.video && this.video.uuid === uuid) return this.videoService.getVideo(uuid).subscribe( - video => this.onVideoFetched(video), + video => { + const startTime = this.route.snapshot.queryParams.start + this.onVideoFetched(video, startTime) + .catch(err => this.handleError(err)) + }, error => { this.videoNotFound = true @@ -101,10 +117,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } ngOnDestroy () { - // Remove player if it exists - if (this.videoPlayerLoaded === true) { - videojs(this.playerElement).dispose() - } + this.flushPlayer() // Unsubscribe subscriptions this.paramsSub.unsubscribe() @@ -140,7 +153,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { .subscribe( status => { this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`) - this.router.navigate(['/videos/list']) + this.redirectService.redirectToHomepage() }, error => this.notificationsService.error('Error', error.message) @@ -245,13 +258,18 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.notificationsService.success('Success', `Video ${this.video.name} deleted.`) // Go back to the video-list. - this.router.navigate([ '/videos/list' ]) + this.redirectService.redirectToHomepage() }, error => this.notificationsService.error('Error', error.message) ) } + acceptedPrivacyConcern () { + peertubeLocalStorage.setItem(VideoWatchComponent.LOCAL_STORAGE_PRIVACY_CONCERN_KEY, 'true') + this.hasAlreadyAcceptedPrivacyConcern = true + } + private updateVideoDescription (description: string) { this.video.description = description this.setVideoDescriptionHTML() @@ -301,75 +319,58 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ) } - private onVideoFetched (video: VideoDetails) { + private async onVideoFetched (video: VideoDetails, startTime = 0) { this.video = video + // Re init attributes + this.descriptionLoading = false + this.completeDescriptionShown = false + this.updateOtherVideosDisplayed() - let observable if (this.video.isVideoNSFWForUser(this.user)) { - observable = this.confirmService.confirm( + const res = await this.confirmService.confirm( 'This video contains mature or explicit content. Are you sure you want to watch it?', 'Mature or explicit content' ) - } else { - observable = Observable.of(true) + if (res === false) return this.redirectService.redirectToHomepage() } - observable.subscribe( - res => { - if (res === false) { - - return this.router.navigate([ '/videos/list' ]) - } + // Flush old player if needed + this.flushPlayer() + + // Build video element, because videojs remove it on dispose + const playerElementWrapper = this.elementRef.nativeElement.querySelector('#video-element-wrapper') + this.playerElement = document.createElement('video') + this.playerElement.className = 'video-js vjs-peertube-skin' + playerElementWrapper.appendChild(this.playerElement) + + const videojsOptions = getVideojsOptions({ + autoplay: this.isAutoplay(), + inactivityTimeout: 2500, + videoFiles: this.video.files, + playerElement: this.playerElement, + videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid), + videoDuration: this.video.duration, + enableHotkeys: true, + peertubeLink: false, + poster: this.video.previewUrl, + startTime + }) - // Player was already loaded - if (this.videoPlayerLoaded !== true) { - this.playerElement = this.elementRef.nativeElement.querySelector('#video-element') - - // If autoplay is true, we don't really need a poster - if (this.isAutoplay() === false) { - this.playerElement.poster = this.video.previewUrl - } - - const videojsOptions = { - controls: true, - autoplay: this.isAutoplay(), - plugins: { - peertube: { - videoFiles: this.video.files, - playerElement: this.playerElement, - peerTubeLink: false, - videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid), - videoDuration: this.video.duration - }, - hotkeys: { - enableVolumeScroll: false - } - } - } - - this.videoPlayerLoaded = true - - const self = this - this.zone.runOutsideAngular(() => { - videojs(this.playerElement, videojsOptions, function () { - self.player = this - this.on('customError', (event, data) => self.handleError(data.err)) - }) - }) - } else { - const videoViewUrl = this.videoService.getVideoViewUrl(this.video.uuid) - this.player.peertube().setVideoFiles(this.video.files, videoViewUrl, this.video.duration) - } + const self = this + this.zone.runOutsideAngular(() => { + videojs(this.playerElement, videojsOptions, function () { + self.player = this + this.on('customError', (event, data) => self.handleError(data.err)) + }) + }) - this.setVideoDescriptionHTML() - this.setVideoLikesBarTooltipText() + this.setVideoDescriptionHTML() + this.setVideoLikesBarTooltipText() - this.setOpenGraphTags() - this.checkUserRating() - } - ) + this.setOpenGraphTags() + this.checkUserRating() } private setRating (nextRating) { @@ -411,8 +412,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { this.video.likes += likesToIncrement this.video.dislikes += dislikesToIncrement - this.video.buildLikeAndDislikePercents() + this.video.buildLikeAndDislikePercents() this.setVideoLikesBarTooltipText() } @@ -450,4 +451,12 @@ export class VideoWatchComponent implements OnInit, OnDestroy { // Be sure the autoPlay is set to false return this.user.autoPlayVideo !== false } + + private flushPlayer () { + // Remove player if it exists + if (this.player) { + this.player.dispose() + this.player = undefined + } + } }