X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo.service.ts;h=9962021545a6def2fa95527ed73f23222f3845b5;hb=e612209767ebe1deb0af7688c96b7f979bb52b44;hp=1a934c8e2dd0c48de20b77b13b5f7295d9e5667b;hpb=22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd;p=oweals%2Fpeertube.git diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 1a934c8e2..996202154 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -6,15 +6,16 @@ import { Video as VideoServerModel, VideoDetails as VideoDetailsServerModel } fr import { ResultList } from '../../../../../shared/models/result-list.model' import { UserVideoRate, + UserVideoRateType, UserVideoRateUpdate, - VideoChannel, + VideoConstant, VideoFilter, - VideoRateType, + VideoPrivacy, VideoUpdate } from '../../../../../shared/models/videos' import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' import { environment } from '../../../environments/environment' -import { ComponentPagination } from '../rest/component-pagination.model' +import { ComponentPaginationLight } from '../rest/component-pagination.model' import { RestExtractor } from '../rest/rest-extractor.service' import { RestService } from '../rest/rest.service' import { UserService } from '../users/user.service' @@ -27,10 +28,22 @@ import { Account } from '@app/shared/account/account.model' import { AccountService } from '@app/shared/account/account.service' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { ServerService } from '@app/core' -import { UserSubscriptionService } from '@app/shared/user-subscription' +import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' +import { I18n } from '@ngx-translate/i18n-polyfill' + +export interface VideosProvider { + getVideos (parameters: { + videoPagination: ComponentPaginationLight, + sort: VideoSortField, + filter?: VideoFilter, + categoryOneOf?: number, + languageOneOf?: string[] + }): Observable> +} @Injectable() -export class VideoService { +export class VideoService implements VideosProvider { static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/' static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.' @@ -38,18 +51,23 @@ export class VideoService { private authHttp: HttpClient, private restExtractor: RestExtractor, private restService: RestService, - private serverService: ServerService + private serverService: ServerService, + private i18n: I18n ) {} getVideoViewUrl (uuid: string) { return VideoService.BASE_VIDEO_URL + uuid + '/views' } - getVideo (uuid: string): Observable { - return this.serverService.localeObservable + getUserWatchingVideoUrl (uuid: string) { + return VideoService.BASE_VIDEO_URL + uuid + '/watching' + } + + getVideo (options: { videoId: string }): Observable { + return this.serverService.getServerLocale() .pipe( switchMap(translations => { - return this.authHttp.get(VideoService.BASE_VIDEO_URL + uuid) + return this.authHttp.get(VideoService.BASE_VIDEO_URL + options.videoId) .pipe(map(videoHash => ({ videoHash, translations }))) }), map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)), @@ -57,14 +75,6 @@ export class VideoService { ) } - viewVideo (uuid: string): Observable { - return this.authHttp.post(this.getVideoViewUrl(uuid), {}) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(err => this.restExtractor.handleError(err)) - ) - } - updateVideo (video: VideoEdit) { const language = video.language || null const licence = video.licence || null @@ -72,6 +82,7 @@ export class VideoService { const description = video.description || null const support = video.support || null const scheduleUpdate = video.scheduleUpdate || null + const originallyPublishedAt = video.originallyPublishedAt || null const body: VideoUpdate = { name: video.name, @@ -86,9 +97,11 @@ export class VideoService { nsfw: video.nsfw, waitTranscoding: video.waitTranscoding, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, thumbnailfile: video.thumbnailfile, previewfile: video.previewfile, - scheduleUpdate + scheduleUpdate, + originallyPublishedAt } const data = objectToFormData(body) @@ -108,14 +121,15 @@ export class VideoService { .pipe(catchError(err => this.restExtractor.handleError(err))) } - getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> { + getMyVideos (videoPagination: ComponentPaginationLight, sort: VideoSortField, search?: string): Observable> { const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + params = this.restService.addObjectParams(params, { search }) return this.authHttp - .get>(UserService.BASE_USERS_URL + '/me/videos', { params }) + .get>(UserService.BASE_USERS_URL + 'me/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), catchError(err => this.restExtractor.handleError(err)) @@ -124,9 +138,9 @@ export class VideoService { getAccountVideos ( account: Account, - videoPagination: ComponentPagination, + videoPagination: ComponentPaginationLight, sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + ): Observable> { const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() @@ -142,31 +156,35 @@ export class VideoService { getVideoChannelVideos ( videoChannel: VideoChannel, - videoPagination: ComponentPagination, + videoPagination: ComponentPaginationLight, sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + ): Observable> { 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.name + '/videos', { params }) + .get>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), catchError(err => this.restExtractor.handleError(err)) ) } - getUserSubscriptionVideos ( - videoPagination: ComponentPagination, - sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + getUserSubscriptionVideos (parameters: { + videoPagination: ComponentPaginationLight, + sort: VideoSortField, + skipCount?: boolean + }): Observable> { + const { videoPagination, sort, skipCount } = parameters const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + if (skipCount) params = params.set('skipCount', skipCount + '') + return this.authHttp .get>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params }) .pipe( @@ -175,23 +193,29 @@ export class VideoService { ) } - getVideos ( - videoPagination: ComponentPagination, + getVideos (parameters: { + videoPagination: ComponentPaginationLight, sort: VideoSortField, filter?: VideoFilter, - categoryOneOf?: number - ): Observable<{ videos: Video[], totalVideos: number }> { + categoryOneOf?: number, + languageOneOf?: string[], + skipCount?: boolean + }): Observable> { + const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount } = parameters + const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) - if (filter) { - params = params.set('filter', filter) - } + if (filter) params = params.set('filter', filter) + if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') + if (skipCount) params = params.set('skipCount', skipCount + '') - if (categoryOneOf) { - params = params.set('categoryOneOf', categoryOneOf + '') + if (languageOneOf) { + for (const l of languageOneOf) { + params = params.append('languageOneOf[]', l) + } } return this.authHttp @@ -205,14 +229,17 @@ export class VideoService { buildBaseFeedUrls (params: HttpParams) { const feeds = [ { + format: FeedFormat.RSS, label: 'rss 2.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.RSS.toLowerCase() }, { + format: FeedFormat.ATOM, label: 'atom 1.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.ATOM.toLowerCase() }, { + format: FeedFormat.JSON, label: 'json 1.0', url: VideoService.BASE_FEEDS_URL + FeedFormat.JSON.toLowerCase() } @@ -262,9 +289,9 @@ export class VideoService { loadCompleteDescription (descriptionPath: string) { return this.authHttp - .get(environment.apiUrl + descriptionPath) + .get<{ description: string }>(environment.apiUrl + descriptionPath) .pipe( - map(res => res[ 'description' ]), + map(res => res.description), catchError(err => this.restExtractor.handleError(err)) ) } @@ -289,7 +316,7 @@ export class VideoService { } extractVideos (result: ResultList) { - return this.serverService.localeObservable + return this.serverService.getServerLocale() .pipe( map(translations => { const videosJson = result.data @@ -300,12 +327,35 @@ export class VideoService { videos.push(new Video(videoJson, translations)) } - return { videos, totalVideos } + return { total: totalVideos, data: videos } }) ) } - private setVideoRate (id: number, rateType: VideoRateType) { + explainedPrivacyLabels (privacies: VideoConstant[]) { + const base = [ + { + id: VideoPrivacy.PRIVATE, + label: this.i18n('Only I can see this video') + }, + { + id: VideoPrivacy.UNLISTED, + label: this.i18n('Only people with the private link can see this video') + }, + { + id: VideoPrivacy.PUBLIC, + label: this.i18n('Anyone can see this video') + }, + { + id: VideoPrivacy.INTERNAL, + label: this.i18n('Only users of this instance can see this video') + } + ] + + return base.filter(o => !!privacies.find(p => p.id === o.id)) + } + + private setVideoRate (id: number, rateType: UserVideoRateType) { const url = VideoService.BASE_VIDEO_URL + id + '/rate' const body: UserVideoRateUpdate = { rating: rateType