diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-31 14:34:36 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-08-11 15:02:33 +0200 |
commit | 3a4992633ee62d5edfbb484d9c6bcb3cf158489d (patch) | |
tree | e4510b39bdac9c318fdb4b47018d08f15368b8f0 /server/helpers/custom-validators/video-studio.ts | |
parent | 04d1da5621d25d59bd5fa1543b725c497bf5d9a8 (diff) | |
download | PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.gz PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.tar.zst PeerTube-3a4992633ee62d5edfbb484d9c6bcb3cf158489d.zip |
Migrate server to ESM
Sorry for the very big commit that may lead to git log issues and merge
conflicts, but it's a major step forward:
* Server can be faster at startup because imports() are async and we can
easily lazy import big modules
* Angular doesn't seem to support ES import (with .js extension), so we
had to correctly organize peertube into a monorepo:
* Use yarn workspace feature
* Use typescript reference projects for dependencies
* Shared projects have been moved into "packages", each one is now a
node module (with a dedicated package.json/tsconfig.json)
* server/tools have been moved into apps/ and is now a dedicated app
bundled and published on NPM so users don't have to build peertube
cli tools manually
* server/tests have been moved into packages/ so we don't compile
them every time we want to run the server
* Use isolatedModule option:
* Had to move from const enum to const
(https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums)
* Had to explictely specify "type" imports when used in decorators
* Prefer tsx (that uses esbuild under the hood) instead of ts-node to
load typescript files (tests with mocha or scripts):
* To reduce test complexity as esbuild doesn't support decorator
metadata, we only test server files that do not import server
models
* We still build tests files into js files for a faster CI
* Remove unmaintained peertube CLI import script
* Removed some barrels to speed up execution (less imports)
Diffstat (limited to 'server/helpers/custom-validators/video-studio.ts')
-rw-r--r-- | server/helpers/custom-validators/video-studio.ts | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/server/helpers/custom-validators/video-studio.ts b/server/helpers/custom-validators/video-studio.ts deleted file mode 100644 index 68dfec8dd..000000000 --- a/server/helpers/custom-validators/video-studio.ts +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | import validator from 'validator' | ||
2 | import { CONSTRAINTS_FIELDS } from '@server/initializers/constants' | ||
3 | import { buildTaskFileFieldname } from '@server/lib/video-studio' | ||
4 | import { VideoStudioTask } from '@shared/models' | ||
5 | import { isArray } from './misc' | ||
6 | import { isVideoFileMimeTypeValid, isVideoImageValid } from './videos' | ||
7 | import { forceNumber } from '@shared/core-utils' | ||
8 | |||
9 | function isValidStudioTasksArray (tasks: any) { | ||
10 | if (!isArray(tasks)) return false | ||
11 | |||
12 | return tasks.length >= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.min && | ||
13 | tasks.length <= CONSTRAINTS_FIELDS.VIDEO_STUDIO.TASKS.max | ||
14 | } | ||
15 | |||
16 | function isStudioCutTaskValid (task: VideoStudioTask) { | ||
17 | if (task.name !== 'cut') return false | ||
18 | if (!task.options) return false | ||
19 | |||
20 | const { start, end } = task.options | ||
21 | if (!start && !end) return false | ||
22 | |||
23 | if (start && !validator.isInt(start + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false | ||
24 | if (end && !validator.isInt(end + '', CONSTRAINTS_FIELDS.VIDEO_STUDIO.CUT_TIME)) return false | ||
25 | |||
26 | if (!start || !end) return true | ||
27 | |||
28 | return forceNumber(start) < forceNumber(end) | ||
29 | } | ||
30 | |||
31 | function isStudioTaskAddIntroOutroValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) { | ||
32 | const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file')) | ||
33 | |||
34 | return (task.name === 'add-intro' || task.name === 'add-outro') && | ||
35 | file && isVideoFileMimeTypeValid([ file ], null) | ||
36 | } | ||
37 | |||
38 | function isStudioTaskAddWatermarkValid (task: VideoStudioTask, indice: number, files: Express.Multer.File[]) { | ||
39 | const file = files.find(f => f.fieldname === buildTaskFileFieldname(indice, 'file')) | ||
40 | |||
41 | return task.name === 'add-watermark' && | ||
42 | file && isVideoImageValid([ file ], null, true) | ||
43 | } | ||
44 | |||
45 | // --------------------------------------------------------------------------- | ||
46 | |||
47 | export { | ||
48 | isValidStudioTasksArray, | ||
49 | |||
50 | isStudioCutTaskValid, | ||
51 | isStudioTaskAddIntroOutroValid, | ||
52 | isStudioTaskAddWatermarkValid | ||
53 | } | ||