import { FormBuilder, FormGroup } from '@angular/forms'
import { Router } from '@angular/router'
import { NotificationsService } from 'angular2-notifications'
-import { VideoService } from 'app/shared/video/video.service'
-import { VideoCreate } from '../../../../../shared'
+import { VideoPrivacy } from '../../../../../shared/models/videos'
import { AuthService, ServerService } from '../../core'
import { FormReactive } from '../../shared'
-import { ValidatorMessage } from '../../shared/forms/form-validators'
+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'
@Component({
selector: 'my-videos-add',
isUploadingVideo = false
videoUploaded = false
- progressPercent = 0
+ videoUploadPercents = 0
+ videoUploadedIds = {
+ id: 0,
+ uuid: ''
+ }
error: string = null
form: FormGroup
userVideoChannels = []
videoPrivacies = []
- firstStepPrivacy = 0
- firstStepChannel = 0
+ firstStepPrivacyId = 0
+ firstStepChannelId = 0
constructor (
private formBuilder: FormBuilder,
ngOnInit () {
this.buildForm()
- this.serverService.videoCategoriesLoaded
- .subscribe(
- () => {
- this.videoPrivacies = this.serverService.getVideoPrivacies()
- this.firstStepPrivacy = this.videoPrivacies[0].id
- })
+ populateAsyncUserVideoChannels(this.authService, this.userVideoChannels)
+ .then(() => this.firstStepChannelId = this.userVideoChannels[0].id)
- this.authService.userInformationLoaded
+ this.serverService.videoPrivaciesLoaded
.subscribe(
() => {
- const user = this.authService.getUser()
- if (!user) return
-
- const videoChannels = user.videoChannels
- if (Array.isArray(videoChannels) === false) return
+ this.videoPrivacies = this.serverService.getVideoPrivacies()
- this.userVideoChannels = videoChannels.map(v => ({ id: v.id, label: v.name }))
- this.firstStepChannel = this.userVideoChannels[0].id
- }
- )
+ // Public by default
+ this.firstStepPrivacyId = VideoPrivacy.PUBLIC
+ })
}
fileChange () {
uploadFirstStep () {
const videofile = this.videofileInput.nativeElement.files[0]
- const name = videofile.name
- const privacy = this.firstStepPrivacy.toString()
+ const name = videofile.name.replace(/\.[^/.]+$/, '')
+ const privacy = this.firstStepPrivacyId.toString()
const nsfw = false
- const channelId = this.firstStepChannel.toString()
+ const channelId = this.firstStepChannelId.toString()
const formData = new FormData()
formData.append('name', name)
- formData.append('privacy', privacy.toString())
+ // Put the video "private" -> we wait he validates the second step
+ formData.append('privacy', VideoPrivacy.PRIVATE.toString())
formData.append('nsfw', '' + nsfw)
formData.append('channelId', '' + channelId)
formData.append('videofile', videofile)
this.videoService.uploadVideo(formData).subscribe(
event => {
if (event.type === HttpEventType.UploadProgress) {
- this.progressPercent = Math.round(100 * event.loaded / event.total)
+ 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
}
},
err => {
// Reset progress
- this.progressPercent = 0
+ this.videoUploadPercents = 0
this.error = err.message
}
)
return
}
- const video = new VideoEdit(this.form.value)
+ const video = new VideoEdit()
+ video.patch(this.form.value)
+ video.channel = this.firstStepChannelId
+ video.id = this.videoUploadedIds.id
+ video.uuid = this.videoUploadedIds.uuid
this.videoService.updateVideo(video)
.subscribe(