-import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
+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'
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'
+import { ServerService } from '@app/core'
@Component({
selector: 'my-video-watch',
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
+ @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
otherVideosDisplayed: Video[] = []
- error = false
- loading = false
player: videojs.Player
playerElement: HTMLVideoElement
userRating: UserVideoRateType = null
video: VideoDetails = null
- videoPlayerLoaded = false
videoNotFound = false
descriptionLoading = false
shortVideoDescription: string
videoHTMLDescription = ''
likesBarTooltipText = ''
+ hasAlreadyAcceptedPrivacyConcern = false
private otherVideos: Video[] = []
private paramsSub: Subscription
private confirmService: ConfirmService,
private metaService: MetaService,
private authService: AuthService,
+ private serverService: ServerService,
private notificationsService: NotificationsService,
- private markdownService: MarkdownService
+ private markdownService: MarkdownService,
+ private zone: NgZone,
+ private redirectService: RedirectService
) {}
get user () {
}
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 => this.otherVideos = data.videos,
+ data => {
+ this.otherVideos = data.videos
+ this.updateOtherVideosDisplayed()
+ },
+
err => console.error(err)
)
this.paramsSub = this.route.params.subscribe(routeParams => {
- if (this.videoPlayerLoaded) {
+ if (this.player) {
this.player.pause()
}
- let uuid = routeParams['uuid']
+ const uuid = routeParams['uuid']
+ // Video did not change
+ if (this.video && this.video.uuid === uuid) return
+ // Video did change
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
}
ngOnDestroy () {
- // Remove player if it exists
- if (this.videoPlayerLoaded === true) {
- videojs(this.playerElement).dispose()
- }
+ this.flushPlayer()
// Unsubscribe subscriptions
this.paramsSub.unsubscribe()
}
}
- blacklistVideo (event: Event) {
+ async blacklistVideo (event: Event) {
event.preventDefault()
- this.confirmService.confirm('Do you really want to blacklist this video?', 'Blacklist').subscribe(
- res => {
- if (res === false) return
+ const res = await this.confirmService.confirm('Do you really want to blacklist this video?', 'Blacklist')
+ if (res === false) return
- this.videoBlacklistService.blacklistVideo(this.video.id)
- .subscribe(
- status => {
- this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
- this.router.navigate(['/videos/list'])
- },
+ this.videoBlacklistService.blacklistVideo(this.video.id)
+ .subscribe(
+ status => {
+ this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
+ this.redirectService.redirectToHomepage()
+ },
- error => this.notificationsService.error('Error', error.message)
- )
- }
- )
+ error => this.notificationsService.error('Error', error.message)
+ )
}
showMoreDescription () {
this.videoReportModal.show()
}
+ showSupportModal () {
+ this.videoSupportModal.show()
+ }
+
showShareModal () {
this.videoShareModal.show()
}
return Account.GET_ACCOUNT_AVATAR_URL(this.video.account)
}
+ getVideoPoster () {
+ if (!this.video) return ''
+
+ return this.video.previewUrl
+ }
+
getVideoTags () {
if (!this.video || Array.isArray(this.video.tags) === false) return []
return this.video.isRemovableBy(this.authService.getUser())
}
- removeVideo (event: Event) {
+ async removeVideo (event: Event) {
event.preventDefault()
- this.confirmService.confirm('Do you really want to delete this video?', 'Delete')
- .subscribe(
- res => {
- if (res === false) return
+ const res = await this.confirmService.confirm('Do you really want to delete this video?', 'Delete')
+ if (res === false) return
- this.videoService.removeVideo(this.video.id)
- .subscribe(
- status => {
- this.notificationsService.success('Success', `Video ${this.video.name} deleted.`)
+ 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' ])
- },
+ // Go back to the video-list.
+ this.redirectService.redirectToHomepage()
+ },
- error => this.notificationsService.error('Error', error.message)
- )
- }
+ 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()
return
}
- this.videoHTMLDescription = this.markdownService.markdownToHTML(this.video.description)
+ this.videoHTMLDescription = this.markdownService.textMarkdownToHTML(this.video.description)
}
private setVideoLikesBarTooltipText () {
private handleError (err: any) {
const errorMessage: string = typeof err === 'string' ? err : err.message
+ if (!errorMessage) return
+
let message = ''
if (errorMessage.indexOf('http error') !== -1) {
)
}
- private onVideoFetched (video: VideoDetails) {
+ private async onVideoFetched (video: VideoDetails, startTime = 0) {
this.video = video
- if (this.otherVideos.length > 0) {
- this.otherVideosDisplayed = this.otherVideos.filter(v => v.uuid !== this.video.uuid)
- }
+ // Re init attributes
+ this.descriptionLoading = false
+ this.completeDescriptionShown = false
- let observable
- if (this.video.isVideoNSFWForUser(this.user)) {
- observable = this.confirmService.confirm(
+ this.updateOtherVideosDisplayed()
+
+ if (this.video.isVideoNSFWForUser(this.user, this.serverService.getConfig())) {
+ 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' ])
- }
-
- // 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
- },
- hotkeys: {}
- }
- }
-
- this.videoPlayerLoaded = true
-
- const self = this
- videojs(this.playerElement, videojsOptions, function () {
- self.player = this
- this.on('customError', (event, data) => {
- self.handleError(data.err)
- })
- })
- } else {
- (this.player as any).setVideoFiles(this.video.files)
- }
+ // 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
+ })
- this.setVideoDescriptionHTML()
- this.setVideoLikesBarTooltipText()
+ const self = this
+ this.zone.runOutsideAngular(() => {
+ videojs(this.playerElement, videojsOptions, function () {
+ self.player = this
+ this.on('customError', (event, data) => self.handleError(data.err))
+ })
+ })
- this.setOpenGraphTags()
- this.checkUserRating()
+ this.setVideoDescriptionHTML()
+ this.setVideoLikesBarTooltipText()
- this.prepareViewAdd()
- }
- )
+ this.setOpenGraphTags()
+ this.checkUserRating()
}
private setRating (nextRating) {
this.video.likes += likesToIncrement
this.video.dislikes += dislikesToIncrement
+
+ this.video.buildLikeAndDislikePercents()
+ this.setVideoLikesBarTooltipText()
+ }
+
+ private updateOtherVideosDisplayed () {
+ if (this.video && this.otherVideos && this.otherVideos.length > 0) {
+ this.otherVideosDisplayed = this.otherVideos.filter(v => v.uuid !== this.video.uuid)
+ }
}
private setOpenGraphTags () {
this.metaService.setTag('url', window.location.href)
}
- private prepareViewAdd () {
- // After 30 seconds (or 3/4 of the video), increment add a view
- let viewTimeoutSeconds = 30
- if (this.video.duration < viewTimeoutSeconds) viewTimeoutSeconds = (this.video.duration * 3) / 4
-
- setTimeout(() => {
- this.videoService
- .viewVideo(this.video.uuid)
- .subscribe()
-
- }, viewTimeoutSeconds * 1000)
- }
-
private isAutoplay () {
// True by default
if (!this.user) return true
// 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
+ }
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff