-import { Observable } from 'rxjs'
+import { Observable, of } from 'rxjs'
import { catchError, map, switchMap } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
-import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
import {
ResultList,
- SearchTargetType,
Video as VideoServerModel,
VideoChannel as VideoChannelServerModel,
VideoPlaylist as VideoPlaylistServerModel
private restService: RestService,
private videoService: VideoService,
private playlistService: VideoPlaylistService
- ) {
- // Add ability to override search endpoint if the user updated this local storage key
- const searchUrl = peertubeLocalStorage.getItem('search-url')
- if (searchUrl) SearchService.BASE_SEARCH_URL = searchUrl
- }
+ ) { }
searchVideos (parameters: {
- search: string,
- componentPagination?: ComponentPaginationLight,
+ search?: string
+ componentPagination?: ComponentPaginationLight
advancedSearch?: AdvancedSearch
+ uuids?: string[]
}): Observable<ResultList<Video>> {
- const { search, componentPagination, advancedSearch } = parameters
+ const { search, uuids, componentPagination, advancedSearch } = parameters
+
+ if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'videos') {
+ return of({ total: 0, data: [] })
+ }
const url = SearchService.BASE_SEARCH_URL + 'videos'
let pagination: RestPagination
if (componentPagination) {
- pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+ pagination = this.restService.componentToRestPagination(componentPagination)
}
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination)
if (search) params = params.append('search', search)
+ if (uuids) params = this.restService.addArrayParams(params, 'uuids', uuids)
if (advancedSearch) {
- const advancedSearchObject = advancedSearch.toAPIObject()
+ const advancedSearchObject = advancedSearch.toVideosAPIObject()
params = this.restService.addObjectParams(params, advancedSearchObject)
}
}
searchVideoChannels (parameters: {
- search: string,
- searchTarget?: SearchTargetType,
+ search?: string
+ advancedSearch?: AdvancedSearch
componentPagination?: ComponentPaginationLight
+ handles?: string[]
}): Observable<ResultList<VideoChannel>> {
- const { search, componentPagination, searchTarget } = parameters
+ const { search, advancedSearch, componentPagination, handles } = parameters
+
+ if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'channels') {
+ return of({ total: 0, data: [] })
+ }
const url = SearchService.BASE_SEARCH_URL + 'video-channels'
let pagination: RestPagination
if (componentPagination) {
- pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+ pagination = this.restService.componentToRestPagination(componentPagination)
}
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination)
- params = params.append('search', search)
- if (searchTarget) {
- params = params.append('searchTarget', searchTarget as string)
+ if (search) params = params.append('search', search)
+ if (handles) params = this.restService.addArrayParams(params, 'handles', handles)
+
+ if (advancedSearch) {
+ const advancedSearchObject = advancedSearch.toChannelAPIObject()
+ params = this.restService.addObjectParams(params, advancedSearchObject)
}
return this.authHttp
}
searchVideoPlaylists (parameters: {
- search: string,
- searchTarget?: SearchTargetType,
+ search?: string
+ advancedSearch?: AdvancedSearch
componentPagination?: ComponentPaginationLight
+ uuids?: string[]
}): Observable<ResultList<VideoPlaylist>> {
- const { search, componentPagination, searchTarget } = parameters
+ const { search, advancedSearch, componentPagination, uuids } = parameters
+
+ if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'playlists') {
+ return of({ total: 0, data: [] })
+ }
const url = SearchService.BASE_SEARCH_URL + 'video-playlists'
let pagination: RestPagination
if (componentPagination) {
- pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+ pagination = this.restService.componentToRestPagination(componentPagination)
}
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination)
- params = params.append('search', search)
- if (searchTarget) {
- params = params.append('searchTarget', searchTarget as string)
+ if (search) params = params.append('search', search)
+ if (uuids) params = this.restService.addArrayParams(params, 'uuids', uuids)
+
+ if (advancedSearch) {
+ const advancedSearchObject = advancedSearch.toPlaylistAPIObject()
+ params = this.restService.addObjectParams(params, advancedSearchObject)
}
return this.authHttp