diff options
Diffstat (limited to 'shared/models/server')
-rw-r--r-- | shared/models/server/custom-config.model.ts | 6 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 20 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 2 | ||||
-rw-r--r-- | shared/models/server/server-error-code.enum.ts | 5 |
4 files changed, 24 insertions, 9 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 4202589f3..9aa66f2b8 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -78,6 +78,10 @@ export interface CustomConfig { | |||
78 | torrents: { | 78 | torrents: { |
79 | size: number | 79 | size: number |
80 | } | 80 | } |
81 | |||
82 | storyboards: { | ||
83 | size: number | ||
84 | } | ||
81 | } | 85 | } |
82 | 86 | ||
83 | signup: { | 87 | signup: { |
@@ -129,7 +133,7 @@ export interface CustomConfig { | |||
129 | 133 | ||
130 | alwaysTranscodeOriginalResolution: boolean | 134 | alwaysTranscodeOriginalResolution: boolean |
131 | 135 | ||
132 | webtorrent: { | 136 | webVideos: { |
133 | enabled: boolean | 137 | enabled: boolean |
134 | } | 138 | } |
135 | 139 | ||
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 22ecee324..c14806dab 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -30,6 +30,7 @@ export type JobType = | |||
30 | | 'video-studio-edition' | 30 | | 'video-studio-edition' |
31 | | 'video-transcoding' | 31 | | 'video-transcoding' |
32 | | 'videos-views-stats' | 32 | | 'videos-views-stats' |
33 | | 'generate-video-storyboard' | ||
33 | 34 | ||
34 | export interface Job { | 35 | export interface Job { |
35 | id: number | string | 36 | id: number | string |
@@ -147,17 +148,17 @@ export interface HLSTranscodingPayload extends BaseTranscodingPayload { | |||
147 | fps: number | 148 | fps: number |
148 | copyCodecs: boolean | 149 | copyCodecs: boolean |
149 | 150 | ||
150 | deleteWebTorrentFiles: boolean | 151 | deleteWebVideoFiles: boolean |
151 | } | 152 | } |
152 | 153 | ||
153 | export interface NewWebTorrentResolutionTranscodingPayload extends BaseTranscodingPayload { | 154 | export interface NewWebVideoResolutionTranscodingPayload extends BaseTranscodingPayload { |
154 | type: 'new-resolution-to-webtorrent' | 155 | type: 'new-resolution-to-web-video' |
155 | resolution: VideoResolution | 156 | resolution: VideoResolution |
156 | fps: number | 157 | fps: number |
157 | } | 158 | } |
158 | 159 | ||
159 | export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { | 160 | export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { |
160 | type: 'merge-audio-to-webtorrent' | 161 | type: 'merge-audio-to-web-video' |
161 | 162 | ||
162 | resolution: VideoResolution | 163 | resolution: VideoResolution |
163 | fps: number | 164 | fps: number |
@@ -166,7 +167,7 @@ export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { | |||
166 | } | 167 | } |
167 | 168 | ||
168 | export interface OptimizeTranscodingPayload extends BaseTranscodingPayload { | 169 | export interface OptimizeTranscodingPayload extends BaseTranscodingPayload { |
169 | type: 'optimize-to-webtorrent' | 170 | type: 'optimize-to-web-video' |
170 | 171 | ||
171 | quickTranscode: boolean | 172 | quickTranscode: boolean |
172 | 173 | ||
@@ -175,7 +176,7 @@ export interface OptimizeTranscodingPayload extends BaseTranscodingPayload { | |||
175 | 176 | ||
176 | export type VideoTranscodingPayload = | 177 | export type VideoTranscodingPayload = |
177 | HLSTranscodingPayload | 178 | HLSTranscodingPayload |
178 | | NewWebTorrentResolutionTranscodingPayload | 179 | | NewWebVideoResolutionTranscodingPayload |
179 | | OptimizeTranscodingPayload | 180 | | OptimizeTranscodingPayload |
180 | | MergeAudioTranscodingPayload | 181 | | MergeAudioTranscodingPayload |
181 | 182 | ||
@@ -294,3 +295,10 @@ export interface TranscodingJobBuilderPayload { | |||
294 | priority?: number | 295 | priority?: number |
295 | }[][] | 296 | }[][] |
296 | } | 297 | } |
298 | |||
299 | // --------------------------------------------------------------------------- | ||
300 | |||
301 | export interface GenerateStoryboardPayload { | ||
302 | videoUUID: string | ||
303 | federate: boolean | ||
304 | } | ||
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 024ed35bf..288cf84cd 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts | |||
@@ -140,7 +140,7 @@ export interface ServerConfig { | |||
140 | enabled: boolean | 140 | enabled: boolean |
141 | } | 141 | } |
142 | 142 | ||
143 | webtorrent: { | 143 | web_videos: { |
144 | enabled: boolean | 144 | enabled: boolean |
145 | } | 145 | } |
146 | 146 | ||
diff --git a/shared/models/server/server-error-code.enum.ts b/shared/models/server/server-error-code.enum.ts index 2b093380c..77d1e1d3f 100644 --- a/shared/models/server/server-error-code.enum.ts +++ b/shared/models/server/server-error-code.enum.ts | |||
@@ -49,7 +49,10 @@ export const enum ServerErrorCode { | |||
49 | 49 | ||
50 | RUNNER_JOB_NOT_IN_PROCESSING_STATE = 'runner_job_not_in_processing_state', | 50 | RUNNER_JOB_NOT_IN_PROCESSING_STATE = 'runner_job_not_in_processing_state', |
51 | RUNNER_JOB_NOT_IN_PENDING_STATE = 'runner_job_not_in_pending_state', | 51 | RUNNER_JOB_NOT_IN_PENDING_STATE = 'runner_job_not_in_pending_state', |
52 | UNKNOWN_RUNNER_TOKEN = 'unknown_runner_token' | 52 | UNKNOWN_RUNNER_TOKEN = 'unknown_runner_token', |
53 | |||
54 | VIDEO_REQUIRES_PASSWORD = 'video_requires_password', | ||
55 | INCORRECT_VIDEO_PASSWORD = 'incorrect_video_password' | ||
53 | } | 56 | } |
54 | 57 | ||
55 | /** | 58 | /** |