From d324756edb836672f12284cd18e642a658b273d8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 3 Nov 2021 11:32:41 +0100 Subject: Add ability to filter by file type --- .../+admin/overview/videos/video-admin.service.ts | 36 ++++++++++++++++++++-- .../overview/videos/video-list.component.html | 6 ++-- .../+admin/overview/videos/video-list.component.ts | 12 +++++--- 3 files changed, 44 insertions(+), 10 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/overview/videos/video-admin.service.ts b/client/src/app/+admin/overview/videos/video-admin.service.ts index d0854a2dc..b90fe22d8 100644 --- a/client/src/app/+admin/overview/videos/video-admin.service.ts +++ b/client/src/app/+admin/overview/videos/video-admin.service.ts @@ -45,11 +45,33 @@ export class VideoAdminService { children: [ { queryParams: { search: 'isLive:false' }, - label: $localize`VOD videos` + label: $localize`VOD` }, { queryParams: { search: 'isLive:true' }, - label: $localize`Live videos` + label: $localize`Live` + } + ] + }, + + { + title: $localize`Video files`, + children: [ + { + queryParams: { search: 'webtorrent:true' }, + label: $localize`With WebTorrent` + }, + { + queryParams: { search: 'webtorrent:false' }, + label: $localize`Without WebTorrent` + }, + { + queryParams: { search: 'hls:true' }, + label: $localize`With HLS` + }, + { + queryParams: { search: 'hls:false' }, + label: $localize`Without HLS` } ] }, @@ -69,7 +91,7 @@ export class VideoAdminService { }, { - title: $localize`Include/Exclude`, + title: $localize`Exclude`, children: [ { queryParams: { search: 'excludeMuted' }, @@ -94,6 +116,14 @@ export class VideoAdminService { prefix: 'isLocal:', isBoolean: true }, + hasHLSFiles: { + prefix: 'hls:', + isBoolean: true + }, + hasWebtorrentFiles: { + prefix: 'webtorrent:', + isBoolean: true + }, isLive: { prefix: 'isLive:', isBoolean: true diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html index 67b554aaf..134f64632 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.html +++ b/client/src/app/+admin/overview/videos/video-list.component.html @@ -66,11 +66,11 @@ - {{ video.privacy.label }} + {{ video.privacy.label }} NSFW - {{ video.state.label }} + {{ video.state.label }} Account muted Server muted @@ -83,7 +83,7 @@ WebTorrent Live - {{ getFilesSize(video) | bytes: 1 }} + {{ getFilesSize(video) | bytes: 1 }} diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts index 8a15e8426..635552cf5 100644 --- a/client/src/app/+admin/overview/videos/video-list.component.ts +++ b/client/src/app/+admin/overview/videos/video-list.component.ts @@ -85,14 +85,14 @@ export class VideoListComponent extends RestTable implements OnInit { this.reloadData() } - getPrivacyBadgeClass (privacy: VideoPrivacy) { - if (privacy === VideoPrivacy.PUBLIC) return 'badge-blue' + getPrivacyBadgeClass (video: Video) { + if (video.privacy.id === VideoPrivacy.PUBLIC) return 'badge-blue' return 'badge-yellow' } - isUnpublished (state: VideoState) { - return state !== VideoState.LIVE_ENDED && state !== VideoState.PUBLISHED + isUnpublished (video: Video) { + return video.state.id !== VideoState.LIVE_ENDED && video.state.id !== VideoState.PUBLISHED } isAccountBlocked (video: Video) { @@ -107,6 +107,10 @@ export class VideoListComponent extends RestTable implements OnInit { return video.blacklisted } + isImport (video: Video) { + return video.state.id === VideoState.TO_IMPORT + } + isHLS (video: Video) { const p = video.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) if (!p) return false -- cgit v1.2.3