diff options
author | Florent <florent.git@zeteo.me> | 2022-08-10 09:53:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-10 09:53:39 +0200 |
commit | 2a491182e483b97afb1b65c908b23cb48d591807 (patch) | |
tree | ec13503216ad72a3ea8f1ce3b659899f8167fb47 /server/models | |
parent | 06ac128958c489efe1008eeca1df683819bd2f18 (diff) | |
download | PeerTube-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 'server/models')
-rw-r--r-- | server/models/utils.ts | 11 | ||||
-rw-r--r-- | server/models/video/video-channel-sync.ts | 176 | ||||
-rw-r--r-- | server/models/video/video-import.ts | 24 |
3 files changed, 210 insertions, 1 deletions
diff --git a/server/models/utils.ts b/server/models/utils.ts index c468f748d..1e168d419 100644 --- a/server/models/utils.ts +++ b/server/models/utils.ts | |||
@@ -117,6 +117,16 @@ function getInstanceFollowsSort (value: string, lastSort: OrderItem = [ 'id', 'A | |||
117 | return getSort(value, lastSort) | 117 | return getSort(value, lastSort) |
118 | } | 118 | } |
119 | 119 | ||
120 | function getChannelSyncSort (value: string): OrderItem[] { | ||
121 | const { direction, field } = buildDirectionAndField(value) | ||
122 | if (field.toLowerCase() === 'videochannel') { | ||
123 | return [ | ||
124 | [ literal('"VideoChannel.name"'), direction ] | ||
125 | ] | ||
126 | } | ||
127 | return [ [ field, direction ] ] | ||
128 | } | ||
129 | |||
120 | function isOutdated (model: { createdAt: Date, updatedAt: Date }, refreshInterval: number) { | 130 | function isOutdated (model: { createdAt: Date, updatedAt: Date }, refreshInterval: number) { |
121 | if (!model.createdAt || !model.updatedAt) { | 131 | if (!model.createdAt || !model.updatedAt) { |
122 | throw new Error('Miss createdAt & updatedAt attributes to model') | 132 | throw new Error('Miss createdAt & updatedAt attributes to model') |
@@ -280,6 +290,7 @@ export { | |||
280 | getAdminUsersSort, | 290 | getAdminUsersSort, |
281 | getVideoSort, | 291 | getVideoSort, |
282 | getBlacklistSort, | 292 | getBlacklistSort, |
293 | getChannelSyncSort, | ||
283 | createSimilarityAttribute, | 294 | createSimilarityAttribute, |
284 | throwIfNotValid, | 295 | throwIfNotValid, |
285 | buildServerIdsFollowedBy, | 296 | buildServerIdsFollowedBy, |
diff --git a/server/models/video/video-channel-sync.ts b/server/models/video/video-channel-sync.ts new file mode 100644 index 000000000..6e49cde10 --- /dev/null +++ b/server/models/video/video-channel-sync.ts | |||
@@ -0,0 +1,176 @@ | |||
1 | import { Op } from 'sequelize' | ||
2 | import { | ||
3 | AllowNull, | ||
4 | BelongsTo, | ||
5 | Column, | ||
6 | CreatedAt, | ||
7 | DataType, | ||
8 | Default, | ||
9 | DefaultScope, | ||
10 | ForeignKey, | ||
11 | Is, | ||
12 | Model, | ||
13 | Table, | ||
14 | UpdatedAt | ||
15 | } from 'sequelize-typescript' | ||
16 | import { isUrlValid } from '@server/helpers/custom-validators/activitypub/misc' | ||
17 | import { isVideoChannelSyncStateValid } from '@server/helpers/custom-validators/video-channel-syncs' | ||
18 | import { CONSTRAINTS_FIELDS, VIDEO_CHANNEL_SYNC_STATE } from '@server/initializers/constants' | ||
19 | import { MChannelSync, MChannelSyncChannel, MChannelSyncFormattable } from '@server/types/models' | ||
20 | import { VideoChannelSync, VideoChannelSyncState } from '@shared/models' | ||
21 | import { AttributesOnly } from '@shared/typescript-utils' | ||
22 | import { AccountModel } from '../account/account' | ||
23 | import { UserModel } from '../user/user' | ||
24 | import { getChannelSyncSort, throwIfNotValid } from '../utils' | ||
25 | import { VideoChannelModel } from './video-channel' | ||
26 | |||
27 | @DefaultScope(() => ({ | ||
28 | include: [ | ||
29 | { | ||
30 | model: VideoChannelModel, // Default scope includes avatar and server | ||
31 | required: true | ||
32 | } | ||
33 | ] | ||
34 | })) | ||
35 | @Table({ | ||
36 | tableName: 'videoChannelSync', | ||
37 | indexes: [ | ||
38 | { | ||
39 | fields: [ 'videoChannelId' ] | ||
40 | } | ||
41 | ] | ||
42 | }) | ||
43 | export class VideoChannelSyncModel extends Model<Partial<AttributesOnly<VideoChannelSyncModel>>> { | ||
44 | |||
45 | @AllowNull(false) | ||
46 | @Default(null) | ||
47 | @Is('VideoChannelExternalChannelUrl', value => throwIfNotValid(value, isUrlValid, 'externalChannelUrl', true)) | ||
48 | @Column(DataType.STRING(CONSTRAINTS_FIELDS.VIDEO_CHANNEL_SYNCS.EXTERNAL_CHANNEL_URL.max)) | ||
49 | externalChannelUrl: string | ||
50 | |||
51 | @CreatedAt | ||
52 | createdAt: Date | ||
53 | |||
54 | @UpdatedAt | ||
55 | updatedAt: Date | ||
56 | |||
57 | @ForeignKey(() => VideoChannelModel) | ||
58 | @Column | ||
59 | videoChannelId: number | ||
60 | |||
61 | @BelongsTo(() => VideoChannelModel, { | ||
62 | foreignKey: { | ||
63 | allowNull: false | ||
64 | }, | ||
65 | onDelete: 'cascade' | ||
66 | }) | ||
67 | VideoChannel: VideoChannelModel | ||
68 | |||
69 | @AllowNull(false) | ||
70 | @Default(VideoChannelSyncState.WAITING_FIRST_RUN) | ||
71 | @Is('VideoChannelSyncState', value => throwIfNotValid(value, isVideoChannelSyncStateValid, 'state')) | ||
72 | @Column | ||
73 | state: VideoChannelSyncState | ||
74 | |||
75 | @AllowNull(true) | ||
76 | @Column(DataType.DATE) | ||
77 | lastSyncAt: Date | ||
78 | |||
79 | static listByAccountForAPI (options: { | ||
80 | accountId: number | ||
81 | start: number | ||
82 | count: number | ||
83 | sort: string | ||
84 | }) { | ||
85 | const getQuery = (forCount: boolean) => { | ||
86 | const videoChannelModel = forCount | ||
87 | ? VideoChannelModel.unscoped() | ||
88 | : VideoChannelModel | ||
89 | |||
90 | return { | ||
91 | offset: options.start, | ||
92 | limit: options.count, | ||
93 | order: getChannelSyncSort(options.sort), | ||
94 | include: [ | ||
95 | { | ||
96 | model: videoChannelModel, | ||
97 | required: true, | ||
98 | where: { | ||
99 | accountId: options.accountId | ||
100 | } | ||
101 | } | ||
102 | ] | ||
103 | } | ||
104 | } | ||
105 | |||
106 | return Promise.all([ | ||
107 | VideoChannelSyncModel.unscoped().count(getQuery(true)), | ||
108 | VideoChannelSyncModel.unscoped().findAll(getQuery(false)) | ||
109 | ]).then(([ total, data ]) => ({ total, data })) | ||
110 | } | ||
111 | |||
112 | static countByAccount (accountId: number) { | ||
113 | const query = { | ||
114 | include: [ | ||
115 | { | ||
116 | model: VideoChannelModel.unscoped(), | ||
117 | required: true, | ||
118 | where: { | ||
119 | accountId | ||
120 | } | ||
121 | } | ||
122 | ] | ||
123 | } | ||
124 | |||
125 | return VideoChannelSyncModel.unscoped().count(query) | ||
126 | } | ||
127 | |||
128 | static loadWithChannel (id: number): Promise<MChannelSyncChannel> { | ||
129 | return VideoChannelSyncModel.findByPk(id) | ||
130 | } | ||
131 | |||
132 | static async listSyncs (): Promise<MChannelSync[]> { | ||
133 | const query = { | ||
134 | include: [ | ||
135 | { | ||
136 | model: VideoChannelModel.unscoped(), | ||
137 | required: true, | ||
138 | include: [ | ||
139 | { | ||
140 | model: AccountModel.unscoped(), | ||
141 | required: true, | ||
142 | include: [ { | ||
143 | attributes: [], | ||
144 | model: UserModel.unscoped(), | ||
145 | required: true, | ||
146 | where: { | ||
147 | videoQuota: { | ||
148 | [Op.ne]: 0 | ||
149 | }, | ||
150 | videoQuotaDaily: { | ||
151 | [Op.ne]: 0 | ||
152 | } | ||
153 | } | ||
154 | } ] | ||
155 | } | ||
156 | ] | ||
157 | } | ||
158 | ] | ||
159 | } | ||
160 | return VideoChannelSyncModel.unscoped().findAll(query) | ||
161 | } | ||
162 | |||
163 | toFormattedJSON (this: MChannelSyncFormattable): VideoChannelSync { | ||
164 | return { | ||
165 | id: this.id, | ||
166 | state: { | ||
167 | id: this.state, | ||
168 | label: VIDEO_CHANNEL_SYNC_STATE[this.state] | ||
169 | }, | ||
170 | externalChannelUrl: this.externalChannelUrl, | ||
171 | createdAt: this.createdAt.toISOString(), | ||
172 | channel: this.VideoChannel.toFormattedSummaryJSON(), | ||
173 | lastSyncAt: this.lastSyncAt?.toISOString() | ||
174 | } | ||
175 | } | ||
176 | } | ||
diff --git a/server/models/video/video-import.ts b/server/models/video/video-import.ts index 1d8296060..b8e941623 100644 --- a/server/models/video/video-import.ts +++ b/server/models/video/video-import.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { WhereOptions } from 'sequelize' | 1 | import { Op, WhereOptions } from 'sequelize' |
2 | import { | 2 | import { |
3 | AfterUpdate, | 3 | AfterUpdate, |
4 | AllowNull, | 4 | AllowNull, |
@@ -161,6 +161,28 @@ export class VideoImportModel extends Model<Partial<AttributesOnly<VideoImportMo | |||
161 | ]).then(([ total, data ]) => ({ total, data })) | 161 | ]).then(([ total, data ]) => ({ total, data })) |
162 | } | 162 | } |
163 | 163 | ||
164 | static async urlAlreadyImported (channelId: number, targetUrl: string): Promise<boolean> { | ||
165 | const element = await VideoImportModel.unscoped().findOne({ | ||
166 | where: { | ||
167 | targetUrl, | ||
168 | state: { | ||
169 | [Op.in]: [ VideoImportState.PENDING, VideoImportState.PROCESSING, VideoImportState.SUCCESS ] | ||
170 | } | ||
171 | }, | ||
172 | include: [ | ||
173 | { | ||
174 | model: VideoModel, | ||
175 | required: true, | ||
176 | where: { | ||
177 | channelId | ||
178 | } | ||
179 | } | ||
180 | ] | ||
181 | }) | ||
182 | |||
183 | return !!element | ||
184 | } | ||
185 | |||
164 | getTargetIdentifier () { | 186 | getTargetIdentifier () { |
165 | return this.targetUrl || this.magnetUri || this.torrentName | 187 | return this.targetUrl || this.magnetUri || this.torrentName |
166 | } | 188 | } |