From 67ed6552b831df66713bac9e672738796128d33f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 23 Jun 2020 14:10:17 +0200 Subject: Reorganize client shared modules --- client/src/app/shared/video-caption/index.ts | 1 - .../video-caption/video-caption-edit.model.ts | 9 --- .../shared/video-caption/video-caption.service.ts | 76 ---------------------- 3 files changed, 86 deletions(-) delete mode 100644 client/src/app/shared/video-caption/index.ts delete mode 100644 client/src/app/shared/video-caption/video-caption-edit.model.ts delete mode 100644 client/src/app/shared/video-caption/video-caption.service.ts (limited to 'client/src/app/shared/video-caption') diff --git a/client/src/app/shared/video-caption/index.ts b/client/src/app/shared/video-caption/index.ts deleted file mode 100644 index c48a70558..000000000 --- a/client/src/app/shared/video-caption/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './video-caption.service' diff --git a/client/src/app/shared/video-caption/video-caption-edit.model.ts b/client/src/app/shared/video-caption/video-caption-edit.model.ts deleted file mode 100644 index 732f20158..000000000 --- a/client/src/app/shared/video-caption/video-caption-edit.model.ts +++ /dev/null @@ -1,9 +0,0 @@ -export interface VideoCaptionEdit { - language: { - id: string - label?: string - } - - action?: 'CREATE' | 'REMOVE' - captionfile?: any -} diff --git a/client/src/app/shared/video-caption/video-caption.service.ts b/client/src/app/shared/video-caption/video-caption.service.ts deleted file mode 100644 index 6bfe67435..000000000 --- a/client/src/app/shared/video-caption/video-caption.service.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { catchError, map, switchMap } from 'rxjs/operators' -import { HttpClient } from '@angular/common/http' -import { Injectable } from '@angular/core' -import { Observable, of } from 'rxjs' -import { peertubeTranslate, ResultList } from '../../../../../shared' -import { RestExtractor } from '../rest' -import { VideoService } from '@app/shared/video/video.service' -import { objectToFormData, sortBy } from '@app/shared/misc/utils' -import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' -import { VideoCaption } from '../../../../../shared/models/videos/caption/video-caption.model' -import { ServerService } from '@app/core' - -@Injectable() -export class VideoCaptionService { - constructor ( - private authHttp: HttpClient, - private serverService: ServerService, - private restExtractor: RestExtractor - ) {} - - listCaptions (videoId: number | string): Observable> { - return this.authHttp.get>(VideoService.BASE_VIDEO_URL + videoId + '/captions') - .pipe( - switchMap(captionsResult => { - return this.serverService.getServerLocale() - .pipe(map(translations => ({ captionsResult, translations }))) - }), - map(({ captionsResult, translations }) => { - for (const c of captionsResult.data) { - c.language.label = peertubeTranslate(c.language.label, translations) - } - - return captionsResult - }), - map(captionsResult => { - sortBy(captionsResult.data, 'language', 'label') - - return captionsResult - }) - ) - .pipe(catchError(res => this.restExtractor.handleError(res))) - } - - removeCaption (videoId: number | string, language: string) { - return this.authHttp.delete(VideoService.BASE_VIDEO_URL + videoId + '/captions/' + language) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) - ) - } - - addCaption (videoId: number | string, language: string, captionfile: File) { - const body = { captionfile } - const data = objectToFormData(body) - - return this.authHttp.put(VideoService.BASE_VIDEO_URL + videoId + '/captions/' + language, data) - .pipe( - map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) - ) - } - - updateCaptions (videoId: number | string, videoCaptions: VideoCaptionEdit[]) { - let obs = of(true) - - for (const videoCaption of videoCaptions) { - if (videoCaption.action === 'CREATE') { - obs = obs.pipe(switchMap(() => this.addCaption(videoId, videoCaption.language.id, videoCaption.captionfile))) - } else if (videoCaption.action === 'REMOVE') { - obs = obs.pipe(switchMap(() => this.removeCaption(videoId, videoCaption.language.id))) - } - } - - return obs - } -} -- cgit v1.2.3