@Injectable()
export class VideoService {
- private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
- private static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
+ static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
+ static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.'
constructor (
private authHttp: HttpClient,
return this.serverService.localeObservable
.pipe(
switchMap(translations => {
- return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
- .pipe(map(videoHash => ({ videoHash, translations })))
+ return this.authHttp.get<VideoDetailsServerModel>(VideoService.BASE_VIDEO_URL + uuid)
+ .pipe(map(videoHash => ({ videoHash, translations })))
}),
map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
return this.authHttp.post(this.getVideoViewUrl(uuid), {})
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(this.restExtractor.handleError)
+ catchError(err => this.restExtractor.handleError(err))
)
}
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,
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)
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))
)
}
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()
.get<ResultList<Video>>(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))
)
}
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()
.get<ResultList<Video>>(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))
)
}
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()
.get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/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,
+ category?: number
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('filter', filter)
}
+ if (category) {
+ params = params.set('category', category + '')
+ }
+
return this.authHttp
.get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
switchMap(res => this.extractVideos(res)),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
return feeds
}
- getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter) {
+ getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, category?: number) {
let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort)
if (filter) params = params.set('filter', filter)
+ if (category) params = params.set('category', category + '')
+
return this.buildBaseFeedUrls(params)
}
search: string,
videoPagination: ComponentPagination,
sort: VideoSortField
- ): Observable<{ videos: Video[], totalVideos: number}> {
+ ): Observable<{ videos: Video[], totalVideos: number }> {
const url = VideoService.BASE_VIDEO_URL + 'search'
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
.get<ResultList<VideoServerModel>>(url, { params })
.pipe(
switchMap(res => this.extractVideos(res)),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
.delete(VideoService.BASE_VIDEO_URL + id)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
.get(environment.apiUrl + descriptionPath)
.pipe(
map(res => res[ 'description' ]),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating'
return this.authHttp.get<UserVideoRate>(url)
- .pipe(catchError(res => this.restExtractor.handleError(res)))
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
private setVideoRate (id: number, rateType: VideoRateType) {
.put(url, body)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
private extractVideos (result: ResultList<VideoServerModel>) {
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 }
- })
- )
+ .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 }
+ })
+ )
}
}