OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Optimize video update page load

pull/1787/head
Chocobozzz 2019-04-25 10:51:52 +02:00
parent f3ae606caf
commit d0dba1fce6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/src/app/videos/+video-edit/video-update.resolver.ts
View File

@ -4,6 +4,7 @@ import { ActivatedRouteSnapshot, Resolve } from '@angular/router'
import { map, switchMap } from 'rxjs/operators' import { map, switchMap } from 'rxjs/operators'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
import { VideoCaptionService } from '@app/shared/video-caption' import { VideoCaptionService } from '@app/shared/video-caption'
import { forkJoin } from 'rxjs'
@Injectable() @Injectable()
export class VideoUpdateResolver implements Resolve<any> { export class VideoUpdateResolver implements Resolve<any> {
@ -11,7 +12,8 @@ export class VideoUpdateResolver implements Resolve<any> {
private videoService: VideoService, private videoService: VideoService,
private videoChannelService: VideoChannelService, private videoChannelService: VideoChannelService,
private videoCaptionService: VideoCaptionService private videoCaptionService: VideoCaptionService
) {} ) {
}
resolve (route: ActivatedRouteSnapshot) { resolve (route: ActivatedRouteSnapshot) {
const uuid: string = route.params[ 'uuid' ] const uuid: string = route.params[ 'uuid' ]
@ -19,27 +21,26 @@ export class VideoUpdateResolver implements Resolve<any> {
return this.videoService.getVideo(uuid) return this.videoService.getVideo(uuid)
.pipe( .pipe(
switchMap(video => { switchMap(video => {
return this.videoService return forkJoin([
this.videoService
.loadCompleteDescription(video.descriptionPath) .loadCompleteDescription(video.descriptionPath)
.pipe(map(description => Object.assign(video, { description }))) .pipe(map(description => Object.assign(video, { description }))),
}),
switchMap(video => { this.videoChannelService
return this.videoChannelService
.listAccountVideoChannels(video.account) .listAccountVideoChannels(video.account)
.pipe( .pipe(
map(result => result.data), map(result => result.data),
map(videoChannels => videoChannels.map(c => ({ id: c.id, label: c.displayName, support: c.support }))), map(videoChannels => videoChannels.map(c => ({ id: c.id, label: c.displayName, support: c.support })))
map(videoChannels => ({ video, videoChannels })) ),
)
}), this.videoCaptionService
switchMap(({ video, videoChannels }) => {
return this.videoCaptionService
.listCaptions(video.id) .listCaptions(video.id)
.pipe( .pipe(
map(result => result.data), map(result => result.data)
map(videoCaptions => ({ video, videoChannels, videoCaptions }))
) )
}) ])
}),
map(([ video, videoChannels, videoCaptions ]) => ({ video, videoChannels, videoCaptions }))
) )
} }
} }