diff options
author | Chocobozzz <me@florianbigard.com> | 2021-02-16 16:25:53 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-02-18 13:38:09 +0100 |
commit | 90a8bd305de4153ec21137a73ff482dcc2e3e19b (patch) | |
tree | 2e35b5504ec11bc51579c92a70c77ed3d5ace816 /server/types/models/video/video.ts | |
parent | 684cdacbbd775b5f404dd7b373e02dd21baf5ff0 (diff) | |
download | PeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.tar.gz PeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.tar.zst PeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.zip |
Dissociate video file names and video uuid
Diffstat (limited to 'server/types/models/video/video.ts')
-rw-r--r-- | server/types/models/video/video.ts | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index ae23cc30f..92dcbaf59 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts | |||
@@ -1,27 +1,28 @@ | |||
1 | import { VideoModel } from '../../../models/video/video' | ||
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 1 | import { PickWith, PickWithOpt } from '@shared/core-utils' |
2 | import { VideoModel } from '../../../models/video/video' | ||
3 | import { MUserVideoHistoryTime } from '../user/user-video-history' | ||
4 | import { MScheduleVideoUpdate } from './schedule-video-update' | ||
5 | import { MTag } from './tag' | ||
6 | import { MThumbnail } from './thumbnail' | ||
7 | import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist' | ||
8 | import { MVideoCaptionLanguage, MVideoCaptionLanguageUrl } from './video-caption' | ||
3 | import { | 9 | import { |
4 | MChannelAccountDefault, | 10 | MChannelAccountDefault, |
5 | MChannelAccountLight, | 11 | MChannelAccountLight, |
6 | MChannelAccountSummaryFormattable, | 12 | MChannelAccountSummaryFormattable, |
7 | MChannelActor, | 13 | MChannelActor, |
8 | MChannelFormattable, | 14 | MChannelFormattable, |
15 | MChannelHost, | ||
9 | MChannelUserId | 16 | MChannelUserId |
10 | } from './video-channels' | 17 | } from './video-channels' |
11 | import { MTag } from './tag' | 18 | import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file' |
12 | import { MVideoCaptionLanguage, MVideoCaptionLanguageUrl } from './video-caption' | 19 | import { MVideoLive } from './video-live' |
13 | import { | 20 | import { |
14 | MStreamingPlaylistFiles, | 21 | MStreamingPlaylistFiles, |
15 | MStreamingPlaylistRedundancies, | 22 | MStreamingPlaylistRedundancies, |
16 | MStreamingPlaylistRedundanciesAll, | 23 | MStreamingPlaylistRedundanciesAll, |
17 | MStreamingPlaylistRedundanciesOpt | 24 | MStreamingPlaylistRedundanciesOpt |
18 | } from './video-streaming-playlist' | 25 | } from './video-streaming-playlist' |
19 | import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file' | ||
20 | import { MThumbnail } from './thumbnail' | ||
21 | import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist' | ||
22 | import { MScheduleVideoUpdate } from './schedule-video-update' | ||
23 | import { MUserVideoHistoryTime } from '../user/user-video-history' | ||
24 | import { MVideoLive } from './video-live' | ||
25 | 26 | ||
26 | type Use<K extends keyof VideoModel, M> = PickWith<VideoModel, K, M> | 27 | type Use<K extends keyof VideoModel, M> = PickWith<VideoModel, K, M> |
27 | 28 | ||
@@ -143,6 +144,10 @@ export type MVideoWithChannelActor = | |||
143 | MVideo & | 144 | MVideo & |
144 | Use<'VideoChannel', MChannelActor> | 145 | Use<'VideoChannel', MChannelActor> |
145 | 146 | ||
147 | export type MVideoWithHost = | ||
148 | MVideo & | ||
149 | Use<'VideoChannel', MChannelHost> | ||
150 | |||
146 | export type MVideoFullLight = | 151 | export type MVideoFullLight = |
147 | MVideo & | 152 | MVideo & |
148 | Use<'Thumbnails', MThumbnail[]> & | 153 | Use<'Thumbnails', MThumbnail[]> & |