aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/initializers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-03-22 16:58:49 +0100
committerChocobozzz <me@florianbigard.com>2022-03-22 17:24:32 +0100
commit92e66e04f7f51d37b465cff442ce47f6d6d7cadd (patch)
tree4475c5c601c0f6673ca56afba5b7f70a4fae4ec3 /server/initializers
parent1808a1f8e4b7b102823492a2007a46929aebf189 (diff)
downloadPeerTube-92e66e04f7f51d37b465cff442ce47f6d6d7cadd.tar.gz
PeerTube-92e66e04f7f51d37b465cff442ce47f6d6d7cadd.tar.zst
PeerTube-92e66e04f7f51d37b465cff442ce47f6d6d7cadd.zip
Rename studio to editor
Diffstat (limited to 'server/initializers')
-rw-r--r--server/initializers/checker-after-init.ts8
-rw-r--r--server/initializers/checker-before-init.ts2
-rw-r--r--server/initializers/config.ts4
-rw-r--r--server/initializers/constants.ts8
-rw-r--r--server/initializers/migrations/0700-edition-finished-notification.ts6
5 files changed, 14 insertions, 14 deletions
diff --git a/server/initializers/checker-after-init.ts b/server/initializers/checker-after-init.ts
index 635a32010..f65798c42 100644
--- a/server/initializers/checker-after-init.ts
+++ b/server/initializers/checker-after-init.ts
@@ -49,7 +49,7 @@ function checkConfig () {
49 checkSearchConfig() 49 checkSearchConfig()
50 checkLiveConfig() 50 checkLiveConfig()
51 checkObjectStorageConfig() 51 checkObjectStorageConfig()
52 checkVideoEditorConfig() 52 checkVideoStudioConfig()
53} 53}
54 54
55// We get db by param to not import it in this file (import orders) 55// We get db by param to not import it in this file (import orders)
@@ -260,8 +260,8 @@ function checkObjectStorageConfig () {
260 } 260 }
261} 261}
262 262
263function checkVideoEditorConfig () { 263function checkVideoStudioConfig () {
264 if (CONFIG.VIDEO_EDITOR.ENABLED === true && CONFIG.TRANSCODING.ENABLED === false) { 264 if (CONFIG.VIDEO_STUDIO.ENABLED === true && CONFIG.TRANSCODING.ENABLED === false) {
265 throw new Error('Video editor cannot be enabled if transcoding is disabled') 265 throw new Error('Video studio cannot be enabled if transcoding is disabled')
266 } 266 }
267} 267}
diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts
index fa311f708..0f23a2d73 100644
--- a/server/initializers/checker-before-init.ts
+++ b/server/initializers/checker-before-init.ts
@@ -30,7 +30,7 @@ function checkMissedConfig () {
30 'transcoding.profile', 'transcoding.concurrency', 30 'transcoding.profile', 'transcoding.concurrency',
31 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p', 31 'transcoding.resolutions.0p', 'transcoding.resolutions.144p', 'transcoding.resolutions.240p', 'transcoding.resolutions.360p',
32 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p', 32 'transcoding.resolutions.480p', 'transcoding.resolutions.720p', 'transcoding.resolutions.1080p', 'transcoding.resolutions.1440p',
33 'transcoding.resolutions.2160p', 'video_editor.enabled', 33 'transcoding.resolutions.2160p', 'video_studio.enabled',
34 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled', 34 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled',
35 'trending.videos.interval_days', 35 'trending.videos.interval_days',
36 'client.videos.miniature.display_author_avatar', 36 'client.videos.miniature.display_author_avatar',
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 1658298c5..122cb9472 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -335,8 +335,8 @@ const CONFIG = {
335 } 335 }
336 } 336 }
337 }, 337 },
338 VIDEO_EDITOR: { 338 VIDEO_STUDIO: {
339 get ENABLED () { return config.get<boolean>('video_editor.enabled') } 339 get ENABLED () { return config.get<boolean>('video_studio.enabled') }
340 }, 340 },
341 IMPORT: { 341 IMPORT: {
342 VIDEOS: { 342 VIDEOS: {
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 17d8ba556..6bcefe0db 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -152,7 +152,7 @@ const JOB_ATTEMPTS: { [id in JobType]: number } = {
152 'activitypub-refresher': 1, 152 'activitypub-refresher': 1,
153 'video-redundancy': 1, 153 'video-redundancy': 1,
154 'video-live-ending': 1, 154 'video-live-ending': 1,
155 'video-edition': 1, 155 'video-studio-edition': 1,
156 'manage-video-torrent': 1, 156 'manage-video-torrent': 1,
157 'move-to-object-storage': 3 157 'move-to-object-storage': 3
158} 158}
@@ -170,7 +170,7 @@ const JOB_CONCURRENCY: { [id in Exclude<JobType, 'video-transcoding' | 'video-im
170 'activitypub-refresher': 1, 170 'activitypub-refresher': 1,
171 'video-redundancy': 1, 171 'video-redundancy': 1,
172 'video-live-ending': 10, 172 'video-live-ending': 10,
173 'video-edition': 1, 173 'video-studio-edition': 1,
174 'manage-video-torrent': 1, 174 'manage-video-torrent': 1,
175 'move-to-object-storage': 1 175 'move-to-object-storage': 1
176} 176}
@@ -182,7 +182,7 @@ const JOB_TTL: { [id in JobType]: number } = {
182 'activitypub-cleaner': 1000 * 3600, // 1 hour 182 'activitypub-cleaner': 1000 * 3600, // 1 hour
183 'video-file-import': 1000 * 3600, // 1 hour 183 'video-file-import': 1000 * 3600, // 1 hour
184 'video-transcoding': 1000 * 3600 * 48, // 2 days, transcoding could be long 184 'video-transcoding': 1000 * 3600 * 48, // 2 days, transcoding could be long
185 'video-edition': 1000 * 3600 * 10, // 10 hours 185 'video-studio-edition': 1000 * 3600 * 10, // 10 hours
186 'video-import': 1000 * 3600 * 2, // 2 hours 186 'video-import': 1000 * 3600 * 2, // 2 hours
187 'email': 60000 * 10, // 10 minutes 187 'email': 60000 * 10, // 10 minutes
188 'actor-keys': 60000 * 20, // 20 minutes 188 'actor-keys': 60000 * 20, // 20 minutes
@@ -358,7 +358,7 @@ const CONSTRAINTS_FIELDS = {
358 COMMONS: { 358 COMMONS: {
359 URL: { min: 5, max: 2000 } // Length 359 URL: { min: 5, max: 2000 } // Length
360 }, 360 },
361 VIDEO_EDITOR: { 361 VIDEO_STUDIO: {
362 TASKS: { min: 1, max: 10 }, // Number of tasks 362 TASKS: { min: 1, max: 10 }, // Number of tasks
363 CUT_TIME: { min: 0 } // Value 363 CUT_TIME: { min: 0 } // Value
364 } 364 }
diff --git a/server/initializers/migrations/0700-edition-finished-notification.ts b/server/initializers/migrations/0700-edition-finished-notification.ts
index 103c0b456..5310eab3f 100644
--- a/server/initializers/migrations/0700-edition-finished-notification.ts
+++ b/server/initializers/migrations/0700-edition-finished-notification.ts
@@ -14,11 +14,11 @@ async function up (utils: {
14 defaultValue: null, 14 defaultValue: null,
15 allowNull: true 15 allowNull: true
16 } 16 }
17 await utils.queryInterface.addColumn('userNotificationSetting', 'myVideoEditionFinished', data, { transaction }) 17 await utils.queryInterface.addColumn('userNotificationSetting', 'myVideoStudioEditionFinished', data, { transaction })
18 } 18 }
19 19
20 { 20 {
21 const query = 'UPDATE "userNotificationSetting" SET "myVideoEditionFinished" = 1' 21 const query = 'UPDATE "userNotificationSetting" SET "myVideoStudioEditionFinished" = 1'
22 await utils.sequelize.query(query, { transaction }) 22 await utils.sequelize.query(query, { transaction })
23 } 23 }
24 24
@@ -28,7 +28,7 @@ async function up (utils: {
28 defaultValue: null, 28 defaultValue: null,
29 allowNull: false 29 allowNull: false
30 } 30 }
31 await utils.queryInterface.changeColumn('userNotificationSetting', 'myVideoEditionFinished', data, { transaction }) 31 await utils.queryInterface.changeColumn('userNotificationSetting', 'myVideoStudioEditionFinished', data, { transaction })
32 } 32 }
33} 33}
34 34