X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fvideo-add.component.ts;h=fa967018df419bcaaee16cb7cda726fc67fe93ca;hb=0f320037e689b2778959c12ddd4ce790f6e4ae4f;hp=066f945fcb72d30be5c00f010c8fba6a27a79f4f;hpb=108af66140713c4beec681a71d360ab788226528;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 066f945fc..fa967018d 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts @@ -1,8 +1,13 @@ import { HttpEventType, HttpResponse } from '@angular/common/http' -import { Component, OnInit, ViewChild } from '@angular/core' +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 { VideoPrivacy } from '../../../../../shared/models/videos' import { AuthService, ServerService } from '../../core' import { FormReactive } from '../../shared' @@ -20,23 +25,26 @@ import { VideoService } from '../../shared/video/video.service' ] }) -export class VideoAddComponent extends FormReactive implements OnInit { +export class VideoAddComponent extends FormReactive implements OnInit, OnDestroy, CanComponentDeactivate { @ViewChild('videofileInput') videofileInput isUploadingVideo = false + isUpdatingVideo = false videoUploaded = false + videoUploadObservable: Subscription = null videoUploadPercents = 0 videoUploadedIds = { id: 0, uuid: '' } + videoFileName: string - error: string = null form: FormGroup formErrors: { [ id: string ]: string } = {} validationMessages: ValidatorMessage = {} userVideoChannels = [] + userVideoQuotaUsed = 0 videoPrivacies = [] firstStepPrivacyId = 0 firstStepChannelId = 0 @@ -46,8 +54,10 @@ export class VideoAddComponent extends FormReactive implements OnInit { private router: Router, private notificationsService: NotificationsService, private authService: AuthService, + private userService: UserService, private serverService: ServerService, - private videoService: VideoService + private videoService: VideoService, + private loadingBar: LoadingBarService ) { super() } @@ -67,6 +77,9 @@ export class VideoAddComponent extends FormReactive implements OnInit { populateAsyncUserVideoChannels(this.authService, this.userVideoChannels) .then(() => this.firstStepChannelId = this.userVideoChannels[0].id) + this.userService.getMyVideoQuotaUsed() + .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed) + this.serverService.videoPrivaciesLoaded .subscribe( () => { @@ -77,6 +90,28 @@ export class VideoAddComponent extends FormReactive implements OnInit { }) } + ngOnDestroy () { + if (this.videoUploadObservable) { + this.videoUploadObservable.unsubscribe() + } + } + + canDeactivate () { + 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?' + } else { + text = 'Your video is not uploaded yet, are you sure you want to leave this page?' + } + + return { + canDeactivate: !this.isUploadingVideo, + text + } + } + fileChange () { this.uploadFirstStep() } @@ -87,9 +122,50 @@ export class VideoAddComponent extends FormReactive implements OnInit { return this.form.valid } + cancelUpload () { + if (this.videoUploadObservable !== null) { + this.videoUploadObservable.unsubscribe() + this.isUploadingVideo = false + this.videoUploadPercents = 0 + this.videoUploadObservable = null + this.notificationsService.info('Info', 'Upload cancelled') + } + } + uploadFirstStep () { - const videofile = this.videofileInput.nativeElement.files[0] - const name = videofile.name.replace(/\.[^/.]+$/, '') + 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('Error', '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) + return + } + + 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 commentsEnabled = true @@ -97,7 +173,7 @@ export class VideoAddComponent extends FormReactive implements OnInit { 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) @@ -112,7 +188,7 @@ export class VideoAddComponent extends FormReactive implements OnInit { channelId }) - this.videoService.uploadVideo(formData).subscribe( + this.videoUploadObservable = this.videoService.uploadVideo(formData).subscribe( event => { if (event.type === HttpEventType.UploadProgress) { this.videoUploadPercents = Math.round(100 * event.loaded / event.total) @@ -122,13 +198,17 @@ export class VideoAddComponent extends FormReactive implements OnInit { this.videoUploaded = true this.videoUploadedIds = event.body.video + + this.videoUploadObservable = null } }, err => { // Reset progress + this.isUploadingVideo = false this.videoUploadPercents = 0 - this.error = err.message + this.videoUploadObservable = null + this.notificationsService.error('Error', err.message) } ) } @@ -140,19 +220,26 @@ export class VideoAddComponent extends FormReactive implements OnInit { const video = new VideoEdit() video.patch(this.form.value) - video.channel = this.firstStepChannelId + video.channelId = this.firstStepChannelId video.id = this.videoUploadedIds.id video.uuid = this.videoUploadedIds.uuid + this.isUpdatingVideo = true + this.loadingBar.start() this.videoService.updateVideo(video) .subscribe( () => { + this.isUpdatingVideo = false + this.isUploadingVideo = false + this.loadingBar.complete() + this.notificationsService.success('Success', 'Video published.') this.router.navigate([ '/videos/watch', video.uuid ]) }, err => { - this.error = 'Cannot update the video.' + this.isUpdatingVideo = false + this.notificationsService.error('Error', err.message) console.error(err) } )