import { VideoSupportComponent } from '@app/videos/+video-watch/modal/video-support.component'
import { MetaService } from '@ngx-meta/core'
import { Notifier, ServerService } from '@app/core'
-import { forkJoin, Subscription } from 'rxjs'
+import { forkJoin, Observable, Subscription } from 'rxjs'
import { Hotkey, HotkeysService } from 'angular2-hotkeys'
-import { UserVideoRateType, VideoCaption, VideoPlaylistPrivacy, VideoPrivacy, VideoState } from '../../../../../shared'
+import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '../../../../../shared'
import { AuthService, ConfirmService } from '../../core'
import { RestExtractor, VideoBlacklistService } from '../../shared'
import { VideoDetails } from '../../shared/video/video-details.model'
import { VideoCaptionService } from '@app/shared/video-caption'
import { MarkdownService } from '@app/shared/renderer'
import {
+ videojs,
+ CustomizationOptions,
P2PMediaLoaderOptions,
PeertubePlayerManager,
PeertubePlayerManagerOptions,
} from '../../../assets/player/peertube-player-manager'
import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model'
import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service'
-import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
import { Video } from '@app/shared/video/video.model'
-import { isWebRTCDisabled } from '../../../assets/player/utils'
+import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
+import { VideoWatchPlaylistComponent } from '@app/videos/+video-watch/video-watch-playlist.component'
+import { getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
+import { PluginService } from '@app/core/plugins/plugin.service'
+import { HooksService } from '@app/core/plugins/hooks.service'
+import { PlatformLocation } from '@angular/common'
+import { randomInt } from '@shared/core-utils/miscs/miscs'
@Component({
selector: 'my-video-watch',
export class VideoWatchComponent implements OnInit, OnDestroy {
private static LOCAL_STORAGE_PRIVACY_CONCERN_KEY = 'video-watch-privacy-concern'
- @ViewChild('videoShareModal') videoShareModal: VideoShareComponent
- @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
- @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
+ @ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
+ @ViewChild('videoShareModal', { static: false }) videoShareModal: VideoShareComponent
+ @ViewChild('videoSupportModal', { static: false }) videoSupportModal: VideoSupportComponent
+ @ViewChild('subscribeButton', { static: false }) subscribeButton: SubscribeButtonComponent
player: any
playerElement: HTMLVideoElement
theaterEnabled = false
userRating: UserVideoRateType = null
- video: VideoDetails = null
descriptionLoading = false
+ video: VideoDetails = null
+ videoCaptions: VideoCaption[] = []
+
playlist: VideoPlaylist = null
- playlistVideos: Video[] = []
- playlistPagination: ComponentPagination = {
- currentPage: 1,
- itemsPerPage: 30,
- totalItems: null
- }
- noPlaylistVideos = false
- currentPlaylistPosition = 1
completeDescriptionShown = false
completeVideoDescription: string
remoteServerDown = false
hotkeys: Hotkey[]
+ private nextVideoUuid = ''
private currentTime: number
private paramsSub: Subscription
private queryParamsSub: Subscription
private serverService: ServerService,
private restExtractor: RestExtractor,
private notifier: Notifier,
+ private pluginService: PluginService,
private markdownService: MarkdownService,
private zone: NgZone,
private redirectService: RedirectService,
private videoCaptionService: VideoCaptionService,
private i18n: I18n,
private hotkeysService: HotkeysService,
+ private hooks: HooksService,
+ private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
) {}
return this.authService.getUser()
}
- ngOnInit () {
+ async ngOnInit () {
this.configSub = this.serverService.configLoaded
.subscribe(() => {
if (
if (videoId) this.loadVideo(videoId)
})
- this.hotkeys = [
- new Hotkey('shift+l', (event: KeyboardEvent): boolean => {
- this.setLike()
- return false
- }, undefined, this.i18n('Like the video')),
- new Hotkey('shift+d', (event: KeyboardEvent): boolean => {
- this.setDislike()
- return false
- }, undefined, this.i18n('Dislike the video')),
- new Hotkey('shift+s', (event: KeyboardEvent): boolean => {
- this.subscribeButton.subscribed ?
- this.subscribeButton.unsubscribe() :
- this.subscribeButton.subscribe()
- return false
- }, undefined, this.i18n('Subscribe to the account'))
- ]
- if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
+ this.initHotkeys()
+
+ this.theaterEnabled = getStoredTheater()
+
+ this.hooks.runAction('action:video-watch.init', 'video-watch')
}
ngOnDestroy () {
setLike () {
if (this.isUserLoggedIn() === false) return
- if (this.userRating === 'like') {
- // Already liked this video
- this.setRating('none')
- } else {
- this.setRating('like')
- }
+
+ // Already liked this video
+ if (this.userRating === 'like') this.setRating('none')
+ else this.setRating('like')
}
setDislike () {
if (this.isUserLoggedIn() === false) return
- if (this.userRating === 'dislike') {
- // Already disliked this video
- this.setRating('none')
- } else {
- this.setRating('dislike')
- }
+
+ // Already disliked this video
+ if (this.userRating === 'dislike') this.setRating('none')
+ else this.setRating('dislike')
}
showMoreDescription () {
}
showSupportModal () {
+ this.pausePlayer()
+
this.videoSupportModal.show()
}
showShareModal () {
+ this.pausePlayer()
+
this.videoShareModal.show(this.currentTime)
}
return this.video.tags
}
- isVideoRemovable () {
- return this.video.isRemovableBy(this.authService.getUser())
+ onRecommendations (videos: Video[]) {
+ if (videos.length > 0) {
+ // Pick a random video until the recommendations are improved
+ this.nextVideoUuid = videos[randomInt(0,videos.length - 1)].uuid
+ }
+ }
+
+ onModalOpened () {
+ this.pausePlayer()
}
onVideoRemoved () {
return this.video && this.video.state.id === VideoState.TO_TRANSCODE
}
- isVideoDownloadable () {
- return this.video && this.video.downloadEnabled
- }
-
isVideoToImport () {
return this.video && this.video.state.id === VideoState.TO_IMPORT
}
return video.isVideoNSFWForUser(this.user, this.serverService.getConfig())
}
- isPlaylistOwned () {
- return this.playlist.isLocal === true && this.playlist.ownerAccount.name === this.user.username
- }
-
- isUnlistedPlaylist () {
- return this.playlist.privacy.id === VideoPlaylistPrivacy.UNLISTED
- }
-
- isPrivatePlaylist () {
- return this.playlist.privacy.id === VideoPlaylistPrivacy.PRIVATE
- }
-
- isPublicPlaylist () {
- return this.playlist.privacy.id === VideoPlaylistPrivacy.PUBLIC
- }
-
- onPlaylistVideosNearOfBottom () {
- // Last page
- if (this.playlistPagination.totalItems <= (this.playlistPagination.currentPage * this.playlistPagination.itemsPerPage)) return
-
- this.playlistPagination.currentPage += 1
- this.loadPlaylistElements(false)
- }
-
- onElementRemoved (video: Video) {
- this.playlistVideos = this.playlistVideos.filter(v => v.id !== video.id)
-
- this.playlistPagination.totalItems--
- }
-
private loadVideo (videoId: string) {
// Video did not change
if (this.video && this.video.uuid === videoId) return
if (this.player) this.player.pause()
+ const videoObs = this.hooks.wrapObsFun(
+ this.videoService.getVideo.bind(this.videoService),
+ { videoId },
+ 'video-watch',
+ 'filter:api.video-watch.video.get.params',
+ 'filter:api.video-watch.video.get.result'
+ )
+
// Video did change
- forkJoin(
- this.videoService.getVideo(videoId),
+ forkJoin([
+ videoObs,
this.videoCaptionService.listCaptions(videoId)
- )
+ ])
.pipe(
// If 401, the video is private or blacklisted so redirect to 404
catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
)
.subscribe(([ video, captionsResult ]) => {
const queryParams = this.route.snapshot.queryParams
- const startTime = queryParams.start
- const stopTime = queryParams.stop
- const subtitle = queryParams.subtitle
- const playerMode = queryParams.mode
- this.onVideoFetched(video, captionsResult.data, { startTime, stopTime, subtitle, playerMode })
+ const urlOptions = {
+ startTime: queryParams.start,
+ stopTime: queryParams.stop,
+
+ muted: queryParams.muted,
+ loop: queryParams.loop,
+ subtitle: queryParams.subtitle,
+
+ playerMode: queryParams.mode,
+ peertubeLink: false
+ }
+
+ this.onVideoFetched(video, captionsResult.data, urlOptions)
.catch(err => this.handleError(err))
})
}
this.playlist = playlist
const videoId = this.route.snapshot.queryParams['videoId']
- this.loadPlaylistElements(!videoId)
+ this.videoWatchPlaylist.loadPlaylistElements(playlist, !videoId)
})
}
- private loadPlaylistElements (redirectToFirst = false) {
- this.videoService.getPlaylistVideos(this.playlist.uuid, this.playlistPagination)
- .subscribe(({ totalVideos, videos }) => {
- this.playlistVideos = this.playlistVideos.concat(videos)
- this.playlistPagination.totalItems = totalVideos
-
- if (totalVideos === 0) {
- this.noPlaylistVideos = true
- return
- }
-
- this.updatePlaylistIndex()
-
- if (redirectToFirst) {
- const extras = {
- queryParams: { videoId: this.playlistVideos[ 0 ].uuid },
- replaceUrl: true
- }
- this.router.navigate([], extras)
- }
- })
- }
-
private updateVideoDescription (description: string) {
this.video.description = description
this.setVideoDescriptionHTML()
+ .catch(err => console.error(err))
}
private async setVideoDescriptionHTML () {
private async onVideoFetched (
video: VideoDetails,
videoCaptions: VideoCaption[],
- urlOptions: { startTime?: number, stopTime?: number, subtitle?: string, playerMode?: string }
+ urlOptions: CustomizationOptions & { playerMode: PlayerMode }
) {
this.video = video
+ this.videoCaptions = videoCaptions
// Re init attributes
this.descriptionLoading = false
this.remoteServerDown = false
this.currentTime = undefined
- this.updatePlaylistIndex()
+ this.videoWatchPlaylist.updatePlaylistIndex(video)
- let startTime = urlOptions.startTime || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
+ let startTime = timeToInt(urlOptions.startTime) || (this.video.userHistory ? this.video.userHistory.currentTime : 0)
// If we are at the end of the video, reset the timer
if (this.video.duration - startTime <= 1) startTime = 0
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()
+ if (res === false) return this.location.back()
}
// Flush old player if needed
this.flushPlayer()
- // Build video element, because videojs remove it on dispose
+ // Build video element, because videojs removes it on dispose
const playerElementWrapper = this.elementRef.nativeElement.querySelector('#videojs-wrapper')
this.playerElement = document.createElement('video')
this.playerElement.className = 'video-js vjs-peertube-skin'
enableHotkeys: true,
inactivityTimeout: 2500,
poster: this.video.previewUrl,
+
startTime,
stopTime: urlOptions.stopTime,
+ controls: urlOptions.controls,
+ muted: urlOptions.muted,
+ loop: urlOptions.loop,
+ subtitle: urlOptions.subtitle,
+
+ peertubeLink: urlOptions.peertubeLink,
theaterMode: true,
captions: videoCaptions.length !== 0,
- peertubeLink: false,
- videoViewUrl: this.video.privacy.id !== VideoPrivacy.PRIVATE ? this.videoService.getVideoViewUrl(this.video.uuid) : null,
+ videoViewUrl: this.video.privacy.id !== VideoPrivacy.PRIVATE
+ ? this.videoService.getVideoViewUrl(this.video.uuid)
+ : null,
embedUrl: this.video.embedUrl,
language: this.localeId,
- subtitle: urlOptions.subtitle,
-
userWatching: this.user && this.user.videosHistoryEnabled === true ? {
url: this.videoService.getUserWatchingVideoUrl(this.video.uuid),
authorizationHeader: this.authService.getRequestHeaderValue()
}
}
- const mode: PlayerMode = urlOptions.playerMode === 'p2p-media-loader' ? 'p2p-media-loader' : 'webtorrent'
+ let mode: PlayerMode
+
+ if (urlOptions.playerMode) {
+ if (urlOptions.playerMode === 'p2p-media-loader') mode = 'p2p-media-loader'
+ else mode = 'webtorrent'
+ } else {
+ if (this.video.hasHlsPlaylist()) mode = 'p2p-media-loader'
+ else mode = 'webtorrent'
+ }
if (mode === 'p2p-media-loader') {
const hlsPlaylist = this.video.getHlsPlaylist()
segmentsSha256Url: hlsPlaylist.segmentsSha256Url,
redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl),
trackerAnnounce: this.video.trackerUrls,
- videoFiles: this.video.files
+ videoFiles: hlsPlaylist.files
} as P2PMediaLoaderOptions
Object.assign(options, { p2pMediaLoader })
}
this.zone.runOutsideAngular(async () => {
- this.player = await PeertubePlayerManager.initialize(mode, options)
- this.theaterEnabled = this.player.theaterEnabled
+ this.player = await PeertubePlayerManager.initialize(mode, options, player => this.player = player)
+ this.player.focus()
this.player.on('customError', ({ err }: { err: any }) => this.handleError(err))
this.player.one('ended', () => {
if (this.playlist) {
- this.zone.run(() => this.navigateToNextPlaylistVideo())
+ this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
+ } else if (this.user && this.user.autoPlayNextVideo) {
+ this.zone.run(() => this.autoplayNext())
}
})
this.player.one('stopped', () => {
if (this.playlist) {
- this.zone.run(() => this.navigateToNextPlaylistVideo())
+ this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
}
})
this.player.on('theaterChange', (_: any, enabled: boolean) => {
this.zone.run(() => this.theaterEnabled = enabled)
})
+
+ this.hooks.runAction('action:video-watch.player.loaded', 'video-watch', { player: this.player })
})
this.setVideoDescriptionHTML()
this.setOpenGraphTags()
this.checkUserRating()
+
+ this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', { videojs })
+ }
+
+ private autoplayNext () {
+ if (this.nextVideoUuid) {
+ this.router.navigate([ '/videos/watch', this.nextVideoUuid ])
+ }
}
private setRating (nextRating: UserVideoRateType) {
- let method
- switch (nextRating) {
- case 'like':
- method = this.videoService.setVideoLike
- break
- case 'dislike':
- method = this.videoService.setVideoDislike
- break
- case 'none':
- method = this.videoService.unsetVideoLike
- break
+ const ratingMethods: { [id in UserVideoRateType]: (id: number) => Observable<any> } = {
+ like: this.videoService.setVideoLike,
+ dislike: this.videoService.setVideoDislike,
+ none: this.videoService.unsetVideoLike
}
- method.call(this.videoService, this.video.id)
+ ratingMethods[nextRating].call(this.videoService, this.video.id)
.subscribe(
() => {
// Update the video like attribute
this.setVideoLikesBarTooltipText()
}
- private updatePlaylistIndex () {
- if (this.playlistVideos.length === 0 || !this.video) return
-
- for (const video of this.playlistVideos) {
- if (video.id === this.video.id) {
- this.currentPlaylistPosition = video.playlistElement.position
- return
- }
- }
-
- // Load more videos to find our video
- this.onPlaylistVideosNearOfBottom()
- }
-
private setOpenGraphTags () {
this.metaService.setTitle(this.video.name)
private flushPlayer () {
// Remove player if it exists
if (this.player) {
- this.player.dispose()
- this.player = undefined
+ try {
+ this.player.dispose()
+ this.player = undefined
+ } catch (err) {
+ console.error('Cannot dispose player.', err)
+ }
}
}
- private navigateToNextPlaylistVideo () {
- if (this.currentPlaylistPosition < this.playlistPagination.totalItems) {
- const next = this.playlistVideos.find(v => v.playlistElement.position === this.currentPlaylistPosition + 1)
+ private initHotkeys () {
+ this.hotkeys = [
+ new Hotkey('shift+l', () => {
+ this.setLike()
+ return false
+ }, undefined, this.i18n('Like the video')),
+
+ new Hotkey('shift+d', () => {
+ this.setDislike()
+ return false
+ }, undefined, this.i18n('Dislike the video')),
+
+ new Hotkey('shift+s', () => {
+ this.subscribeButton.subscribed ? this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe()
+ return false
+ }, undefined, this.i18n('Subscribe to the account'))
+ ]
+ if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
+ }
+
+ private pausePlayer () {
+ if (!this.player) return
- const start = next.playlistElement.startTimestamp
- const stop = next.playlistElement.stopTimestamp
- this.router.navigate([],{ queryParams: { videoId: next.uuid, start, stop } })
- }
+ this.player.pause()
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff