-import { Observable, of, throwError } from 'rxjs'
-import { catchError, map, mergeMap, switchMap } from 'rxjs/operators'
-import { HttpClient, HttpErrorResponse, HttpParams, HttpRequest } from '@angular/common/http'
+import { SortMeta } from 'primeng/api'
+import { from, Observable } from 'rxjs'
+import { catchError, concatMap, map, switchMap, toArray } from 'rxjs/operators'
+import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import { ComponentPaginationLight, RestExtractor, RestService, ServerService, UserService, AuthService } from '@app/core'
+import { ComponentPaginationLight, RestExtractor, RestPagination, RestService, ServerService, UserService } from '@app/core'
import { objectToFormData } from '@app/helpers'
import {
+ BooleanBothQuery,
FeedFormat,
NSFWPolicyType,
ResultList,
UserVideoRateType,
UserVideoRateUpdate,
Video as VideoServerModel,
+ VideoChannel as VideoChannelServerModel,
VideoConstant,
VideoDetails as VideoDetailsServerModel,
VideoFileMetadata,
- VideoFilter,
+ VideoInclude,
VideoPrivacy,
VideoSortField,
VideoUpdate
import { VideoEdit } from './video-edit.model'
import { Video } from './video.model'
-export interface VideosProvider {
- getVideos (parameters: {
- videoPagination: ComponentPaginationLight,
- sort: VideoSortField,
- filter?: VideoFilter,
- categoryOneOf?: number[],
- languageOneOf?: string[]
- nsfwPolicy: NSFWPolicyType
- }): Observable<ResultList<Video>>
+export type CommonVideoParams = {
+ videoPagination?: ComponentPaginationLight
+ sort: VideoSortField | SortMeta
+ include?: VideoInclude
+ isLocal?: boolean
+ categoryOneOf?: number[]
+ languageOneOf?: string[]
+ isLive?: boolean
+ skipCount?: boolean
+
+ // FIXME: remove?
+ nsfwPolicy?: NSFWPolicyType
+ nsfw?: BooleanBothQuery
}
@Injectable()
-export class VideoService implements VideosProvider {
- static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
+export class VideoService {
+ static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos'
static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
static BASE_SUBSCRIPTION_FEEDS_URL = environment.apiUrl + '/feeds/subscriptions.'
) {}
getVideoViewUrl (uuid: string) {
- return VideoService.BASE_VIDEO_URL + uuid + '/views'
+ return VideoService.BASE_VIDEO_URL + '/' + uuid + '/views'
}
getUserWatchingVideoUrl (uuid: string) {
- return VideoService.BASE_VIDEO_URL + uuid + '/watching'
+ return VideoService.BASE_VIDEO_URL + '/' + uuid + '/watching'
}
getVideo (options: { videoId: string }): Observable<VideoDetails> {
return this.serverService.getServerLocale()
.pipe(
switchMap(translations => {
- return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + options.videoId)
+ return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + '/' + options.videoId)
.pipe(map(videoHash => ({ videoHash, translations })))
}),
map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)),
const data = objectToFormData(body)
- return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data)
+ return this.authHttp.put(VideoService.BASE_VIDEO_URL + '/' + video.id, data)
.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 })
+ 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(err => this.restExtractor.handleError(err)))
}
- getMyVideos (videoPagination: ComponentPaginationLight, sort: VideoSortField, search?: string): Observable<ResultList<Video>> {
- const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+ getMyVideos (options: {
+ videoPagination: ComponentPaginationLight
+ sort: VideoSortField
+ userChannels?: VideoChannelServerModel[]
+ search?: string
+ }): Observable<ResultList<Video>> {
+ const { videoPagination, sort, userChannels = [], search } = options
+
+ const pagination = this.restService.componentToRestPagination(videoPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination, sort)
isLive: {
prefix: 'isLive:',
isBoolean: true
+ },
+ channelId: {
+ prefix: 'channel:',
+ handler: (name: string) => {
+ const channel = userChannels.find(c => c.name === name)
+
+ if (channel) return channel.id
+
+ return undefined
+ }
}
})
)
}
- getAccountVideos (parameters: {
- account: Account,
- videoPagination: ComponentPaginationLight,
- sort: VideoSortField
- nsfwPolicy?: NSFWPolicyType
- videoFilter?: VideoFilter
+ getAccountVideos (parameters: CommonVideoParams & {
+ account: Pick<Account, 'nameWithHost'>
search?: string
}): Observable<ResultList<Video>> {
- const { account, videoPagination, sort, videoFilter, nsfwPolicy, search } = parameters
-
- const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+ const { account, search } = parameters
let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination, sort)
+ params = this.buildCommonVideosParams({ params, ...parameters })
- if (nsfwPolicy) {
- params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
- }
-
- if (videoFilter) {
- params = params.set('filter', videoFilter)
- }
-
- if (search) {
- params = params.set('search', search)
- }
+ if (search) params = params.set('search', search)
return this.authHttp
.get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params })
)
}
- getVideoChannelVideos (parameters: {
- videoChannel: VideoChannel,
- videoPagination: ComponentPaginationLight,
- sort: VideoSortField,
- nsfwPolicy?: NSFWPolicyType
- videoFilter?: VideoFilter
+ getVideoChannelVideos (parameters: CommonVideoParams & {
+ videoChannel: Pick<VideoChannel, 'nameWithHost'>
}): Observable<ResultList<Video>> {
- const { videoChannel, videoPagination, sort, nsfwPolicy, videoFilter } = parameters
-
- const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+ const { videoChannel } = parameters
let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination, sort)
-
- if (nsfwPolicy) {
- params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
- }
-
- if (videoFilter) {
- params = params.set('filter', videoFilter)
- }
+ params = this.buildCommonVideosParams({ params, ...parameters })
return this.authHttp
.get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params })
)
}
- getVideos (parameters: {
- videoPagination: ComponentPaginationLight,
- sort: VideoSortField,
- filter?: VideoFilter,
- categoryOneOf?: number[],
- languageOneOf?: string[],
- skipCount?: boolean,
- nsfwPolicy?: NSFWPolicyType
- }): Observable<ResultList<Video>> {
- const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount, nsfwPolicy } = parameters
+ getAdminVideos (
+ parameters: CommonVideoParams & { pagination: RestPagination, search?: string }
+ ): Observable<ResultList<Video>> {
+ const { pagination, search } = parameters
- const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
+ const include = VideoInclude.BLACKLISTED |
+ VideoInclude.BLOCKED_OWNER |
+ VideoInclude.HIDDEN_PRIVACY |
+ VideoInclude.NOT_PUBLISHED_STATE |
+ VideoInclude.FILES
let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination, sort)
+ params = this.buildCommonVideosParams({ params, include, ...parameters })
- if (filter) params = params.set('filter', filter)
- if (skipCount) params = params.set('skipCount', skipCount + '')
+ params = params.set('start', pagination.start.toString())
+ .set('count', pagination.count.toString())
- if (nsfwPolicy) {
- params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
+ if (search) {
+ params = this.buildAdminParamsFromSearch(search, params)
}
- if (languageOneOf) {
- for (const l of languageOneOf) {
- params = params.append('languageOneOf[]', l)
- }
- }
+ return this.authHttp
+ .get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
+ .pipe(
+ switchMap(res => this.extractVideos(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
- if (categoryOneOf) {
- for (const c of categoryOneOf) {
- params = params.append('categoryOneOf[]', c + '')
- }
- }
+ getVideos (parameters: CommonVideoParams): Observable<ResultList<Video>> {
+ let params = new HttpParams()
+ params = this.buildCommonVideosParams({ params, ...parameters })
return this.authHttp
.get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
return feeds
}
- getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number[]) {
+ getVideoFeedUrls (sort: VideoSortField, isLocal: boolean, categoryOneOf?: number[]) {
let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort)
- if (filter) params = params.set('filter', filter)
+ if (isLocal) params = params.set('isLocal', isLocal)
if (categoryOneOf) {
for (const c of categoryOneOf) {
)
}
- removeVideo (id: number) {
- return this.authHttp
- .delete(VideoService.BASE_VIDEO_URL + id)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ removeVideo (idArg: number | number[]) {
+ const ids = Array.isArray(idArg) ? idArg : [ idArg ]
+
+ return from(ids)
+ .pipe(
+ concatMap(id => this.authHttp.delete(VideoService.BASE_VIDEO_URL + '/' + id)),
+ toArray(),
+ catchError(err => this.restExtractor.handleError(err))
+ )
}
loadCompleteDescription (descriptionPath: string) {
)
}
- explainedPrivacyLabels (privacies: VideoConstant<VideoPrivacy>[]) {
- const base = [
- {
- id: VideoPrivacy.PRIVATE,
- description: $localize`Only I can see this video`
- },
- {
- id: VideoPrivacy.UNLISTED,
- description: $localize`Only shareable via a private link`
- },
- {
- id: VideoPrivacy.PUBLIC,
- description: $localize`Anyone can see this video`
- },
- {
- id: VideoPrivacy.INTERNAL,
- description: $localize`Only users of this instance can see this video`
+ explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) {
+ const descriptions = {
+ [VideoPrivacy.PRIVATE]: $localize`Only I can see this video`,
+ [VideoPrivacy.UNLISTED]: $localize`Only shareable via a private link`,
+ [VideoPrivacy.PUBLIC]: $localize`Anyone can see this video`,
+ [VideoPrivacy.INTERNAL]: $localize`Only users of this instance can see this video`
+ }
+
+ const videoPrivacies = serverPrivacies.map(p => {
+ return {
+ ...p,
+
+ description: descriptions[p.id]
}
- ]
+ })
- return base
- .filter(o => !!privacies.find(p => p.id === o.id)) // filter down to privacies that where in the input
- .map(o => ({ ...privacies[o.id - 1], ...o })) // merge the input privacies that contain a label, and extend them with a description
+ return {
+ videoPrivacies,
+ defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id
+ }
+ }
+
+ getHighestAvailablePrivacy (serverPrivacies: VideoConstant<VideoPrivacy>[]) {
+ const order = [ VideoPrivacy.PRIVATE, VideoPrivacy.INTERNAL, VideoPrivacy.UNLISTED, VideoPrivacy.PUBLIC ]
+
+ for (const privacy of order) {
+ if (serverPrivacies.find(p => p.id === privacy)) {
+ return privacy
+ }
+ }
+
+ throw new Error('No highest privacy available')
}
nsfwPolicyToParam (nsfwPolicy: NSFWPolicyType) {
}
private setVideoRate (id: number, rateType: UserVideoRateType) {
- const url = VideoService.BASE_VIDEO_URL + id + '/rate'
+ const url = VideoService.BASE_VIDEO_URL + '/' + id + '/rate'
const body: UserVideoRateUpdate = {
rating: rateType
}
catchError(err => this.restExtractor.handleError(err))
)
}
+
+ private buildCommonVideosParams (options: CommonVideoParams & { params: HttpParams }) {
+ const {
+ params,
+ videoPagination,
+ sort,
+ isLocal,
+ include,
+ categoryOneOf,
+ languageOneOf,
+ skipCount,
+ nsfwPolicy,
+ isLive,
+ nsfw
+ } = options
+
+ const pagination = videoPagination
+ ? this.restService.componentToRestPagination(videoPagination)
+ : undefined
+
+ let newParams = this.restService.addRestGetParams(params, pagination, sort)
+
+ if (skipCount) newParams = newParams.set('skipCount', skipCount + '')
+
+ if (isLocal) newParams = newParams.set('isLocal', isLocal)
+ if (include) newParams = newParams.set('include', include)
+ if (isLive) newParams = newParams.set('isLive', isLive)
+ if (nsfw) newParams = newParams.set('nsfw', nsfw)
+ if (nsfwPolicy) newParams = newParams.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy))
+ if (languageOneOf) newParams = this.restService.addArrayParams(newParams, 'languageOneOf', languageOneOf)
+ if (categoryOneOf) newParams = this.restService.addArrayParams(newParams, 'categoryOneOf', categoryOneOf)
+
+ return newParams
+ }
+
+ private buildAdminParamsFromSearch (search: string, params: HttpParams) {
+ const filters = this.restService.parseQueryStringFilter(search, {
+ isLocal: {
+ prefix: 'isLocal:',
+ isBoolean: true
+ }
+ })
+
+ return this.restService.addObjectParams(params, filters)
+ }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff