Notifier,
PeerTubeSocket,
RestExtractor,
+ ScreenService,
ServerService,
UserService
} from '@app/core'
import { isXPercentInViewport, scrollToTop } from '@app/helpers'
import { Video, VideoCaptionService, VideoDetails, VideoService } from '@app/shared/shared-main'
import { VideoShareComponent } from '@app/shared/shared-share-modal'
+import { SupportModalComponent } from '@app/shared/shared-support-modal'
import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription'
import { VideoActionsDisplayType, VideoDownloadComponent } from '@app/shared/shared-video-miniature'
import { VideoPlaylist, VideoPlaylistService } from '@app/shared/shared-video-playlist'
import { MetaService } from '@ngx-meta/core'
import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
import { ServerConfig, ServerErrorCode, UserVideoRateType, VideoCaption, VideoPrivacy, VideoState } from '@shared/models'
-import { getStoredP2PEnabled, getStoredTheater } from '../../../assets/player/peertube-player-local-storage'
+import {
+ cleanupVideoWatch,
+ getStoredP2PEnabled,
+ getStoredTheater,
+ getStoredVideoWatchHistory
+} from '../../../assets/player/peertube-player-local-storage'
import {
CustomizationOptions,
P2PMediaLoaderOptions,
} from '../../../assets/player/peertube-player-manager'
import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
import { environment } from '../../../environments/environment'
-import { VideoSupportComponent } from './modal/video-support.component'
import { VideoWatchPlaylistComponent } from './video-watch-playlist.component'
type URLOptions = CustomizationOptions & { playerMode: PlayerMode }
@ViewChild('videoWatchPlaylist', { static: true }) videoWatchPlaylist: VideoWatchPlaylistComponent
@ViewChild('videoShareModal') videoShareModal: VideoShareComponent
- @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
+ @ViewChild('supportModal') supportModal: SupportModalComponent
@ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
@ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent
player: any
playerElement: HTMLVideoElement
+
theaterEnabled = false
+
userRating: UserVideoRateType = null
- descriptionLoading = false
+
+ playerPlaceholderImgSrc: string
video: VideoDetails = null
videoCaptions: VideoCaption[] = []
playlistPosition: number
playlist: VideoPlaylist = null
+ descriptionLoading = false
completeDescriptionShown = false
completeVideoDescription: string
shortVideoDescription: string
videoHTMLDescription = ''
+
likesBarTooltipText = ''
+
hasAlreadyAcceptedPrivacyConcern = false
remoteServerDown = false
+
hotkeys: Hotkey[] = []
tooltipLike = ''
private hotkeysService: HotkeysService,
private hooks: HooksService,
private peertubeSocket: PeerTubeSocket,
+ private screenService: ScreenService,
private location: PlatformLocation,
@Inject(LOCALE_ID) private localeId: string
- ) {
- this.tooltipLike = $localize`Like this video`
- this.tooltipDislike = $localize`Dislike this video`
- this.tooltipSupport = $localize`Support options for this video`
- this.tooltipSaveToPlaylist = $localize`Save to playlist`
- }
+ ) { }
get user () {
return this.authService.getUser()
}
async ngOnInit () {
+ // Hide the tooltips for unlogged users in mobile view, this adds confusion with the popover
+ if (this.user || !this.screenService.isInMobileView()) {
+ this.tooltipLike = $localize`Like this video`
+ this.tooltipDislike = $localize`Dislike this video`
+ this.tooltipSupport = $localize`Support options for this video`
+ this.tooltipSaveToPlaylist = $localize`Save to playlist`
+ }
+
PeertubePlayerManager.initState()
this.serverConfig = this.serverService.getTmpConfig()
this.theaterEnabled = getStoredTheater()
this.hooks.runAction('action:video-watch.init', 'video-watch')
+
+ setTimeout(cleanupVideoWatch, 1500) // Run in timeout to ensure we're not blocking the UI
}
ngOnDestroy () {
}
showSupportModal () {
- // Check video was playing before opening support modal
- const isVideoPlaying = this.isPlaying()
-
- this.pausePlayer()
-
- const modalRef = this.videoSupportModal.show()
-
- modalRef.result.then(() => {
- if (isVideoPlaying) {
- this.resumePlayer()
- }
- })
+ this.supportModal.show()
}
showShareModal () {
- this.pausePlayer()
-
this.videoShareModal.show(this.currentTime, this.videoWatchPlaylist.currentPlaylistPosition)
}
return this.authService.isLoggedIn()
}
+ getVideoUrl () {
+ if (!this.video.url) {
+ return this.video.originInstanceUrl + VideoDetails.buildClientUrl(this.video.uuid)
+ }
+ return this.video.url
+ }
+
getVideoTags () {
if (!this.video || Array.isArray(this.video.tags) === false) return []
}
}
- onModalOpened () {
- this.pausePlayer()
- }
-
onVideoRemoved () {
this.redirectService.redirectToHomepage()
}
}
handleTimestampClicked (timestamp: number) {
- if (this.player) this.player.currentTime(timestamp)
+ if (!this.player || this.video.isLive) return
+
+ this.player.currentTime(timestamp)
scrollToTop()
}
this.loadVideo(videoId)
}
+ displayOtherVideosAsRow () {
+ // Use the same value as in the SASS file
+ return this.screenService.getWindowInnerWidth() <= 1100
+ }
+
private loadVideo (videoId: string) {
// Video did not change
if (this.video && this.video.uuid === videoId) return
this.videoCaptionService.listCaptions(videoId)
])
.pipe(
- // If 401, the video is private or blocked so redirect to 404
+ // If 400, 403 or 404, the video is private or blocked so redirect to 404
catchError(err => {
if (err.body.errorCode === ServerErrorCode.DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS && err.body.originUrl) {
const search = window.location.search
$localize`This video is not available on this instance. Do you want to be redirected on the origin instance: <a href="${originUrl}">${originUrl}</a>?`,
$localize`Redirection`
).then(res => {
- if (res === false) return this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])
+ if (res === false) {
+ return this.restExtractor.redirectTo404IfNotFound(err, 'video', [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ])
+ }
return window.location.href = originUrl
})
}
- return this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ])
+ return this.restExtractor.redirectTo404IfNotFound(err, 'video', [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ])
})
)
.subscribe(([ video, captionsResult ]) => {
this.playlistService.getVideoPlaylist(playlistId)
.pipe(
- // If 401, the video is private or blocked so redirect to 404
- catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
+ // If 400 or 403, the video is private or blocked so redirect to 404
+ catchError(err => this.restExtractor.redirectTo404IfNotFound(err, 'video', [
+ HttpStatusCode.BAD_REQUEST_400,
+ HttpStatusCode.FORBIDDEN_403,
+ HttpStatusCode.NOT_FOUND_404
+ ]))
)
.subscribe(playlist => {
this.playlist = playlist
this.videoCaptions = videoCaptions
// Re init attributes
+ this.playerPlaceholderImgSrc = undefined
this.descriptionLoading = false
this.completeDescriptionShown = false
+ this.completeVideoDescription = undefined
this.remoteServerDown = false
this.currentTime = undefined
if (res === false) return this.location.back()
}
- const videoState = this.video.state.id
- if (videoState === VideoState.LIVE_ENDED || videoState === VideoState.WAITING_FOR_LIVE) return
+ this.buildPlayer(urlOptions)
+ .catch(err => console.error('Cannot build the player', err))
+
+ this.setVideoDescriptionHTML()
+ this.setVideoLikesBarTooltipText()
+
+ this.setOpenGraphTags()
+ this.checkUserRating()
+
+ const hookOptions = {
+ videojs,
+ video: this.video,
+ playlist: this.playlist
+ }
+ this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', hookOptions)
+ }
+ private async buildPlayer (urlOptions: URLOptions) {
// Flush old player if needed
this.flushPlayer()
+ const videoState = this.video.state.id
+ if (videoState === VideoState.LIVE_ENDED || videoState === VideoState.WAITING_FOR_LIVE) {
+ this.playerPlaceholderImgSrc = this.video.previewPath
+ return
+ }
+
// Build video element, because videojs removes it on dispose
const playerElementWrapper = this.elementRef.nativeElement.querySelector('#videojs-wrapper')
this.playerElement = document.createElement('video')
const params = {
video: this.video,
- videoCaptions,
+ videoCaptions: this.videoCaptions,
urlOptions,
user: this.user
}
}
})
+ this.player.one('ended', () => {
+ if (this.video.isLive) {
+ this.video.state.id = VideoState.LIVE_ENDED
+ }
+ })
+
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, videojs, video: this.video })
})
-
- this.setVideoDescriptionHTML()
- this.setVideoLikesBarTooltipText()
-
- this.setOpenGraphTags()
- this.checkUserRating()
-
- this.hooks.runAction('action:video-watch.video.loaded', 'video-watch', { videojs })
}
private autoplayNext () {
const getStartTime = () => {
const byUrl = urlOptions.startTime !== undefined
const byHistory = video.userHistory && (!this.playlist || urlOptions.resume !== undefined)
+ const byLocalStorage = getStoredVideoWatchHistory(video.uuid)
if (byUrl) return timeToInt(urlOptions.startTime)
if (byHistory) return video.userHistory.currentTime
+ if (byLocalStorage) return byLocalStorage.duration
return 0
}
? this.videoService.getVideoViewUrl(video.uuid)
: null,
embedUrl: video.embedUrl,
+ embedTitle: video.name,
isLive: video.isLive,
serverUrl: environment.apiUrl,
- videoCaptions: playerCaptions
+ videoCaptions: playerCaptions,
+
+ videoUUID: video.uuid
},
webtorrent: {
return { playerMode: mode, playerOptions: options }
}
- private pausePlayer () {
- if (!this.player) return
+ private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) {
+ if (!this.liveVideosSub) {
+ this.liveVideosSub = this.buildLiveEventsSubscription()
+ }
- this.player.pause()
- }
+ if (oldVideo && oldVideo.id !== newVideo.id) {
+ await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+ }
- private resumePlayer () {
- if (!this.player) return
+ if (!newVideo.isLive) return
- this.player.play()
+ await this.peertubeSocket.subscribeToLiveVideosSocket(newVideo.id)
}
- private isPlaying () {
- if (!this.player) return
-
- return !this.player.paused()
+ private buildLiveEventsSubscription () {
+ return this.peertubeSocket.getLiveVideosObservable()
+ .subscribe(({ type, payload }) => {
+ if (type === 'state-change') return this.handleLiveStateChange(payload.state)
+ if (type === 'views-change') return this.handleLiveViewsChange(payload.views)
+ })
}
- private async subscribeToLiveEventsIfNeeded (oldVideo: VideoDetails, newVideo: VideoDetails) {
- if (!this.liveVideosSub) {
- this.liveVideosSub = this.peertubeSocket.getLiveVideosObservable()
- .subscribe(({ payload }) => {
- if (payload.state !== VideoState.PUBLISHED || this.video.state.id !== VideoState.WAITING_FOR_LIVE) return
+ private handleLiveStateChange (newState: VideoState) {
+ if (newState !== VideoState.PUBLISHED) return
- const videoUUID = this.video.uuid
+ const videoState = this.video.state.id
+ if (videoState !== VideoState.WAITING_FOR_LIVE && videoState !== VideoState.LIVE_ENDED) return
- // Reset to refetch the video
- this.video = undefined
- this.loadVideo(videoUUID)
- })
- }
+ console.log('Loading video after live update.')
- if (oldVideo && oldVideo.id !== newVideo.id) {
- await this.peertubeSocket.unsubscribeLiveVideos(oldVideo.id)
+ const videoUUID = this.video.uuid
+
+ // Reset to refetch the video
+ this.video = undefined
+ this.loadVideo(videoUUID)
+ }
+
+ private handleLiveViewsChange (newViews: number) {
+ if (!this.video) {
+ console.error('Cannot update video live views because video is no defined.')
+ return
}
- if (!newVideo.isLive) return
+ console.log('Updating live views.')
- await this.peertubeSocket.subscribeToLiveVideosSocket(newVideo.id)
+ this.video.views = newViews
}
private initHotkeys () {
projects / github / Chocobozzz / PeerTube.git / blobdiff