Add ability to search playlists

5 files changed, 110 insertions, 0 deletions

diff --git a/client/src/app/+search/shared/abstract-lazy-load.resolver.ts b/client/src/app/+search/shared/abstract-lazy-load.resolver.ts
new file mode 100644
index 000000000..31240f451
--- /dev/null
+++ b/client/src/app/+search/shared/abstract-lazy-load.resolver.ts
@@ -0,0 +1,34 @@
+import { Observable } from 'rxjs'
+import { map } from 'rxjs/operators'
+import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'
+import { ResultList } from '@shared/models/result-list.model'
+
+export abstract class AbstractLazyLoadResolver <T> implements Resolve<any> {
+  protected router: Router
+
+  resolve (route: ActivatedRouteSnapshot) {
+    const url = route.params.url
+
+    if (!url) {
+      console.error('Could not find url param.', { params: route.params })
+      return this.router.navigateByUrl('/404')
+    }
+
+    return this.finder(url)
+      .pipe(
+        map(result => {
+          if (result.data.length !== 1) {
+            console.error('Cannot find result for this URL')
+            return this.router.navigateByUrl('/404')
+          }
+
+          const redirectUrl = this.buildUrl(result.data[0])
+
+          return this.router.navigateByUrl(redirectUrl)
+        })
+      )
+  }
+
+  protected abstract finder (url: string): Observable<ResultList<T>>
+  protected abstract buildUrl (e: T): string
+}
diff --git a/client/src/app/+search/shared/channel-lazy-load.resolver.ts b/client/src/app/+search/shared/channel-lazy-load.resolver.ts
new file mode 100644
index 000000000..5e010f795
--- /dev/null
+++ b/client/src/app/+search/shared/channel-lazy-load.resolver.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core'
+import { Router } from '@angular/router'
+import { VideoChannel } from '@app/shared/shared-main'
+import { SearchService } from '@app/shared/shared-search'
+import { AbstractLazyLoadResolver } from './abstract-lazy-load.resolver'
+
+@Injectable()
+export class ChannelLazyLoadResolver extends AbstractLazyLoadResolver<VideoChannel> {
+
+  constructor (
+    protected router: Router,
+    private searchService: SearchService
+  ) {
+    super()
+  }
+
+  protected finder (url: string) {
+    return this.searchService.searchVideoChannels({ search: url })
+  }
+
+  protected buildUrl (channel: VideoChannel) {
+    return '/video-channels/' + channel.nameWithHost
+  }
+}
diff --git a/client/src/app/+search/shared/index.ts b/client/src/app/+search/shared/index.ts
new file mode 100644
index 000000000..1e68989ae
--- /dev/null
+++ b/client/src/app/+search/shared/index.ts
@@ -0,0 +1,4 @@
+export * from './abstract-lazy-load.resolver'
+export * from './channel-lazy-load.resolver'
+export * from './playlist-lazy-load.resolver'
+export * from './video-lazy-load.resolver'
diff --git a/client/src/app/+search/shared/playlist-lazy-load.resolver.ts b/client/src/app/+search/shared/playlist-lazy-load.resolver.ts
new file mode 100644
index 000000000..14ae798df
--- /dev/null
+++ b/client/src/app/+search/shared/playlist-lazy-load.resolver.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core'
+import { Router } from '@angular/router'
+import { SearchService } from '@app/shared/shared-search'
+import { VideoPlaylist } from '@app/shared/shared-video-playlist'
+import { AbstractLazyLoadResolver } from './abstract-lazy-load.resolver'
+
+@Injectable()
+export class PlaylistLazyLoadResolver extends AbstractLazyLoadResolver<VideoPlaylist> {
+
+  constructor (
+    protected router: Router,
+    private searchService: SearchService
+  ) {
+    super()
+  }
+
+  protected finder (url: string) {
+    return this.searchService.searchVideoPlaylists({ search: url })
+  }
+
+  protected buildUrl (playlist: VideoPlaylist) {
+    return '/w/p/' + playlist.uuid
+  }
+}
diff --git a/client/src/app/+search/shared/video-lazy-load.resolver.ts b/client/src/app/+search/shared/video-lazy-load.resolver.ts
new file mode 100644
index 000000000..12b5b2e82
--- /dev/null
+++ b/client/src/app/+search/shared/video-lazy-load.resolver.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core'
+import { Router } from '@angular/router'
+import { Video } from '@app/shared/shared-main'
+import { SearchService } from '@app/shared/shared-search'
+import { AbstractLazyLoadResolver } from './abstract-lazy-load.resolver'
+
+@Injectable()
+export class VideoLazyLoadResolver extends AbstractLazyLoadResolver<Video> {
+
+  constructor (
+    protected router: Router,
+    private searchService: SearchService
+  ) {
+    super()
+  }
+
+  protected finder (url: string) {
+    return this.searchService.searchVideos({ search: url })
+  }
+
+  protected buildUrl (video: Video) {
+    return '/w/' + video.uuid
+  }
+}