import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
+import { MetaService } from '@ngx-meta/core'
+import { NotificationsService } from 'angular2-notifications'
+import { VideoService } from 'app/shared/video/video.service'
import { Observable } from 'rxjs/Observable'
import { Subscription } from 'rxjs/Subscription'
-
import videojs from 'video.js'
+import { UserVideoRateType, VideoRateType } from '../../../../../shared'
import '../../../assets/player/peertube-videojs-plugin'
-
-import { MetaService } from '@ngx-meta/core'
-import { NotificationsService } from 'angular2-notifications'
-
import { AuthService, ConfirmService } from '../../core'
-import { VideoMagnetComponent } from './video-magnet.component'
-import { VideoShareComponent } from './video-share.component'
+import { VideoBlacklistService } from '../../shared'
+import { Account } from '../../shared/account/account.model'
+import { VideoDetails } from '../../shared/video/video-details.model'
+import { Video } from '../../shared/video/video.model'
+import { MarkdownService } from '../shared'
+import { VideoDownloadComponent } from './video-download.component'
import { VideoReportComponent } from './video-report.component'
-import { Video, VideoService } from '../shared'
-import { WebTorrentService } from './webtorrent.service'
-import { UserVideoRateType, VideoRateType } from '../../../../../shared'
+import { VideoShareComponent } from './video-share.component'
@Component({
selector: 'my-video-watch',
styleUrls: [ './video-watch.component.scss' ]
})
export class VideoWatchComponent implements OnInit, OnDestroy {
- @ViewChild('videoMagnetModal') videoMagnetModal: VideoMagnetComponent
+ @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent
@ViewChild('videoShareModal') videoShareModal: VideoShareComponent
@ViewChild('videoReportModal') videoReportModal: VideoReportComponent
- downloadSpeed: number
+ otherVideos: Video[] = []
+
error = false
loading = false
- numPeers: number
player: videojs.Player
playerElement: HTMLMediaElement
- uploadSpeed: number
userRating: UserVideoRateType = null
- video: Video = null
+ video: VideoDetails = null
+ videoPlayerLoaded = false
videoNotFound = false
+ descriptionLoading = false
+
+ completeDescriptionShown = false
+ completeVideoDescription: string
+ shortVideoDescription: string
+ videoHTMLDescription = ''
private paramsSub: Subscription
private route: ActivatedRoute,
private router: Router,
private videoService: VideoService,
+ private videoBlacklistService: VideoBlacklistService,
private confirmService: ConfirmService,
private metaService: MetaService,
private authService: AuthService,
- private notificationsService: NotificationsService
+ private notificationsService: NotificationsService,
+ private markdownService: MarkdownService
) {}
ngOnInit () {
+ this.videoService.getVideos({ currentPage: 1, itemsPerPage: 5 }, '-createdAt')
+ .subscribe(
+ data => this.otherVideos = data.videos,
+
+ err => console.error(err)
+ )
+
this.paramsSub = this.route.params.subscribe(routeParams => {
let uuid = routeParams['uuid']
this.videoService.getVideo(uuid).subscribe(
video => this.onVideoFetched(video),
error => {
- console.error(error)
this.videoNotFound = true
+ console.error(error)
}
)
})
ngOnDestroy () {
// Remove player if it exists
- if (this.videoNotFound === false) {
+ if (this.videoPlayerLoaded === true) {
videojs(this.playerElement).dispose()
}
)
}
- removeVideo (event: Event) {
+ blacklistVideo (event: Event) {
event.preventDefault()
- this.confirmService.confirm('Do you really want to delete this video?', 'Delete').subscribe(
+ this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe(
res => {
if (res === false) return
- 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'])
- },
+ this.videoBlacklistService.blacklistVideo(this.video.id)
+ .subscribe(
+ status => {
+ this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
+ this.router.navigate(['/videos/list'])
+ },
- error => this.notificationsService.error('Error', error.text)
- )
+ error => this.notificationsService.error('Error', error.text)
+ )
}
)
}
- blacklistVideo (event: Event) {
- event.preventDefault()
+ showMoreDescription () {
+ if (this.completeVideoDescription === undefined) {
+ return this.loadCompleteDescription()
+ }
- this.confirmService.confirm('Do you really want to blacklist this video ?', 'Blacklist').subscribe(
- res => {
- if (res === false) return
+ this.updateVideoDescription(this.completeVideoDescription)
+ this.completeDescriptionShown = true
+ }
- this.videoService.blacklistVideo(this.video.id)
- .subscribe(
- status => {
- this.notificationsService.success('Success', `Video ${this.video.name} had been blacklisted.`)
- this.router.navigate(['/videos/list'])
- },
+ showLessDescription () {
+ this.updateVideoDescription(this.shortVideoDescription)
+ this.completeDescriptionShown = false
+ }
- error => this.notificationsService.error('Error', error.text)
- )
- }
- )
+ loadCompleteDescription () {
+ this.descriptionLoading = true
+
+ this.videoService.loadCompleteDescription(this.video.descriptionPath)
+ .subscribe(
+ description => {
+ this.completeDescriptionShown = true
+ this.descriptionLoading = false
+
+ this.shortVideoDescription = this.video.description
+ this.completeVideoDescription = description
+
+ this.updateVideoDescription(this.completeVideoDescription)
+ },
+
+ error => {
+ this.descriptionLoading = false
+ this.notificationsService.error('Error', error.text)
+ }
+ )
}
showReportModal (event: Event) {
this.videoShareModal.show()
}
- showMagnetUriModal (event: Event) {
+ showDownloadModal (event: Event) {
event.preventDefault()
- this.videoMagnetModal.show()
+ this.videoDownloadModal.show()
}
isUserLoggedIn () {
return this.authService.isLoggedIn()
}
- canUserUpdateVideo () {
- return this.video.isUpdatableBy(this.authService.getUser())
+ isVideoBlacklistable () {
+ return this.video.isBlackistableBy(this.authService.getUser())
}
- isVideoRemovable () {
- return this.video.isRemovableBy(this.authService.getUser())
+ getAvatarPath () {
+ return Account.GET_ACCOUNT_AVATAR_PATH(this.video.account)
}
- isVideoBlacklistable () {
- return this.video.isBlackistableBy(this.authService.getUser())
+ getVideoTags () {
+ if (!this.video || Array.isArray(this.video.tags) === false) return []
+
+ return this.video.tags.join(', ')
+ }
+
+ private updateVideoDescription (description: string) {
+ this.video.description = description
+ this.setVideoDescriptionHTML()
+ }
+
+ private setVideoDescriptionHTML () {
+ this.videoHTMLDescription = this.markdownService.markdownToHTML(this.video.description)
}
private handleError (err: any) {
)
}
- private onVideoFetched (video: Video) {
+ private onVideoFetched (video: VideoDetails) {
this.video = video
let observable
if (this.video.isVideoNSFWForUser(this.authService.getUser())) {
- observable = this.confirmService.confirm('This video is not safe for work. Are you sure you want to watch it?', 'NSFW')
+ observable = 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)
}
observable.subscribe(
res => {
if (res === false) {
+
return this.router.navigate([ '/videos/list' ])
}
- this.playerElement = this.elementRef.nativeElement.querySelector('#video-container')
+ this.playerElement = this.elementRef.nativeElement.querySelector('#video-element')
const videojsOptions = {
controls: true,
}
}
+ this.videoPlayerLoaded = true
+
const self = this
videojs(this.playerElement, videojsOptions, function () {
self.player = this
this.on('customError', (event, data) => {
self.handleError(data.err)
})
-
- this.on('torrentInfo', (event, data) => {
- self.downloadSpeed = data.downloadSpeed
- self.numPeers = data.numPeers
- self.uploadSpeed = data.uploadSpeed
- })
})
+ this.setVideoDescriptionHTML()
+
this.setOpenGraphTags()
this.checkUserRating()
+
+ this.prepareViewAdd()
}
)
}
this.metaService.setTag('og:url', window.location.href)
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)
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff