X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fvideo-add.component.ts;h=3ddeda1095f87aedb1f99095513c65bf4d1baf15;hb=0c237b19fdf9c614293c1442f0ab95a81ce05735;hp=c6f0525c339a59fd8d9d56e18dac23498b9a04f9;hpb=f6a043df74bc755de8e658ba76a4e55980b96f66;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts index c6f0525c3..3ddeda109 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts @@ -1,19 +1,20 @@ import { HttpEventType, HttpResponse } from '@angular/common/http' import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core' -import { FormBuilder, FormGroup } from '@angular/forms' import { Router } from '@angular/router' import { UserService } from '@app/shared' import { CanComponentDeactivate } from '@app/shared/guards/can-deactivate-guard.service' +import { LoadingBarService } from '@ngx-loading-bar/core' import { NotificationsService } from 'angular2-notifications' import { BytesPipe } from 'ngx-pipes' -import { Subscription } from 'rxjs/Subscription' +import { Subscription } from 'rxjs' import { VideoPrivacy } from '../../../../../shared/models/videos' import { AuthService, ServerService } from '../../core' import { FormReactive } from '../../shared' -import { ValidatorMessage } from '../../shared/forms/form-validators/validator-message' import { populateAsyncUserVideoChannels } from '../../shared/misc/utils' import { VideoEdit } from '../../shared/video/video-edit.model' import { VideoService } from '../../shared/video/video.service' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' @Component({ selector: 'my-videos-add', @@ -23,11 +24,14 @@ import { VideoService } from '../../shared/video/video.service' './video-add.component.scss' ] }) - export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy, CanComponentDeactivate { @ViewChild('videofileInput') videofileInput + // So that it can be accessed in the template + readonly SPECIAL_SCHEDULED_PRIVACY = VideoEdit.SPECIAL_SCHEDULED_PRIVACY + isUploadingVideo = false + isUpdatingVideo = false videoUploaded = false videoUploadObservable: Subscription = null videoUploadPercents = 0 @@ -35,25 +39,24 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy id: 0, uuid: '' } + videoFileName: string - form: FormGroup - formErrors: { [ id: string ]: string } = {} - validationMessages: ValidatorMessage = {} - - userVideoChannels = [] + userVideoChannels: { id: number, label: string, support: string }[] = [] userVideoQuotaUsed = 0 videoPrivacies = [] firstStepPrivacyId = 0 firstStepChannelId = 0 constructor ( - private formBuilder: FormBuilder, + protected formValidatorService: FormValidatorService, private router: Router, private notificationsService: NotificationsService, private authService: AuthService, private userService: UserService, private serverService: ServerService, - private videoService: VideoService + private videoService: VideoService, + private loadingBar: LoadingBarService, + private i18n: I18n ) { super() } @@ -62,13 +65,8 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy return this.serverService.getConfig().video.file.extensions.join(',') } - buildForm () { - this.form = this.formBuilder.group({}) - this.form.valueChanges.subscribe(data => this.onValueChanged(data)) - } - ngOnInit () { - this.buildForm() + this.buildForm({}) populateAsyncUserVideoChannels(this.authService, this.userVideoChannels) .then(() => this.firstStepChannelId = this.userVideoChannels[0].id) @@ -96,10 +94,11 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy let text = '' if (this.videoUploaded === true) { - text = 'Your video was uploaded in your account and is private.' + - ' But associated data (tags, description...) will be lost, are you sure you want to leave this page?' + // FIXME: cannot concatenate strings inside i18n service :/ + text = this.i18n('Your video was uploaded in your account and is private.') + + this.i18n('But associated data (tags, description...) will be lost, are you sure you want to leave this page?') } else { - text = 'Your video is not uploaded yet, are you sure you want to leave this page?' + text = this.i18n('Your video is not uploaded yet, are you sure you want to leave this page?') } return { @@ -124,38 +123,61 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy this.isUploadingVideo = false this.videoUploadPercents = 0 this.videoUploadObservable = null - this.notificationsService.info('Info', 'Upload cancelled') + this.notificationsService.info(this.i18n('Info'), this.i18n('Upload cancelled')) } } uploadFirstStep () { - const videofile = this.videofileInput.nativeElement.files[0] + const videofile = this.videofileInput.nativeElement.files[0] as File if (!videofile) return + // Cannot upload videos > 4GB for now + if (videofile.size > 4 * 1024 * 1024 * 1024) { + this.notificationsService.error(this.i18n('Error'), this.i18n('We are sorry but PeerTube cannot handle videos > 4GB')) + return + } + const videoQuota = this.authService.getUser().videoQuota if (videoQuota !== -1 && (this.userVideoQuotaUsed + videofile.size) > videoQuota) { const bytePipes = new BytesPipe() - const msg = 'Your video quota is exceeded with this video ' + - `(video size: ${bytePipes.transform(videofile.size, 0)}, ` + - `used: ${bytePipes.transform(this.userVideoQuotaUsed, 0)}, ` + - `quota: ${bytePipes.transform(videoQuota, 0)})` - this.notificationsService.error('Error', msg) + const msg = this.i18n( + 'Your video quota is exceeded with this video (video size: {{ videoSize }}, used: {{ videoQuotaUsed }}, quota: {{ videoQuota }})', + { + videoSize: bytePipes.transform(videofile.size, 0), + videoQuotaUsed: bytePipes.transform(this.userVideoQuotaUsed, 0), + videoQuota: bytePipes.transform(videoQuota, 0) + } + ) + this.notificationsService.error(this.i18n('Error'), msg) return } - const name = videofile.name.replace(/\.[^/.]+$/, '') + this.videoFileName = videofile.name + + const nameWithoutExtension = videofile.name.replace(/\.[^/.]+$/, '') + let name: string + + // If the name of the file is very small, keep the extension + if (nameWithoutExtension.length < 3) { + name = videofile.name + } else { + name = nameWithoutExtension + } + const privacy = this.firstStepPrivacyId.toString() const nsfw = false + const waitTranscoding = true const commentsEnabled = true const channelId = this.firstStepChannelId.toString() const formData = new FormData() formData.append('name', name) - // Put the video "private" -> we wait he validates the second step + // Put the video "private" -> we are waiting the user validation of the second step formData.append('privacy', VideoPrivacy.PRIVATE.toString()) formData.append('nsfw', '' + nsfw) formData.append('commentsEnabled', '' + commentsEnabled) + formData.append('waitTranscoding', '' + waitTranscoding) formData.append('channelId', '' + channelId) formData.append('videofile', videofile) @@ -172,8 +194,6 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy if (event.type === HttpEventType.UploadProgress) { this.videoUploadPercents = Math.round(100 * event.loaded / event.total) } else if (event instanceof HttpResponse) { - console.log('Video uploaded.') - this.videoUploaded = true this.videoUploadedIds = event.body.video @@ -187,7 +207,7 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy this.isUploadingVideo = false this.videoUploadPercents = 0 this.videoUploadObservable = null - this.notificationsService.error('Error', err.message) + this.notificationsService.error(this.i18n('Error'), err.message) } ) } @@ -199,19 +219,25 @@ export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy const video = new VideoEdit() video.patch(this.form.value) - video.channel = this.firstStepChannelId video.id = this.videoUploadedIds.id video.uuid = this.videoUploadedIds.uuid + this.isUpdatingVideo = true + this.loadingBar.start() this.videoService.updateVideo(video) .subscribe( () => { - this.notificationsService.success('Success', 'Video published.') + this.isUpdatingVideo = false + this.isUploadingVideo = false + this.loadingBar.complete() + + this.notificationsService.success(this.i18n('Success'), this.i18n('Video published.')) this.router.navigate([ '/videos/watch', video.uuid ]) }, err => { - this.notificationsService.error('Error', err.message) + this.isUpdatingVideo = false + this.notificationsService.error(this.i18n('Error'), err.message) console.error(err) } )