aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/models
diff options
context:
space:
mode:
authorFlorent <florent.git@zeteo.me>2022-08-10 09:53:39 +0200
committerGitHub <noreply@github.com>2022-08-10 09:53:39 +0200
commit2a491182e483b97afb1b65c908b23cb48d591807 (patch)
treeec13503216ad72a3ea8f1ce3b659899f8167fb47 /shared/models
parent06ac128958c489efe1008eeca1df683819bd2f18 (diff)
downloadPeerTube-2a491182e483b97afb1b65c908b23cb48d591807.tar.gz
PeerTube-2a491182e483b97afb1b65c908b23cb48d591807.tar.zst
PeerTube-2a491182e483b97afb1b65c908b23cb48d591807.zip
Channel sync (#5135)
* Add external channel URL for channel update / creation (#754) * Disallow synchronisation if user has no video quota (#754) * More constraints serverside (#754) * Disable sync if server configuration does not allow HTTP import (#754) * Working version synchronizing videos with a job (#754) TODO: refactoring, too much code duplication * More logs and try/catch (#754) * Fix eslint error (#754) * WIP: support synchronization time change (#754) * New frontend #754 * WIP: Create sync front (#754) * Enhance UI, sync creation form (#754) * Warning message when HTTP upload is disallowed * More consistent names (#754) * Binding Front with API (#754) * Add a /me API (#754) * Improve list UI (#754) * Implement creation and deletion routes (#754) * Lint (#754) * Lint again (#754) * WIP: UI for triggering import existing videos (#754) * Implement jobs for syncing and importing channels * Don't sync videos before sync creation + avoid concurrency issue (#754) * Cleanup (#754) * Cleanup: OpenAPI + API rework (#754) * Remove dead code (#754) * Eslint (#754) * Revert the mess with whitespaces in constants.ts (#754) * Some fixes after rebase (#754) * Several fixes after PR remarks (#754) * Front + API: Rename video-channels-sync to video-channel-syncs (#754) * Allow enabling channel sync through UI (#754) * getChannelInfo (#754) * Minor fixes: openapi + model + sql (#754) * Simplified API validators (#754) * Rename MChannelSync to MChannelSyncChannel (#754) * Add command for VideoChannelSync (#754) * Use synchronization.enabled config (#754) * Check parameters test + some fixes (#754) * Fix conflict mistake (#754) * Restrict access to video channel sync list API (#754) * Start adding unit test for synchronization (#754) * Continue testing (#754) * Tests finished + convertion of job to scheduler (#754) * Add lastSyncAt field (#754) * Fix externalRemoteUrl sort + creation date not well formatted (#754) * Small fix (#754) * Factorize addYoutubeDLImport and buildVideo (#754) * Check duplicates on channel not on users (#754) * factorize thumbnail generation (#754) * Fetch error should return status 400 (#754) * Separate video-channel-import and video-channel-sync-latest (#754) * Bump DB migration version after rebase (#754) * Prettier states in UI table (#754) * Add DefaultScope in VideoChannelSyncModel (#754) * Fix audit logs (#754) * Ensure user can upload when importing channel + minor fixes (#754) * Mark synchronization as failed on exception + typos (#754) * Change REST API for importing videos into channel (#754) * Add option for fully synchronize a chnanel (#754) * Return a whole sync object on creation to avoid tricks in Front (#754) * Various remarks (#754) * Single quotes by default (#754) * Rename synchronization to video_channel_synchronization * Add check.latest_videos_count and max_per_user options (#754) * Better channel rendering in list #754 * Allow sorting with channel name and state (#754) * Add missing tests for channel imports (#754) * Prefer using a parent job for channel sync * Styling * Client styling Co-authored-by: Chocobozzz <me@florianbigard.com>
Diffstat (limited to 'shared/models')
-rw-r--r--shared/models/server/custom-config.model.ts4
-rw-r--r--shared/models/server/debug.model.ts5
-rw-r--r--shared/models/server/job.model.ts31
-rw-r--r--shared/models/server/server-config.model.ts3
-rw-r--r--shared/models/videos/channel-sync/index.ts3
-rw-r--r--shared/models/videos/channel-sync/video-channel-sync-create.model.ts4
-rw-r--r--shared/models/videos/channel-sync/video-channel-sync-state.enum.ts6
-rw-r--r--shared/models/videos/channel-sync/video-channel-sync.model.ts14
-rw-r--r--shared/models/videos/index.ts1
9 files changed, 67 insertions, 4 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index bb9c7cef1..7d9d570b1 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -165,6 +165,10 @@ export interface CustomConfig {
165 enabled: boolean 165 enabled: boolean
166 } 166 }
167 } 167 }
168 videoChannelSynchronization: {
169 enabled: boolean
170 maxPerUser: number
171 }
168 } 172 }
169 173
170 trending: { 174 trending: {
diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
index 223d23362..1c4597b8b 100644
--- a/shared/models/server/debug.model.ts
+++ b/shared/models/server/debug.model.ts
@@ -4,5 +4,8 @@ export interface Debug {
4} 4}
5 5
6export interface SendDebugCommand { 6export interface SendDebugCommand {
7 command: 'remove-dandling-resumable-uploads' | 'process-video-views-buffer' | 'process-video-viewers' 7 command: 'remove-dandling-resumable-uploads'
8 | 'process-video-views-buffer'
9 | 'process-video-viewers'
10 | 'process-video-channel-sync-latest'
8} 11}
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 8c8f64de9..137da367c 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -25,6 +25,8 @@ export type JobType =
25 | 'manage-video-torrent' 25 | 'manage-video-torrent'
26 | 'move-to-object-storage' 26 | 'move-to-object-storage'
27 | 'video-studio-edition' 27 | 'video-studio-edition'
28 | 'video-channel-import'
29 | 'after-video-channel-import'
28 | 'notify' 30 | 'notify'
29 | 'federate-video' 31 | 'federate-video'
30 32
@@ -82,20 +84,32 @@ export type VideoFileImportPayload = {
82 filePath: string 84 filePath: string
83} 85}
84 86
87// ---------------------------------------------------------------------------
88
85export type VideoImportTorrentPayloadType = 'magnet-uri' | 'torrent-file' 89export type VideoImportTorrentPayloadType = 'magnet-uri' | 'torrent-file'
86export type VideoImportYoutubeDLPayloadType = 'youtube-dl' 90export type VideoImportYoutubeDLPayloadType = 'youtube-dl'
87 91
88export type VideoImportYoutubeDLPayload = { 92export interface VideoImportYoutubeDLPayload {
89 type: VideoImportYoutubeDLPayloadType 93 type: VideoImportYoutubeDLPayloadType
90 videoImportId: number 94 videoImportId: number
91 95
92 fileExt?: string 96 fileExt?: string
93} 97}
94export type VideoImportTorrentPayload = { 98
99export interface VideoImportTorrentPayload {
95 type: VideoImportTorrentPayloadType 100 type: VideoImportTorrentPayloadType
96 videoImportId: number 101 videoImportId: number
97} 102}
98export type VideoImportPayload = VideoImportYoutubeDLPayload | VideoImportTorrentPayload 103
104export type VideoImportPayload = (VideoImportYoutubeDLPayload | VideoImportTorrentPayload) & {
105 preventException: boolean
106}
107
108export interface VideoImportPreventExceptionResult {
109 resultType: 'success' | 'error'
110}
111
112// ---------------------------------------------------------------------------
99 113
100export type VideoRedundancyPayload = { 114export type VideoRedundancyPayload = {
101 videoId: number 115 videoId: number
@@ -219,6 +233,17 @@ export interface VideoStudioEditionPayload {
219 233
220// --------------------------------------------------------------------------- 234// ---------------------------------------------------------------------------
221 235
236export interface VideoChannelImportPayload {
237 externalChannelUrl: string
238 videoChannelId: number
239}
240
241export interface AfterVideoChannelImportPayload {
242 channelSyncId: number
243}
244
245// ---------------------------------------------------------------------------
246
222export type NotifyPayload = 247export type NotifyPayload =
223 { 248 {
224 action: 'new-video' 249 action: 'new-video'
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 67ad809f7..3b6d0597c 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -188,6 +188,9 @@ export interface ServerConfig {
188 enabled: boolean 188 enabled: boolean
189 } 189 }
190 } 190 }
191 videoChannelSynchronization: {
192 enabled: boolean
193 }
191 } 194 }
192 195
193 autoBlacklist: { 196 autoBlacklist: {
diff --git a/shared/models/videos/channel-sync/index.ts b/shared/models/videos/channel-sync/index.ts
new file mode 100644
index 000000000..7d25aaac3
--- /dev/null
+++ b/shared/models/videos/channel-sync/index.ts
@@ -0,0 +1,3 @@
1export * from './video-channel-sync-state.enum'
2export * from './video-channel-sync.model'
3export * from './video-channel-sync-create.model'
diff --git a/shared/models/videos/channel-sync/video-channel-sync-create.model.ts b/shared/models/videos/channel-sync/video-channel-sync-create.model.ts
new file mode 100644
index 000000000..753a8ee4c
--- /dev/null
+++ b/shared/models/videos/channel-sync/video-channel-sync-create.model.ts
@@ -0,0 +1,4 @@
1export interface VideoChannelSyncCreate {
2 externalChannelUrl: string
3 videoChannelId: number
4}
diff --git a/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts b/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts
new file mode 100644
index 000000000..3e9f5ddc2
--- /dev/null
+++ b/shared/models/videos/channel-sync/video-channel-sync-state.enum.ts
@@ -0,0 +1,6 @@
1export const enum VideoChannelSyncState {
2 WAITING_FIRST_RUN = 1,
3 PROCESSING = 2,
4 SYNCED = 3,
5 FAILED = 4
6}
diff --git a/shared/models/videos/channel-sync/video-channel-sync.model.ts b/shared/models/videos/channel-sync/video-channel-sync.model.ts
new file mode 100644
index 000000000..73ac0615b
--- /dev/null
+++ b/shared/models/videos/channel-sync/video-channel-sync.model.ts
@@ -0,0 +1,14 @@
1import { VideoChannelSummary } from '../channel/video-channel.model'
2import { VideoConstant } from '../video-constant.model'
3import { VideoChannelSyncState } from './video-channel-sync-state.enum'
4
5export interface VideoChannelSync {
6 id: number
7
8 externalChannelUrl: string
9
10 createdAt: string
11 channel: VideoChannelSummary
12 state: VideoConstant<VideoChannelSyncState>
13 lastSyncAt: string
14}
diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts
index 05497bda1..f8e6976d3 100644
--- a/shared/models/videos/index.ts
+++ b/shared/models/videos/index.ts
@@ -11,6 +11,7 @@ export * from './playlist'
11export * from './rate' 11export * from './rate'
12export * from './stats' 12export * from './stats'
13export * from './transcoding' 13export * from './transcoding'
14export * from './channel-sync'
14 15
15export * from './nsfw-policy.type' 16export * from './nsfw-policy.type'
16 17