+import { catchError, map, switchMap } from 'rxjs/operators'
import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import 'rxjs/add/operator/catch'
-import 'rxjs/add/operator/map'
-import { Observable } from 'rxjs/Observable'
+import { Observable } from 'rxjs'
import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } from '../../../../../shared'
import { ResultList } from '../../../../../shared/models/result-list.model'
import { UserVideoRateUpdate } from '../../../../../shared/models/videos/user-video-rate-update.model'
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)
- .map(videoHash => new VideoDetails(videoHash))
- .catch((res) => this.restExtractor.handleError(res))
+ return this.serverService.localeObservable
+ .pipe(
+ 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(err => this.restExtractor.handleError(err))
+ )
}
- viewVideo (uuid: string): Observable<VideoDetails> {
+ viewVideo (uuid: string): Observable<boolean> {
return this.authHttp.post(this.getVideoViewUrl(uuid), {})
- .map(this.restExtractor.extractDataBool)
- .catch(this.restExtractor.handleError)
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
updateVideo (video: VideoEdit) {
const category = video.category || null
const description = video.description || null
const support = video.support || null
+ const scheduleUpdate = video.scheduleUpdate || null
const body: VideoUpdate = {
name: video.name,
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
}
const data = objectToFormData(body)
return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data)
- .map(this.restExtractor.extractDataBool)
- .catch(this.restExtractor.handleError)
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
uploadVideo (video: FormData) {
const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true })
return this.authHttp
- .request(req)
- .catch(this.restExtractor.handleError)
+ .request<{ video: { id: number, uuid: string } }>(req)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
- 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 })
- .map(this.extractVideos)
- .catch((res) => this.restExtractor.handleError(res))
+ return this.authHttp
+ .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
getAccountVideos (
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 })
- .map(this.extractVideos)
- .catch((res) => this.restExtractor.handleError(res))
+ .get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
getVideoChannelVideos (
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 })
- .map(this.extractVideos)
- .catch((res) => this.restExtractor.handleError(res))
+ .get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
getVideos (
videoPagination: ComponentPagination,
sort: VideoSortField,
- filter?: VideoFilter
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ filter?: VideoFilter,
+ category?: number
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('filter', filter)
}
+ if (category) {
+ params = params.set('category', category + '')
+ }
+
return this.authHttp
- .get(VideoService.BASE_VIDEO_URL, { params })
- .map(this.extractVideos)
- .catch((res) => this.restExtractor.handleError(res))
+ .get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
buildBaseFeedUrls (params: HttpParams) {
return feeds
}
- getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter) {
+ getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, category?: number) {
let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort)
if (filter) params = params.set('filter', filter)
+ if (category) params = params.set('category', category + '')
+
return this.buildBaseFeedUrls(params)
}
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)
params = params.append('search', search)
return this.authHttp
- .get<ResultList<VideoServerModel>>(url, { params })
- .map(this.extractVideos)
- .catch((res) => this.restExtractor.handleError(res))
+ .get<ResultList<VideoServerModel>>(url, { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
removeVideo (id: number) {
return this.authHttp
- .delete(VideoService.BASE_VIDEO_URL + id)
- .map(this.restExtractor.extractDataBool)
- .catch((res) => this.restExtractor.handleError(res))
+ .delete(VideoService.BASE_VIDEO_URL + id)
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
loadCompleteDescription (descriptionPath: string) {
return this.authHttp
- .get(environment.apiUrl + descriptionPath)
- .map(res => res['description'])
- .catch((res) => this.restExtractor.handleError(res))
+ .get(environment.apiUrl + descriptionPath)
+ .pipe(
+ map(res => res[ 'description' ]),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
setVideoLike (id: number) {
return this.setVideoRate(id, 'none')
}
- getUserVideoRating (id: number): Observable<UserVideoRate> {
+ getUserVideoRating (id: number) {
const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating'
- return this.authHttp
- .get(url)
- .catch(res => this.restExtractor.handleError(res))
+ return this.authHttp.get<UserVideoRate>(url)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
private setVideoRate (id: number, rateType: VideoRateType) {
}
return this.authHttp
- .put(url, body)
- .map(this.restExtractor.extractDataBool)
- .catch(res => this.restExtractor.handleError(res))
+ .put(url, body)
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
private extractVideos (result: ResultList<VideoServerModel>) {
- const videosJson = result.data
- const totalVideos = result.total
- const videos = []
-
- for (const videoJson of videosJson) {
- videos.push(new Video(videoJson))
- }
-
- return { videos, totalVideos }
+ 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, translations))
+ }
+
+ return { videos, totalVideos }
+ })
+ )
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff