OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Limit scope to local when finding in bulk

pull/4765/head
Chocobozzz 2022-01-31 11:15:44 +01:00
parent 228d8e8e47
commit 8d9c10bc51
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/src/app/shared/shared-search/find-in-bulk.service.ts
View File

@ -7,6 +7,7 @@ import { ResultList } from '@shared/models/common'
import { Video, VideoChannel } from '../shared-main' import { Video, VideoChannel } from '../shared-main'
import { VideoPlaylist } from '../shared-video-playlist' import { VideoPlaylist } from '../shared-video-playlist'
import { SearchService } from './search.service' import { SearchService } from './search.service'
import { AdvancedSearch } from './advanced-search.model'
const logger = debug('peertube:search:FindInBulkService') const logger = debug('peertube:search:FindInBulkService')
@ -18,6 +19,8 @@ type BulkObservables <P extends number | string, R> = {
@Injectable() @Injectable()
export class FindInBulkService { export class FindInBulkService {
private advancedSearchForBulk: AdvancedSearch
private getVideoInBulk: BulkObservables<string, ResultList<Video>> private getVideoInBulk: BulkObservables<string, ResultList<Video>>
private getChannelInBulk: BulkObservables<string, ResultList<VideoChannel>> private getChannelInBulk: BulkObservables<string, ResultList<VideoChannel>>
private getPlaylistInBulk: BulkObservables<string, ResultList<VideoPlaylist>> private getPlaylistInBulk: BulkObservables<string, ResultList<VideoPlaylist>>
@ -28,6 +31,8 @@ export class FindInBulkService {
this.getVideoInBulk = this.buildBulkObservableObject(this.getVideosInBulk.bind(this)) this.getVideoInBulk = this.buildBulkObservableObject(this.getVideosInBulk.bind(this))
this.getChannelInBulk = this.buildBulkObservableObject(this.getChannelsInBulk.bind(this)) this.getChannelInBulk = this.buildBulkObservableObject(this.getChannelsInBulk.bind(this))
this.getPlaylistInBulk = this.buildBulkObservableObject(this.getPlaylistsInBulk.bind(this)) this.getPlaylistInBulk = this.buildBulkObservableObject(this.getPlaylistsInBulk.bind(this))
this.advancedSearchForBulk = new AdvancedSearch({ searchTarget: 'local' })
} }
getVideo (uuid: string): Observable<Video> { getVideo (uuid: string): Observable<Video> {
@ -91,19 +96,31 @@ export class FindInBulkService {
private getVideosInBulk (uuids: string[]) { private getVideosInBulk (uuids: string[]) {
logger('Fetching videos %s.', uuids.join(', ')) logger('Fetching videos %s.', uuids.join(', '))
return this.searchService.searchVideos({ uuids, componentPagination: { itemsPerPage: uuids.length, currentPage: 1 } }) return this.searchService.searchVideos({
uuids,
componentPagination: { itemsPerPage: uuids.length, currentPage: 1 },
advancedSearch: this.advancedSearchForBulk
})
} }
private getChannelsInBulk (handles: string[]) { private getChannelsInBulk (handles: string[]) {
logger('Fetching channels %s.', handles.join(', ')) logger('Fetching channels %s.', handles.join(', '))
return this.searchService.searchVideoChannels({ handles, componentPagination: { itemsPerPage: handles.length, currentPage: 1 } }) return this.searchService.searchVideoChannels({
handles,
componentPagination: { itemsPerPage: handles.length, currentPage: 1 },
advancedSearch: this.advancedSearchForBulk
})
} }
private getPlaylistsInBulk (uuids: string[]) { private getPlaylistsInBulk (uuids: string[]) {
logger('Fetching playlists %s.', uuids.join(', ')) logger('Fetching playlists %s.', uuids.join(', '))
return this.searchService.searchVideoPlaylists({ uuids, componentPagination: { itemsPerPage: uuids.length, currentPage: 1 } }) return this.searchService.searchVideoPlaylists({
uuids,
componentPagination: { itemsPerPage: uuids.length, currentPage: 1 },
advancedSearch: this.advancedSearchForBulk
})
} }
private buildBulkObservableObject <P extends number | string, R> (bulkGet: (params: P[]) => Observable<R>) { private buildBulkObservableObject <P extends number | string, R> (bulkGet: (params: P[]) => Observable<R>) {