Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-search / search.service.ts

diff --git a/client/src/app/shared/shared-search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts
index 15c4a7012cd7c3b1ba40a82d1bafda08f448f446..ad2de0f37f54dcb5741121a2d46dccddbe4e2d8b 100644 (file)
--- a/client/src/app/shared/shared-search/search.service.ts
+++ b/client/src/app/shared/shared-search/search.service.ts
@@ -1,12 +1,17 @@
-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 { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
-import { ResultList, SearchTargetType, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '@shared/models'
+import {
+  ResultList,
+  Video as VideoServerModel,
+  VideoChannel as VideoChannelServerModel,
+  VideoPlaylist as VideoPlaylistServerModel
+} from '@shared/models'
 import { environment } from '../../../environments/environment'
+import { VideoPlaylist, VideoPlaylistService } from '../shared-video-playlist'
 import { AdvancedSearch } from './advanced-search.model'
 
 @Injectable()
@@ -17,34 +22,37 @@ export class SearchService {
     private authHttp: HttpClient,
     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
-  }
+    private videoService: VideoService,
+    private playlistService: VideoPlaylistService
+  ) { }
 
   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)
     }
 
@@ -57,25 +65,33 @@ export class SearchService {
   }
 
   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
@@ -85,4 +101,42 @@ export class SearchService {
                  catchError(err => this.restExtractor.handleError(err))
                )
   }
+
+  searchVideoPlaylists (parameters: {
+    search?: string
+    advancedSearch?: AdvancedSearch
+    componentPagination?: ComponentPaginationLight
+    uuids?: string[]
+  }): Observable<ResultList<VideoPlaylist>> {
+    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.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.toPlaylistAPIObject()
+      params = this.restService.addObjectParams(params, advancedSearchObject)
+    }
+
+    return this.authHttp
+               .get<ResultList<VideoPlaylistServerModel>>(url, { params })
+               .pipe(
+                 switchMap(res => this.playlistService.extractPlaylists(res)),
+                 catchError(err => this.restExtractor.handleError(err))
+               )
+  }
 }