-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 { 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 { UserVideoRate } from '../../../../../shared/models/videos/user-video-rate.model'
-import { VideoFilter } from '../../../../../shared/models/videos/video-query.type'
+import { UserVideoRate, UserVideoRateUpdate, VideoFilter, VideoRateType, VideoUpdate } from '../../../../../shared/models/videos'
import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum'
-import { VideoRateType } from '../../../../../shared/models/videos/video-rate.type'
-import { VideoUpdate } from '../../../../../shared/models/videos/video-update.model'
import { environment } from '../../../environments/environment'
import { ComponentPagination } from '../rest/component-pagination.model'
import { RestExtractor } from '../rest/rest-extractor.service'
import { objectToFormData } from '@app/shared/misc/utils'
import { Account } from '@app/shared/account/account.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'
+import { UserSubscriptionService } from '@app/shared/user-subscription'
+import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
+
+export interface VideosProvider {
+ getVideos (
+ videoPagination: ComponentPagination,
+ sort: VideoSortField,
+ filter?: VideoFilter,
+ categoryOneOf?: number
+ ): Observable<{ videos: Video[], totalVideos: number }>
+}
@Injectable()
-export class VideoService {
- private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
- private static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
+export class VideoService implements VideosProvider {
+ static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
+ static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
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)),
- catchError(res => this.restExtractor.handleError(res))
- )
- }
-
- viewVideo (uuid: string): Observable<boolean> {
- return this.authHttp.post(this.getVideoViewUrl(uuid), {})
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(this.restExtractor.handleError)
+ 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))
)
}
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)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(this.restExtractor.handleError)
+ catchError(err => this.restExtractor.handleError(err))
)
}
const req = new HttpRequest('POST', VideoService.BASE_VIDEO_URL + 'upload', video, { reportProgress: true })
return this.authHttp
- .request<{ video: { id: number, uuid: string} }>(req)
- .pipe(catchError(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 })
+ return this.authHttp
+ .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params })
.pipe(
- map(this.extractVideos),
- catchError(res => this.restExtractor.handleError(res))
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
)
}
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),
- catchError(res => this.restExtractor.handleError(res))
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
)
}
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.nameWithHost + '/videos', { params })
.pipe(
- map(this.extractVideos),
- catchError(res => this.restExtractor.handleError(res))
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+
+ getUserSubscriptionVideos (
+ 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<ResultList<Video>>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/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,
+ categoryOneOf?: number
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('filter', filter)
}
+ if (categoryOneOf) {
+ params = params.set('categoryOneOf', categoryOneOf + '')
+ }
+
return this.authHttp
- .get(VideoService.BASE_VIDEO_URL, { params })
+ .get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
- map(this.extractVideos),
- catchError(res => this.restExtractor.handleError(res))
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
)
}
return feeds
}
- getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter) {
+ getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number) {
let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort)
if (filter) params = params.set('filter', filter)
+ if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '')
+
return this.buildBaseFeedUrls(params)
}
return this.buildBaseFeedUrls(params)
}
- searchVideos (
- search: string,
- videoPagination: ComponentPagination,
- sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number}> {
- const url = VideoService.BASE_VIDEO_URL + 'search'
-
- const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
-
- let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination, sort)
- params = params.append('search', search)
-
- return this.authHttp
- .get<ResultList<VideoServerModel>>(url, { params })
- .pipe(
- map(this.extractVideos),
- catchError(res => this.restExtractor.handleError(res))
- )
- }
-
removeVideo (id: number) {
return this.authHttp
.delete(VideoService.BASE_VIDEO_URL + id)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
.get(environment.apiUrl + descriptionPath)
.pipe(
map(res => res[ 'description' ]),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating'
return this.authHttp.get<UserVideoRate>(url)
- .pipe(catchError(res => this.restExtractor.handleError(res)))
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ extractVideos (result: ResultList<VideoServerModel>) {
+ 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 }
+ })
+ )
}
private setVideoRate (id: number, rateType: VideoRateType) {
.put(url, body)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ 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 }
- }
}
projects / oweals / peertube.git / blobdiff