diff options
author | Chocobozzz <me@florianbigard.com> | 2018-07-12 19:02:00 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-07-16 11:50:08 +0200 |
commit | 40e87e9ecc54e3513fb586928330a7855eb192c6 (patch) | |
tree | af1111ecba85f9cd8286811ff332a67cf21be2f6 /shared/models | |
parent | d4557fd3ecc8d4ed4fb0e5c868929bc36c959ed2 (diff) | |
download | PeerTube-40e87e9ecc54e3513fb586928330a7855eb192c6.tar.gz PeerTube-40e87e9ecc54e3513fb586928330a7855eb192c6.tar.zst PeerTube-40e87e9ecc54e3513fb586928330a7855eb192c6.zip |
Implement captions/subtitles
Diffstat (limited to 'shared/models')
-rw-r--r-- | shared/models/activitypub/objects/video-torrent-object.ts | 1 | ||||
-rw-r--r-- | shared/models/server/custom-config.model.ts | 4 | ||||
-rw-r--r-- | shared/models/server/server-config.model.ts | 9 | ||||
-rw-r--r-- | shared/models/videos/index.ts | 2 | ||||
-rw-r--r-- | shared/models/videos/video-caption-update.model.ts | 4 | ||||
-rw-r--r-- | shared/models/videos/video-caption.model.ts | 6 | ||||
-rw-r--r-- | shared/models/videos/video-constant.model.ts | 4 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 6 |
8 files changed, 31 insertions, 5 deletions
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts index c4071a6d9..90de8967b 100644 --- a/shared/models/activitypub/objects/video-torrent-object.ts +++ b/shared/models/activitypub/objects/video-torrent-object.ts | |||
@@ -17,6 +17,7 @@ export interface VideoTorrentObject { | |||
17 | category: ActivityIdentifierObject | 17 | category: ActivityIdentifierObject |
18 | licence: ActivityIdentifierObject | 18 | licence: ActivityIdentifierObject |
19 | language: ActivityIdentifierObject | 19 | language: ActivityIdentifierObject |
20 | subtitleLanguage: ActivityIdentifierObject[] | ||
20 | views: number | 21 | views: number |
21 | sensitive: boolean | 22 | sensitive: boolean |
22 | commentsEnabled: boolean | 23 | commentsEnabled: boolean |
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index a3a651cd8..9c4718e43 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -25,6 +25,10 @@ export interface CustomConfig { | |||
25 | previews: { | 25 | previews: { |
26 | size: number | 26 | size: number |
27 | } | 27 | } |
28 | |||
29 | captions: { | ||
30 | size: number | ||
31 | } | ||
28 | } | 32 | } |
29 | 33 | ||
30 | signup: { | 34 | signup: { |
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index da0996dae..217d142cd 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts | |||
@@ -44,6 +44,15 @@ export interface ServerConfig { | |||
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | videoCaption: { | ||
48 | file: { | ||
49 | size: { | ||
50 | max: number | ||
51 | }, | ||
52 | extensions: string[] | ||
53 | } | ||
54 | } | ||
55 | |||
47 | user: { | 56 | user: { |
48 | videoQuota: number | 57 | videoQuota: number |
49 | } | 58 | } |
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 9edfb559a..cb9669772 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts | |||
@@ -14,3 +14,5 @@ export * from './video-resolution.enum' | |||
14 | export * from './video-update.model' | 14 | export * from './video-update.model' |
15 | export * from './video.model' | 15 | export * from './video.model' |
16 | export * from './video-state.enum' | 16 | export * from './video-state.enum' |
17 | export * from './video-caption-update.model' | ||
18 | export { VideoConstant } from './video-constant.model' | ||
diff --git a/shared/models/videos/video-caption-update.model.ts b/shared/models/videos/video-caption-update.model.ts new file mode 100644 index 000000000..ff5728715 --- /dev/null +++ b/shared/models/videos/video-caption-update.model.ts | |||
@@ -0,0 +1,4 @@ | |||
1 | export interface VideoCaptionUpdate { | ||
2 | language: string | ||
3 | captionfile: Blob | ||
4 | } | ||
diff --git a/shared/models/videos/video-caption.model.ts b/shared/models/videos/video-caption.model.ts new file mode 100644 index 000000000..4695224ce --- /dev/null +++ b/shared/models/videos/video-caption.model.ts | |||
@@ -0,0 +1,6 @@ | |||
1 | import { VideoConstant } from './video-constant.model' | ||
2 | |||
3 | export interface VideoCaption { | ||
4 | language: VideoConstant<string> | ||
5 | captionPath: string | ||
6 | } | ||
diff --git a/shared/models/videos/video-constant.model.ts b/shared/models/videos/video-constant.model.ts new file mode 100644 index 000000000..342a7c0cf --- /dev/null +++ b/shared/models/videos/video-constant.model.ts | |||
@@ -0,0 +1,4 @@ | |||
1 | export interface VideoConstant<T> { | ||
2 | id: T | ||
3 | label: string | ||
4 | } | ||
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 4e1f15ee3..f7bbaac76 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -4,11 +4,7 @@ import { Avatar } from '../avatars/avatar.model' | |||
4 | import { VideoChannel } from './video-channel.model' | 4 | import { VideoChannel } from './video-channel.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 | 7 | import { VideoConstant } from './video-constant.model' | |
8 | export interface VideoConstant <T> { | ||
9 | id: T | ||
10 | label: string | ||
11 | } | ||
12 | 8 | ||
13 | export interface VideoFile { | 9 | export interface VideoFile { |
14 | magnetUri: string | 10 | magnetUri: string |