X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo.service.ts;h=5c0674e583763c5d13c30ed550cccdb5317f2f55;hb=7f5f4152a4cd4fc328d6ae177d281ebe7e792dd3;hp=5b8e2467a6c5eb8e9d29f47b13b6a1992b4c7324;hpb=5fcbd89841be29b373c6e4c8eeaa1f27414c8c7d;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 5b8e2467a..5c0674e58 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -1,15 +1,11 @@ -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' @@ -22,18 +18,30 @@ 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' +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) { @@ -41,18 +49,14 @@ export class VideoService { } getVideo (uuid: string): Observable { - return this.authHttp.get(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 { - return this.authHttp.post(this.getVideoViewUrl(uuid), {}) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(this.restExtractor.handleError) + switchMap(translations => { + return this.authHttp.get(VideoService.BASE_VIDEO_URL + uuid) + .pipe(map(videoHash => ({ videoHash, translations }))) + }), + map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)), + catchError(err => this.restExtractor.handleError(err)) ) } @@ -62,6 +66,7 @@ export class VideoService { 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, @@ -74,9 +79,11 @@ export class VideoService { 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) @@ -84,7 +91,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)) ) } @@ -92,20 +99,21 @@ 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() params = this.restService.addRestGetParams(params, pagination, sort) - return this.authHttp.get(UserService.BASE_USERS_URL + '/me/videos', { params }) + return this.authHttp + .get>(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)) ) } @@ -113,17 +121,17 @@ 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() params = this.restService.addRestGetParams(params, pagination, sort) return this.authHttp - .get(AccountService.BASE_ACCOUNT_URL + account.id + '/videos', { params }) + .get>(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)) ) } @@ -131,25 +139,43 @@ 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.uuid + '/videos', { params }) + .get>(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>(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() @@ -159,11 +185,15 @@ export class VideoService { params = params.set('filter', filter) } + if (categoryOneOf) { + params = params.set('categoryOneOf', categoryOneOf + '') + } + return this.authHttp - .get(VideoService.BASE_VIDEO_URL, { params }) + .get>(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)) ) } @@ -192,11 +222,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) } @@ -214,33 +246,12 @@ 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( - 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)) ) } @@ -249,7 +260,7 @@ export class VideoService { .get(environment.apiUrl + descriptionPath) .pipe( map(res => res[ 'description' ]), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -269,7 +280,24 @@ 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))) + } + + 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 } + }) + ) } private setVideoRate (id: number, rateType: VideoRateType) { @@ -282,19 +310,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) { - const videosJson = result.data - const totalVideos = result.total - const videos = [] - - for (const videoJson of videosJson) { - videos.push(new Video(videoJson)) - } - - return { videos, totalVideos } - } }