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'
@ViewChild('videofileInput') videofileInput
isUploadingVideo = false
+ isUpdatingVideo = false
videoUploaded = false
videoUploadObservable: Subscription = null
videoUploadPercents = 0
id: 0,
uuid: ''
}
+ videoFileName: string
form: FormGroup
formErrors: { [ id: string ]: string } = {}
private authService: AuthService,
private userService: UserService,
private serverService: ServerService,
- private videoService: VideoService
+ private videoService: VideoService,
+ private loadingBar: LoadingBarService
) {
super()
}
}
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('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()
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 commentsEnabled = true
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)
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.isUpdatingVideo = false
this.notificationsService.error('Error', err.message)
console.error(err)
}