X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo.service.ts;h=ef489648c6c48f088d7e66a507bd3f4a49909d7f;hb=21d141c296541f41e399ec68aa7fa85e53d0dcb8;hp=58cb52efcbc6a8239b8afe9437a565c094610cfd;hpb=74b7c6d48e9ca377fe938c8134ed74b612e62ba0;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 58cb52efc..ef489648c 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -4,12 +4,16 @@ 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, + UserVideoRateType, + UserVideoRateUpdate, + VideoConstant, + VideoFilter, + VideoPrivacy, + 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' @@ -22,26 +26,44 @@ import { Video } from './video.model' 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/user-subscription.service' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model' +import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service' + +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 serverService: ServerService + private serverService: ServerService, + private i18n: I18n ) {} getVideoViewUrl (uuid: string) { return VideoService.BASE_VIDEO_URL + uuid + '/views' } + getUserWatchingVideoUrl (uuid: string) { + return VideoService.BASE_VIDEO_URL + uuid + '/watching' + } + getVideo (uuid: string): Observable { return this.serverService.localeObservable .pipe( @@ -50,15 +72,7 @@ export class VideoService { .pipe(map(videoHash => ({ videoHash, translations }))) }), map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)), - catchError(res => this.restExtractor.handleError(res)) - ) - } - - viewVideo (uuid: string): Observable { - return this.authHttp.post(this.getVideoViewUrl(uuid), {}) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(this.restExtractor.handleError) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -68,6 +82,8 @@ export class VideoService { const category = video.category || null 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, @@ -80,9 +96,13 @@ export class VideoService { privacy: video.privacy, tags: video.tags, nsfw: video.nsfw, + waitTranscoding: video.waitTranscoding, commentsEnabled: video.commentsEnabled, + downloadEnabled: video.downloadEnabled, thumbnailfile: video.thumbnailfile, - previewfile: video.previewfile + previewfile: video.previewfile, + scheduleUpdate, + originallyPublishedAt } const data = objectToFormData(body) @@ -90,7 +110,7 @@ export class VideoService { 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)) ) } @@ -98,11 +118,11 @@ export class VideoService { 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() @@ -112,7 +132,7 @@ export class VideoService { .get>(UserService.BASE_USERS_URL + '/me/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -120,7 +140,7 @@ export class VideoService { 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() @@ -130,7 +150,7 @@ export class VideoService { .get>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -138,25 +158,60 @@ export class VideoService { 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.nameWithHost + '/videos', { params }) + .pipe( + switchMap(res => this.extractVideos(res)), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + getPlaylistVideos ( + videoPlaylistId: number | string, + videoPagination: ComponentPagination + ): Observable<{ videos: Video[], totalVideos: number }> { + const pagination = this.restService.componentPaginationToRestPagination(videoPagination) + + let params = new HttpParams() + params = this.restService.addRestGetParams(params, pagination) + + return this.authHttp + .get>(VideoPlaylistService.BASE_VIDEO_PLAYLIST_URL + videoPlaylistId + '/videos', { params }) + .pipe( + 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>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params }) + .get>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(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() @@ -166,25 +221,32 @@ export class VideoService { params = params.set('filter', filter) } + if (categoryOneOf) { + params = params.set('categoryOneOf', categoryOneOf + '') + } + return this.authHttp .get>(VideoService.BASE_VIDEO_URL, { params }) .pipe( switchMap(res => this.extractVideos(res)), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } 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() } @@ -199,11 +261,13 @@ export class VideoService { 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) } @@ -221,42 +285,21 @@ export class VideoService { 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>(url, { params }) - .pipe( - switchMap(res => this.extractVideos(res)), - 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)) ) } loadCompleteDescription (descriptionPath: string) { return this.authHttp - .get(environment.apiUrl + descriptionPath) + .get<{ description: string }>(environment.apiUrl + descriptionPath) .pipe( - map(res => res[ 'description' ]), - catchError(res => this.restExtractor.handleError(res)) + map(res => res.description), + catchError(err => this.restExtractor.handleError(err)) ) } @@ -276,10 +319,42 @@ export class VideoService { const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating' return this.authHttp.get(url) - .pipe(catchError(res => this.restExtractor.handleError(res))) + .pipe(catchError(err => this.restExtractor.handleError(err))) } - private setVideoRate (id: number, rateType: VideoRateType) { + extractVideos (result: ResultList) { + 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 } + }) + ) + } + + explainedPrivacyLabels (privacies: VideoConstant[]) { + const newPrivacies = privacies.slice() + + const privatePrivacy = newPrivacies.find(p => p.id === VideoPrivacy.PRIVATE) + if (privatePrivacy) privatePrivacy.label = this.i18n('Only I can see this video') + + const unlistedPrivacy = newPrivacies.find(p => p.id === VideoPrivacy.UNLISTED) + if (unlistedPrivacy) unlistedPrivacy.label = this.i18n('Only people with the private link can see this video') + + const publicPrivacy = newPrivacies.find(p => p.id === VideoPrivacy.PUBLIC) + if (publicPrivacy) publicPrivacy.label = this.i18n('Anyone can see this video') + + return privacies + } + + private setVideoRate (id: number, rateType: UserVideoRateType) { const url = VideoService.BASE_VIDEO_URL + id + '/rate' const body: UserVideoRateUpdate = { rating: rateType @@ -289,24 +364,7 @@ export class VideoService { .put(url, body) .pipe( map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } - - private extractVideos (result: ResultList) { - 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 } - }) - ) - } }