From d7a25329f9e607894d29ab342b9cb66638b56dc0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 15 Nov 2019 15:06:03 +0100 Subject: Add ability to disable webtorrent In favour of HLS --- shared/models/videos/index.ts | 1 + shared/models/videos/video-file.model.ts | 12 ++++++++++++ shared/models/videos/video-streaming-playlist.model.ts | 3 +++ shared/models/videos/video.model.ts | 12 +----------- 4 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 shared/models/videos/video-file.model.ts (limited to 'shared/models/videos') diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 194ae1b96..51ccb9fbd 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts @@ -23,6 +23,7 @@ export * from './playlist/video-playlist-element.model' export * from './video-change-ownership.model' export * from './video-change-ownership-create.model' export * from './video-create.model' +export * from './video-file.model' export * from './video-privacy.enum' export * from './video-rate.type' export * from './video-resolution.enum' diff --git a/shared/models/videos/video-file.model.ts b/shared/models/videos/video-file.model.ts new file mode 100644 index 000000000..04da0627e --- /dev/null +++ b/shared/models/videos/video-file.model.ts @@ -0,0 +1,12 @@ +import { VideoConstant, VideoResolution } from '@shared/models' + +export interface VideoFile { + magnetUri: string + resolution: VideoConstant + size: number // Bytes + torrentUrl: string + torrentDownloadUrl: string + fileUrl: string + fileDownloadUrl: string + fps: number +} diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts index 17f8fe865..42fce4bdc 100644 --- a/shared/models/videos/video-streaming-playlist.model.ts +++ b/shared/models/videos/video-streaming-playlist.model.ts @@ -1,4 +1,5 @@ import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' +import { VideoFile } from '@shared/models/videos/video-file.model' export class VideoStreamingPlaylist { id: number @@ -9,4 +10,6 @@ export class VideoStreamingPlaylist { redundancies: { baseUrl: string }[] + + files: VideoFile[] } diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index e057b3e06..7576439fe 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts @@ -5,17 +5,7 @@ import { VideoPrivacy } from './video-privacy.enum' import { VideoScheduleUpdate } from './video-schedule-update.model' import { VideoConstant } from './video-constant.model' import { VideoStreamingPlaylist } from './video-streaming-playlist.model' - -export interface VideoFile { - magnetUri: string - resolution: VideoConstant - size: number // Bytes - torrentUrl: string - torrentDownloadUrl: string - fileUrl: string - fileDownloadUrl: string - fps: number -} +import { VideoFile } from './video-file.model' export interface Video { id: number -- cgit v1.2.3