X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo.service.ts;h=d66a1f809990ac78b9029551e833428d23b3fd6d;hb=5c20a45518c3afc40c9494cad4a78def92e5e288;hp=5c0674e583763c5d13c30ed550cccdb5317f2f55;hpb=7f5f4152a4cd4fc328d6ae177d281ebe7e792dd3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 5c0674e58..d66a1f809 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -4,10 +4,18 @@ 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 { UserVideoRate, UserVideoRateUpdate, VideoFilter, VideoRateType, VideoUpdate } from '../../../../../shared/models/videos' +import { + UserVideoRate, + UserVideoRateType, + UserVideoRateUpdate, + VideoConstant, + VideoFilter, + 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' @@ -19,17 +27,22 @@ import { objectToFormData } from '@app/shared/misc/utils' 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 { ServerService, AuthService } from '@app/core' +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' +import { NSFWPolicyType } from '@shared/models/videos/nsfw-policy.type' +import { FfprobeData } from 'fluent-ffmpeg' export interface VideosProvider { - getVideos ( - videoPagination: ComponentPagination, + getVideos (parameters: { + videoPagination: ComponentPaginationLight, sort: VideoSortField, filter?: VideoFilter, - categoryOneOf?: number - ): Observable<{ videos: Video[], totalVideos: number }> + categoryOneOf?: number[], + languageOneOf?: string[] + nsfwPolicy: NSFWPolicyType + }): Observable> } @Injectable() @@ -39,20 +52,27 @@ export class VideoService implements VideosProvider { constructor ( private authHttp: HttpClient, + private authService: AuthService, + private userService: UserService, 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)), @@ -67,6 +87,7 @@ export class VideoService implements VideosProvider { 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, @@ -81,9 +102,11 @@ export class VideoService implements VideosProvider { 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) @@ -103,14 +126,15 @@ export class VideoService implements VideosProvider { .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)) @@ -119,9 +143,9 @@ export class VideoService implements VideosProvider { 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() @@ -137,14 +161,19 @@ export class VideoService implements VideosProvider { getVideoChannelVideos ( videoChannel: VideoChannel, - videoPagination: ComponentPagination, - sort: VideoSortField - ): Observable<{ videos: Video[], totalVideos: number }> { + videoPagination: ComponentPaginationLight, + sort: VideoSortField, + nsfwPolicy?: NSFWPolicyType + ): Observable> { const pagination = this.restService.componentPaginationToRestPagination(videoPagination) let params = new HttpParams() params = this.restService.addRestGetParams(params, pagination, sort) + if (nsfwPolicy) { + params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy)) + } + return this.authHttp .get>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.nameWithHost + '/videos', { params }) .pipe( @@ -153,15 +182,19 @@ export class VideoService implements VideosProvider { ) } - 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( @@ -170,23 +203,39 @@ export class VideoService implements VideosProvider { ) } - getVideos ( - videoPagination: ComponentPagination, + getVideos (parameters: { + videoPagination: ComponentPaginationLight, sort: VideoSortField, filter?: VideoFilter, - categoryOneOf?: number - ): Observable<{ videos: Video[], totalVideos: number }> { + categoryOneOf?: number[], + languageOneOf?: string[], + skipCount?: boolean, + nsfwPolicy?: NSFWPolicyType + }): Observable> { + const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount, nsfwPolicy } = 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 (skipCount) params = params.set('skipCount', skipCount + '') + + if (nsfwPolicy) { + params = params.set('nsfw', this.nsfwPolicyToParam(nsfwPolicy)) + } + + if (languageOneOf) { + for (const l of languageOneOf) { + params = params.append('languageOneOf[]', l) + } } if (categoryOneOf) { - params = params.set('categoryOneOf', categoryOneOf + '') + for (const c of categoryOneOf) { + params = params.append('categoryOneOf[]', c + '') + } } return this.authHttp @@ -200,14 +249,17 @@ export class VideoService implements VideosProvider { 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() } @@ -222,12 +274,16 @@ export class VideoService implements VideosProvider { return feeds } - getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number) { + 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 + '') + if (categoryOneOf) { + for (const c of categoryOneOf) { + params = params.append('categoryOneOf[]', c + '') + } + } return this.buildBaseFeedUrls(params) } @@ -246,6 +302,14 @@ export class VideoService implements VideosProvider { return this.buildBaseFeedUrls(params) } + getVideoFileMetadata (metadataUrl: string) { + return this.authHttp + .get(metadataUrl) + .pipe( + catchError(err => this.restExtractor.handleError(err)) + ) + } + removeVideo (id: number) { return this.authHttp .delete(VideoService.BASE_VIDEO_URL + id) @@ -257,9 +321,9 @@ export class VideoService implements VideosProvider { 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)) ) } @@ -284,7 +348,7 @@ export class VideoService implements VideosProvider { } extractVideos (result: ResultList) { - return this.serverService.localeObservable + return this.serverService.getServerLocale() .pipe( map(translations => { const videosJson = result.data @@ -295,12 +359,41 @@ export class VideoService implements VideosProvider { 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)) + } + + nsfwPolicyToParam (nsfwPolicy: NSFWPolicyType) { + return nsfwPolicy === 'do_not_list' + ? 'false' + : 'both' + } + + private setVideoRate (id: number, rateType: UserVideoRateType) { const url = VideoService.BASE_VIDEO_URL + id + '/rate' const body: UserVideoRateUpdate = { rating: rateType