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 /client/src/app/+admin | |
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 'client/src/app/+admin')
4 files changed, 50 insertions, 6 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html index 7dfe5f5f9..929ea3a90 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html | |||
@@ -267,10 +267,10 @@ | |||
267 | inputName="importVideosHttpEnabled" formControlName="enabled" | 267 | inputName="importVideosHttpEnabled" formControlName="enabled" |
268 | i18n-labelText labelText="Allow import with HTTP URL (e.g. YouTube)" | 268 | i18n-labelText labelText="Allow import with HTTP URL (e.g. YouTube)" |
269 | > | 269 | > |
270 | <ng-container ngProjectAs="description"> | 270 | <ng-container ngProjectAs="description"> |
271 | <span i18n>⚠️ If enabled, we recommend to use <a class="link-orange" href="https://docs.joinpeertube.org/maintain-configuration?id=security">a HTTP proxy</a> to prevent private URL access from your PeerTube server</span> | 271 | <span i18n>⚠️ If enabled, we recommend to use <a class="link-orange" href="https://docs.joinpeertube.org/maintain-configuration?id=security">a HTTP proxy</a> to prevent private URL access from your PeerTube server</span> |
272 | </ng-container> | 272 | </ng-container> |
273 | </my-peertube-checkbox> | 273 | </my-peertube-checkbox> |
274 | </div> | 274 | </div> |
275 | 275 | ||
276 | <div class="form-group" formGroupName="torrent"> | 276 | <div class="form-group" formGroupName="torrent"> |
@@ -285,6 +285,22 @@ | |||
285 | </div> | 285 | </div> |
286 | 286 | ||
287 | </ng-container> | 287 | </ng-container> |
288 | |||
289 | <ng-container formGroupName="videoChannelSynchronization"> | ||
290 | <div class="form-group"> | ||
291 | <my-peertube-checkbox | ||
292 | inputName="importSynchronizationEnabled" formControlName="enabled" | ||
293 | i18n-labelText labelText="Allow channel synchronization with channel of other platforms like YouTube (requires allowing import with HTTP URL)" | ||
294 | > | ||
295 | <ng-container ngProjectAs="description"> | ||
296 | <span i18n [hidden]="isImportVideosHttpEnabled()"> | ||
297 | ⛔ You need to allow import with HTTP URL to be able to activate this feature. | ||
298 | </span> | ||
299 | </ng-container> | ||
300 | </my-peertube-checkbox> | ||
301 | </div> | ||
302 | </ng-container> | ||
303 | |||
288 | </ng-container> | 304 | </ng-container> |
289 | 305 | ||
290 | <ng-container formGroupName="autoBlacklist"> | 306 | <ng-container formGroupName="autoBlacklist"> |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts index 29910369a..90ed58c99 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts | |||
@@ -25,11 +25,12 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges { | |||
25 | private configService: ConfigService, | 25 | private configService: ConfigService, |
26 | private menuService: MenuService, | 26 | private menuService: MenuService, |
27 | private themeService: ThemeService | 27 | private themeService: ThemeService |
28 | ) { } | 28 | ) {} |
29 | 29 | ||
30 | ngOnInit () { | 30 | ngOnInit () { |
31 | this.buildLandingPageOptions() | 31 | this.buildLandingPageOptions() |
32 | this.checkSignupField() | 32 | this.checkSignupField() |
33 | this.checkImportSyncField() | ||
33 | 34 | ||
34 | this.availableThemes = this.themeService.buildAvailableThemes() | 35 | this.availableThemes = this.themeService.buildAvailableThemes() |
35 | } | 36 | } |
@@ -67,6 +68,14 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges { | |||
67 | return { 'disabled-checkbox-extra': !this.isSignupEnabled() } | 68 | return { 'disabled-checkbox-extra': !this.isSignupEnabled() } |
68 | } | 69 | } |
69 | 70 | ||
71 | isImportVideosHttpEnabled (): boolean { | ||
72 | return this.form.value['import']['videos']['http']['enabled'] === true | ||
73 | } | ||
74 | |||
75 | importSynchronizationChecked () { | ||
76 | return this.isImportVideosHttpEnabled() && this.form.value['import']['videoChannelSynchronization']['enabled'] | ||
77 | } | ||
78 | |||
70 | hasUnlimitedSignup () { | 79 | hasUnlimitedSignup () { |
71 | return this.form.value['signup']['limit'] === -1 | 80 | return this.form.value['signup']['limit'] === -1 |
72 | } | 81 | } |
@@ -97,6 +106,21 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges { | |||
97 | return this.themeService.getDefaultThemeLabel() | 106 | return this.themeService.getDefaultThemeLabel() |
98 | } | 107 | } |
99 | 108 | ||
109 | private checkImportSyncField () { | ||
110 | const importSyncControl = this.form.get('import.videoChannelSynchronization.enabled') | ||
111 | const importVideosHttpControl = this.form.get('import.videos.http.enabled') | ||
112 | |||
113 | importVideosHttpControl.valueChanges | ||
114 | .subscribe((httpImportEnabled) => { | ||
115 | importSyncControl.setValue(httpImportEnabled && importSyncControl.value) | ||
116 | if (httpImportEnabled) { | ||
117 | importSyncControl.enable() | ||
118 | } else { | ||
119 | importSyncControl.disable() | ||
120 | } | ||
121 | }) | ||
122 | } | ||
123 | |||
100 | private checkSignupField () { | 124 | private checkSignupField () { |
101 | const signupControl = this.form.get('signup.enabled') | 125 | const signupControl = this.form.get('signup.enabled') |
102 | 126 | ||
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index ce01f8b59..5cab9e9df 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -144,6 +144,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
144 | torrent: { | 144 | torrent: { |
145 | enabled: null | 145 | enabled: null |
146 | } | 146 | } |
147 | }, | ||
148 | videoChannelSynchronization: { | ||
149 | enabled: null | ||
147 | } | 150 | } |
148 | }, | 151 | }, |
149 | trending: { | 152 | trending: { |
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts index 42f503be6..4cda63272 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.ts +++ b/client/src/app/+admin/system/jobs/jobs.component.ts | |||
@@ -38,7 +38,8 @@ export class JobsComponent extends RestTable implements OnInit { | |||
38 | 'video-redundancy', | 38 | 'video-redundancy', |
39 | 'video-transcoding', | 39 | 'video-transcoding', |
40 | 'videos-views-stats', | 40 | 'videos-views-stats', |
41 | 'move-to-object-storage' | 41 | 'move-to-object-storage', |
42 | 'video-channel-import' | ||
42 | ] | 43 | ] |
43 | 44 | ||
44 | jobs: Job[] = [] | 45 | jobs: Job[] = [] |