-import { catchError, switchMap } from 'rxjs/operators'
+import { catchError, map, switchMap } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { Observable } from 'rxjs'
-import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { ComponentPaginationLight } from '@app/shared/rest/component-pagination.model'
import { VideoService } from '@app/shared/video/video.service'
import { RestExtractor, RestService } from '@app/shared'
-import { environment } from 'environments/environment'
-import { ResultList, Video } from '../../../../shared'
-import { Video as VideoServerModel } from '@app/shared/video/video.model'
+import { environment } from '../../environments/environment'
+import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared'
+import { Video } from '@app/shared/video/video.model'
import { AdvancedSearch } from '@app/search/advanced-search.model'
-
-export type SearchResult = {
- videosResult: { totalVideos: number, videos: Video[] }
-}
+import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
+import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
@Injectable()
export class SearchService {
private restExtractor: RestExtractor,
private restService: RestService,
private videoService: VideoService
- ) {}
+ ) {
+ // 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 (
+ searchVideos (parameters: {
search: string,
- componentPagination: ComponentPagination,
+ componentPagination: ComponentPaginationLight,
advancedSearch: AdvancedSearch
- ): Observable<{ videos: Video[], totalVideos: number }> {
- const url = SearchService.BASE_SEARCH_URL + 'videos'
+ }): Observable<ResultList<Video>> {
+ const { search, componentPagination, advancedSearch } = parameters
+ const url = SearchService.BASE_SEARCH_URL + 'videos'
const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
let params = new HttpParams()
params = this.restService.addRestGetParams(params, pagination)
- params = params.append('search', search)
- const advancedSearchObject = advancedSearch.toAPIObject()
-
- for (const name of Object.keys(advancedSearchObject)) {
- const value = advancedSearchObject[name]
- if (!value) continue
+ if (search) params = params.append('search', search)
- if (Array.isArray(value) && value.length !== 0) {
- for (const v of value) params = params.append(name, v)
- } else {
- params = params.append(name, value)
- }
- }
+ const advancedSearchObject = advancedSearch.toAPIObject()
+ params = this.restService.addObjectParams(params, advancedSearchObject)
return this.authHttp
.get<ResultList<VideoServerModel>>(url, { params })
catchError(err => this.restExtractor.handleError(err))
)
}
+
+ searchVideoChannels (parameters: {
+ search: string,
+ componentPagination: ComponentPaginationLight
+ }): Observable<ResultList<VideoChannel>> {
+ const { search, componentPagination } = parameters
+
+ const url = SearchService.BASE_SEARCH_URL + 'video-channels'
+ const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
+
+ let params = new HttpParams()
+ params = this.restService.addRestGetParams(params, pagination)
+ params = params.append('search', search)
+
+ return this.authHttp
+ .get<ResultList<VideoChannelServerModel>>(url, { params })
+ .pipe(
+ map(res => VideoChannelService.extractVideoChannels(res)),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
}