X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo-details.model.ts;h=14347a109da8478747c0127e5c18262a616795ff;hb=ba430d7516bc5b1324b60571ba7594460969b7fb;hp=a22ed68da7f0f6a556f73ee5a19d7d4fa88f317b;hpb=6221f311de0eb8f2a9e7e4a77b8cb0ecbde6dfcd;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 a22ed68da..14347a109 100644
--- a/client/src/app/shared/video/video-details.model.ts
+++ b/client/src/app/shared/video/video-details.model.ts
@@ -1,93 +1,64 @@
-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<VideoState>
+
   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.trackerUrls = hash.trackerUrls
+    this.streamingPlaylists = hash.streamingPlaylists
+
+    this.buildLikeAndDislikePercents()
+  }
 
+  buildLikeAndDislikePercents () {
     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
-
-    // 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
+  getHlsPlaylist () {
+    return this.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS)
   }
 
-  isRemovableBy (user: AuthUser) {
-    return user && this.isLocal === true && (this.accountName === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
+  hasHlsPlaylist () {
+    return !!this.getHlsPlaylist()
   }
 
-  isBlackistableBy (user: AuthUser) {
-    return user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true && this.isLocal === false
-  }
+  getFiles () {
+    if (this.files.length === 0) return this.getHlsPlaylist().files
 
-  isUpdatableBy (user: AuthUser) {
-    return user && this.isLocal === true && (this.accountName === user.username || user.hasRight(UserRight.UPDATE_ANY_VIDEO))
+    return this.files
   }
 }