import { ResultList } from '../../../../../shared/models/result-list.model'
import {
UserVideoRate,
+ UserVideoRateType,
UserVideoRateUpdate,
VideoConstant,
VideoFilter,
VideoPrivacy,
- VideoRateType,
VideoUpdate
} from '../../../../../shared/models/videos'
import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum'
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 (
+ getVideos (parameters: {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
- categoryOneOf?: number
- ): Observable<{ videos: Video[], totalVideos: number }>
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<{ videos: Video[], totalVideos: number }>
}
@Injectable()
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,
nsfw: video.nsfw,
waitTranscoding: video.waitTranscoding,
commentsEnabled: video.commentsEnabled,
- downloadingEnabled: video.downloadingEnabled,
+ downloadEnabled: video.downloadEnabled,
thumbnailfile: video.thumbnailfile,
previewfile: video.previewfile,
- scheduleUpdate
+ scheduleUpdate,
+ originallyPublishedAt
}
const data = objectToFormData(body)
)
}
+ 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<ResultList<Video>>(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
)
}
- getVideos (
+ getVideos (parameters: {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
- categoryOneOf?: number
- ): Observable<{ videos: Video[], totalVideos: number }> {
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<{ videos: Video[], totalVideos: number }> {
+ const { videoPagination, sort, filter, categoryOneOf, languageOneOf } = parameters
+
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
params = params.set('categoryOneOf', categoryOneOf + '')
}
+ if (languageOneOf) {
+ for (const l of languageOneOf) {
+ params = params.append('languageOneOf[]', l)
+ }
+ }
+
return this.authHttp
.get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
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))
)
}
return privacies
}
- private setVideoRate (id: number, rateType: VideoRateType) {
+ private setVideoRate (id: number, rateType: UserVideoRateType) {
const url = VideoService.BASE_VIDEO_URL + id + '/rate'
const body: UserVideoRateUpdate = {
rating: rateType