diff options
Diffstat (limited to 'shared/models/videos')
-rw-r--r-- | shared/models/videos/file/index.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/file/video-file-metadata.model.ts (renamed from shared/models/videos/video-file-metadata.model.ts) | 0 | ||||
-rw-r--r-- | shared/models/videos/file/video-file.model.ts (renamed from shared/models/videos/video-file.model.ts) | 2 | ||||
-rw-r--r-- | shared/models/videos/file/video-resolution.enum.ts (renamed from shared/models/videos/video-resolution.enum.ts) | 0 | ||||
-rw-r--r-- | shared/models/videos/index.ts | 9 | ||||
-rw-r--r-- | shared/models/videos/transcoding/index.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/transcoding/video-transcoding-create.model.ts | 3 | ||||
-rw-r--r-- | shared/models/videos/transcoding/video-transcoding-fps.model.ts (renamed from shared/models/videos/video-transcoding-fps.model.ts) | 0 | ||||
-rw-r--r-- | shared/models/videos/transcoding/video-transcoding.model.ts (renamed from shared/models/videos/video-transcoding.model.ts) | 2 | ||||
-rw-r--r-- | shared/models/videos/video-streaming-playlist.model.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 2 |
11 files changed, 15 insertions, 11 deletions
diff --git a/shared/models/videos/file/index.ts b/shared/models/videos/file/index.ts new file mode 100644 index 000000000..78a784a3c --- /dev/null +++ b/shared/models/videos/file/index.ts | |||
@@ -0,0 +1,3 @@ | |||
1 | export * from './video-file-metadata.model' | ||
2 | export * from './video-file.model' | ||
3 | export * from './video-resolution.enum' | ||
diff --git a/shared/models/videos/video-file-metadata.model.ts b/shared/models/videos/file/video-file-metadata.model.ts index 8f527c0a7..8f527c0a7 100644 --- a/shared/models/videos/video-file-metadata.model.ts +++ b/shared/models/videos/file/video-file-metadata.model.ts | |||
diff --git a/shared/models/videos/video-file.model.ts b/shared/models/videos/file/video-file.model.ts index 28fce0aaf..0ea857e7a 100644 --- a/shared/models/videos/video-file.model.ts +++ b/shared/models/videos/file/video-file.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { VideoConstant } from './video-constant.model' | 1 | import { VideoConstant } from '../video-constant.model' |
2 | import { VideoFileMetadata } from './video-file-metadata.model' | 2 | import { VideoFileMetadata } from './video-file-metadata.model' |
3 | import { VideoResolution } from './video-resolution.enum' | 3 | import { VideoResolution } from './video-resolution.enum' |
4 | 4 | ||
diff --git a/shared/models/videos/video-resolution.enum.ts b/shared/models/videos/file/video-resolution.enum.ts index 5b48ad353..5b48ad353 100644 --- a/shared/models/videos/video-resolution.enum.ts +++ b/shared/models/videos/file/video-resolution.enum.ts | |||
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 3d3eedcc6..67614efc9 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts | |||
@@ -4,9 +4,11 @@ export * from './change-ownership' | |||
4 | export * from './channel' | 4 | export * from './channel' |
5 | export * from './comment' | 5 | export * from './comment' |
6 | export * from './live' | 6 | export * from './live' |
7 | export * from './file' | ||
7 | export * from './import' | 8 | export * from './import' |
8 | export * from './playlist' | 9 | export * from './playlist' |
9 | export * from './rate' | 10 | export * from './rate' |
11 | export * from './transcoding' | ||
10 | 12 | ||
11 | export * from './nsfw-policy.type' | 13 | export * from './nsfw-policy.type' |
12 | 14 | ||
@@ -15,14 +17,10 @@ export * from './thumbnail.type' | |||
15 | export * from './video-constant.model' | 17 | export * from './video-constant.model' |
16 | export * from './video-create.model' | 18 | export * from './video-create.model' |
17 | 19 | ||
18 | export * from './video-file-metadata.model' | ||
19 | export * from './video-file.model' | ||
20 | |||
21 | export * from './video-privacy.enum' | 20 | export * from './video-privacy.enum' |
22 | export * from './video-filter.type' | 21 | export * from './video-filter.type' |
23 | export * from './video-include.enum' | 22 | export * from './video-include.enum' |
24 | export * from './video-rate.type' | 23 | export * from './video-rate.type' |
25 | export * from './video-resolution.enum' | ||
26 | 24 | ||
27 | export * from './video-schedule-update.model' | 25 | export * from './video-schedule-update.model' |
28 | export * from './video-sort-field.type' | 26 | export * from './video-sort-field.type' |
@@ -32,9 +30,6 @@ export * from './video-storage.enum' | |||
32 | export * from './video-streaming-playlist.model' | 30 | export * from './video-streaming-playlist.model' |
33 | export * from './video-streaming-playlist.type' | 31 | export * from './video-streaming-playlist.type' |
34 | 32 | ||
35 | export * from './video-transcoding.model' | ||
36 | export * from './video-transcoding-fps.model' | ||
37 | |||
38 | export * from './video-update.model' | 33 | export * from './video-update.model' |
39 | export * from './video.model' | 34 | export * from './video.model' |
40 | export * from './video-create-result.model' | 35 | export * from './video-create-result.model' |
diff --git a/shared/models/videos/transcoding/index.ts b/shared/models/videos/transcoding/index.ts new file mode 100644 index 000000000..14472d900 --- /dev/null +++ b/shared/models/videos/transcoding/index.ts | |||
@@ -0,0 +1,3 @@ | |||
1 | export * from './video-transcoding-create.model' | ||
2 | export * from './video-transcoding-fps.model' | ||
3 | export * from './video-transcoding.model' | ||
diff --git a/shared/models/videos/transcoding/video-transcoding-create.model.ts b/shared/models/videos/transcoding/video-transcoding-create.model.ts new file mode 100644 index 000000000..aeb393e57 --- /dev/null +++ b/shared/models/videos/transcoding/video-transcoding-create.model.ts | |||
@@ -0,0 +1,3 @@ | |||
1 | export interface VideoTranscodingCreate { | ||
2 | transcodingType: 'hls' | 'webtorrent' | ||
3 | } | ||
diff --git a/shared/models/videos/video-transcoding-fps.model.ts b/shared/models/videos/transcoding/video-transcoding-fps.model.ts index 25fc1c2da..25fc1c2da 100644 --- a/shared/models/videos/video-transcoding-fps.model.ts +++ b/shared/models/videos/transcoding/video-transcoding-fps.model.ts | |||
diff --git a/shared/models/videos/video-transcoding.model.ts b/shared/models/videos/transcoding/video-transcoding.model.ts index 83b8e98a0..3a7fb6472 100644 --- a/shared/models/videos/video-transcoding.model.ts +++ b/shared/models/videos/transcoding/video-transcoding.model.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { VideoResolution } from './video-resolution.enum' | 1 | import { VideoResolution } from '../file/video-resolution.enum' |
2 | 2 | ||
3 | // Types used by plugins and ffmpeg-utils | 3 | // Types used by plugins and ffmpeg-utils |
4 | 4 | ||
diff --git a/shared/models/videos/video-streaming-playlist.model.ts b/shared/models/videos/video-streaming-playlist.model.ts index b547a0ac7..11919a4ee 100644 --- a/shared/models/videos/video-streaming-playlist.model.ts +++ b/shared/models/videos/video-streaming-playlist.model.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' | 1 | import { VideoStreamingPlaylistType } from './video-streaming-playlist.type' |
2 | import { VideoFile } from './video-file.model' | 2 | import { VideoFile } from './file' |
3 | 3 | ||
4 | export interface VideoStreamingPlaylist { | 4 | export interface VideoStreamingPlaylist { |
5 | id: number | 5 | id: number |
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 8d223cded..f98eed012 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Account, AccountSummary } from '../actors' | 1 | import { Account, AccountSummary } from '../actors' |
2 | import { VideoChannel, VideoChannelSummary } from './channel/video-channel.model' | 2 | import { VideoChannel, VideoChannelSummary } from './channel/video-channel.model' |
3 | import { VideoFile } from './file' | ||
3 | import { VideoConstant } from './video-constant.model' | 4 | import { VideoConstant } from './video-constant.model' |
4 | import { VideoFile } from './video-file.model' | ||
5 | import { VideoPrivacy } from './video-privacy.enum' | 5 | import { VideoPrivacy } from './video-privacy.enum' |
6 | import { VideoScheduleUpdate } from './video-schedule-update.model' | 6 | import { VideoScheduleUpdate } from './video-schedule-update.model' |
7 | import { VideoState } from './video-state.enum' | 7 | import { VideoState } from './video-state.enum' |