-import { catchError, map } from 'rxjs/operators'
+import { catchError, map, switchMap } from 'rxjs/operators'
import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { Observable } from 'rxjs'
import { AccountService } from '@app/shared/account/account.service'
import { VideoChannel } from '../../../../../shared/models/videos'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { ServerService } from '@app/core'
@Injectable()
export class VideoService {
constructor (
private authHttp: HttpClient,
private restExtractor: RestExtractor,
- private restService: RestService
+ private restService: RestService,
+ private serverService: ServerService
) {}
getVideoViewUrl (uuid: string) {
}
getVideo (uuid: string): Observable<VideoDetails> {
- return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
+ return this.serverService.localeObservable
.pipe(
- map(videoHash => new VideoDetails(videoHash)),
+ switchMap(translations => {
+ return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
+ .pipe(map(videoHash => ({ videoHash, translations })))
+ }),
+ map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)),
catchError(res => this.restExtractor.handleError(res))
)
}
privacy: video.privacy,
tags: video.tags,
nsfw: video.nsfw,
+ waitTranscoding: video.waitTranscoding,
commentsEnabled: video.commentsEnabled,
thumbnailfile: video.thumbnailfile,
- previewfile: video.previewfile
+ previewfile: video.previewfile,
+ scheduleUpdate: video.scheduleUpdate || undefined
}
const data = objectToFormData(body)
const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true })
return this.authHttp
- .request<{ video: { id: number, uuid: string} }>(req)
+ .request<{ video: { id: number, uuid: string } }>(req)
.pipe(catchError(this.restExtractor.handleError))
}
- getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number}> {
+ getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
- return this.authHttp.get(UserService.BASE_USERS_URL + '/me/videos', { params })
+ return this.authHttp
+ .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params })
.pipe(
- map(this.extractVideos),
+ switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res))
)
}
account: Account,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
return this.authHttp
- .get(AccountService.BASE_ACCOUNT_URL + account.id + '/videos', { params })
+ .get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params })
.pipe(
- map(this.extractVideos),
+ switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res))
)
}
videoChannel: VideoChannel,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
return this.authHttp
- .get(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params })
+ .get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params })
.pipe(
- map(this.extractVideos),
+ switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res))
)
}
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
}
return this.authHttp
- .get(VideoService.BASE_VIDEO_URL, { params })
+ .get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
- map(this.extractVideos),
+ switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res))
)
}
search: string,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const url = VideoService.BASE_VIDEO_URL + 'search'
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
return this.authHttp
.get<ResultList<VideoServerModel>>(url, { params })
.pipe(
- map(this.extractVideos),
+ switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res))
)
}
}
private extractVideos (result: ResultList<VideoServerModel>) {
- const videosJson = result.data
- const totalVideos = result.total
- const videos = []
+ return this.serverService.localeObservable
+ .pipe(
+ map(translations => {
+ const videosJson = result.data
+ const totalVideos = result.total
+ const videos: Video[] = []
- for (const videoJson of videosJson) {
- videos.push(new Video(videoJson))
- }
+ for (const videoJson of videosJson) {
+ videos.push(new Video(videoJson, translations))
+ }
- return { videos, totalVideos }
+ return { videos, totalVideos }
+ })
+ )
}
}