X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo-details.model.ts;h=e4d443a06ae88f5bed879946b92e1580c447ef29;hb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;hp=c746bfd6630d6e533c8678b1900f484fcbdebb74;hpb=2422c46b27790d94fd29a7092170cee5a1b56008;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts index c746bfd66..e4d443a06 100644 --- a/client/src/app/shared/video/video-details.model.ts +++ b/client/src/app/shared/video/video-details.model.ts @@ -1,92 +1,58 @@ -import { - UserRight, VideoChannel, VideoDetails as VideoDetailsServerModel, VideoFile, VideoPrivacy, - VideoResolution -} from '../../../../../shared' -import { Account } from '../../../../../shared/models/actors' -import { AuthUser } from '../../core' +import { VideoConstant, VideoDetails as VideoDetailsServerModel, VideoFile, VideoState } from '../../../../../shared' import { Video } from '../../shared/video/video.model' +import { Account } from '@app/shared/account/account.model' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' +import { VideoStreamingPlaylist } from '../../../../../shared/models/videos/video-streaming-playlist.model' +import { VideoStreamingPlaylistType } from '../../../../../shared/models/videos/video-streaming-playlist.type' export class VideoDetails extends Video implements VideoDetailsServerModel { - accountName: string - by: string - createdAt: Date - updatedAt: Date - categoryLabel: string - category: number - licenceLabel: string - licence: number - languageLabel: string - language: number - description: string + descriptionPath: string support: string - duration: number - durationLabel: string - id: number - uuid: string - isLocal: boolean - name: string - serverHost: string + channel: VideoChannel tags: string[] - thumbnailPath: string - thumbnailUrl: string - previewPath: string - previewUrl: string - embedPath: string - embedUrl: string - views: number - likes: number - dislikes: number - nsfw: boolean - descriptionPath: string files: VideoFile[] - channel: VideoChannel - privacy: VideoPrivacy - privacyLabel: string account: Account + commentsEnabled: boolean + downloadEnabled: boolean + + waitTranscoding: boolean + state: VideoConstant + likesPercent: number dislikesPercent: number - commentsEnabled: boolean - constructor (hash: VideoDetailsServerModel) { - super(hash) + trackerUrls: string[] + + streamingPlaylists: VideoStreamingPlaylist[] + + constructor (hash: VideoDetailsServerModel, translations = {}) { + super(hash, translations) - this.privacy = hash.privacy - this.privacyLabel = hash.privacyLabel this.descriptionPath = hash.descriptionPath this.files = hash.files - this.channel = hash.channel - this.account = hash.account + this.channel = new VideoChannel(hash.channel) + this.account = new Account(hash.account) this.tags = hash.tags + this.support = hash.support this.commentsEnabled = hash.commentsEnabled + this.downloadEnabled = hash.downloadEnabled - this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100 - this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100 - } - - getAppropriateMagnetUri (actualDownloadSpeed = 0) { - if (this.files === undefined || this.files.length === 0) return '' - if (this.files.length === 1) return this.files[0].magnetUri + this.trackerUrls = hash.trackerUrls + this.streamingPlaylists = hash.streamingPlaylists - // Find first video that is good for our download speed (remember they are sorted) - let betterResolutionFile = this.files.find(f => actualDownloadSpeed > (f.size / this.duration)) - - // If the download speed is too bad, return the lowest resolution we have - if (betterResolutionFile === undefined) { - betterResolutionFile = this.files.find(f => f.resolution === VideoResolution.H_240P) - } - - return betterResolutionFile.magnetUri + this.buildLikeAndDislikePercents() } - isRemovableBy (user: AuthUser) { - return user && this.isLocal === true && (this.accountName === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO)) + buildLikeAndDislikePercents () { + this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100 + this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100 } - isBlackistableBy (user: AuthUser) { - return user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true && this.isLocal === false + getHlsPlaylist () { + return this.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) } - isUpdatableBy (user: AuthUser) { - return user && this.isLocal === true && user.username === this.accountName + hasHlsPlaylist () { + return !!this.getHlsPlaylist() } }