+import { catchError } from 'rxjs/operators'
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 { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
import { MetaService } from '@ngx-meta/core'
import { NotificationsService } from 'angular2-notifications'
-import { Subscription } from 'rxjs/Subscription'
+import { Subscription } from 'rxjs'
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 { VideoBlacklistService } from '../../shared'
-import { Account } from '../../shared/account/account.model'
+import { RestExtractor, VideoBlacklistService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
import { Video } from '../../shared/video/video.model'
import { VideoService } from '../../shared/video/video.service'
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'
+import { I18n } from '@ngx-translate/i18n-polyfill'
@Component({
selector: 'my-video-watch',
otherVideosDisplayed: Video[] = []
- error = false
player: videojs.Player
playerElement: HTMLVideoElement
userRating: UserVideoRateType = null
video: VideoDetails = null
- videoPlayerLoaded = false
videoNotFound = false
descriptionLoading = false
private confirmService: ConfirmService,
private metaService: MetaService,
private authService: AuthService,
+ private serverService: ServerService,
+ private restExtractor: RestExtractor,
private notificationsService: NotificationsService,
private markdownService: MarkdownService,
private zone: NgZone,
- private redirectService: RedirectService
+ private redirectService: RedirectService,
+ private i18n: I18n
) {}
get user () {
)
this.paramsSub = this.route.params.subscribe(routeParams => {
- if (this.videoPlayerLoaded) {
+ if (this.player) {
this.player.pause()
}
const uuid = routeParams['uuid']
- // Video did not changed
- if (this.video && this.video.uuid === uuid) return
-
- this.videoService.getVideo(uuid).subscribe(
- video => this.onVideoFetched(video),
- error => {
- this.videoNotFound = true
- console.error(error)
- }
- )
+ // Video did not change
+ if (this.video && this.video.uuid === uuid) return
+ // Video did change
+ this.videoService
+ .getVideo(uuid)
+ .pipe(catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])))
+ .subscribe(
+ video => {
+ const startTime = this.route.snapshot.queryParams.start
+ this.onVideoFetched(video, startTime)
+ .catch(err => this.handleError(err))
+ },
+
+ error => {
+ this.videoNotFound = true
+ console.error(error)
+ }
+ )
})
}
ngOnDestroy () {
- // Remove player if it exists
- if (this.videoPlayerLoaded === true) {
- videojs(this.playerElement).dispose()
- }
+ this.flushPlayer()
// Unsubscribe subscriptions
this.paramsSub.unsubscribe()
async blacklistVideo (event: Event) {
event.preventDefault()
- const res = await this.confirmService.confirm('Do you really want to blacklist this video?', 'Blacklist')
+ const res = await this.confirmService.confirm(this.i18n('Do you really want to blacklist this video?'), this.i18n('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.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Video {{videoName}} had been blacklisted.', { videoName: this.video.name })
+ )
this.redirectService.redirectToHomepage()
},
- error => this.notificationsService.error('Error', error.message)
+ error => this.notificationsService.error(this.i18n('Error'), error.message)
)
}
error => {
this.descriptionLoading = false
- this.notificationsService.error('Error', error.message)
+ this.notificationsService.error(this.i18n('Error'), error.message)
}
)
}
return this.video.isBlackistableBy(this.user)
}
- getAvatarPath () {
- return Account.GET_ACCOUNT_AVATAR_URL(this.video.account)
- }
-
getVideoPoster () {
if (!this.video) return ''
async removeVideo (event: Event) {
event.preventDefault()
- const res = await this.confirmService.confirm('Do you really want to delete this video?', 'Delete')
+ const res = await this.confirmService.confirm(this.i18n('Do you really want to delete this video?'), this.i18n('Delete'))
if (res === false) return
this.videoService.removeVideo(this.video.id)
.subscribe(
status => {
- this.notificationsService.success('Success', `Video ${this.video.name} deleted.`)
+ this.notificationsService.success(
+ this.i18n('Success'),
+ this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name })
+ )
// Go back to the video-list.
this.redirectService.redirectToHomepage()
},
- error => this.notificationsService.error('Error', error.message)
+ error => this.notificationsService.error(this.i18n('Error'), error.message)
)
}
}
private setVideoLikesBarTooltipText () {
- this.likesBarTooltipText = `${this.video.likes} likes / ${this.video.dislikes} dislikes`
+ this.likesBarTooltipText = this.i18n(
+ '{{likesNumber}} likes / {{dislikesNumber}} dislikes',
+ { likesNumber: this.video.likes, dislikes: this.video.dislikes }
+ )
}
private handleError (err: any) {
let message = ''
if (errorMessage.indexOf('http error') !== -1) {
- message = 'Cannot fetch video from server, maybe down.'
+ message = this.i18n('Cannot fetch video from server, maybe down.')
} else {
message = errorMessage
}
- this.notificationsService.error('Error', message)
+ this.notificationsService.error(this.i18n('Error'), message)
}
private checkUserRating () {
}
},
- err => this.notificationsService.error('Error', err.message)
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
)
}
- private async onVideoFetched (video: VideoDetails) {
+ private async onVideoFetched (video: VideoDetails, startTime = 0) {
this.video = video
+ // Re init attributes
+ this.descriptionLoading = false
+ this.completeDescriptionShown = false
+
this.updateOtherVideosDisplayed()
- if (this.video.isVideoNSFWForUser(this.user)) {
+ 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'
+ this.i18n('This video contains mature or explicit content. Are you sure you want to watch it?'),
+ this.i18n('Mature or explicit content')
)
if (res === false) return this.redirectService.redirectToHomepage()
}
- // 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 = getVideojsOptions({
- autoplay: this.isAutoplay(),
- inactivityTimeout: 4000,
- videoFiles: this.video.files,
- playerElement: this.playerElement,
- videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid),
- videoDuration: this.video.duration,
- enableHotkeys: true,
- peertubeLink: false
- })
-
- this.videoPlayerLoaded = true
+ // 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'
+ this.playerElement.setAttribute('playsinline', 'true')
+ playerElementWrapper.appendChild(this.playerElement)
+
+ const videojsOptions = getVideojsOptions({
+ autoplay: this.isAutoplay(),
+ inactivityTimeout: 2500,
+ videoFiles: this.video.files,
+ playerElement: this.playerElement,
+ videoEmbedUrl: this.video.embedUrl,
+ videoViewUrl: this.videoService.getVideoViewUrl(this.video.uuid),
+ videoDuration: this.video.duration,
+ enableHotkeys: true,
+ peertubeLink: false,
+ poster: this.video.previewUrl,
+ startTime
+ })
- const self = this
- this.zone.runOutsideAngular(() => {
- videojs(this.playerElement, videojsOptions, function () {
- self.player = this
- this.on('customError', (event, data) => self.handleError(data.err))
- })
+ 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)
- }
+ })
this.setVideoDescriptionHTML()
this.setVideoLikesBarTooltipText()
this.updateVideoRating(this.userRating, nextRating)
this.userRating = nextRating
},
- err => this.notificationsService.error('Error', err.message)
+ err => this.notificationsService.error(this.i18n('Error'), err.message)
)
}
// 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