X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Foverview%2Fvideos%2Fvideo-list.component.ts;h=3c21adb44c8dd8bc346aff8b4cce4cd1ec7927cc;hb=b46cf4b920984492df598c1b61179acfc7f6f22e;hp=31bf1707b6cb1196a867e8da1392782b6520dfb0;hpb=231ff4af3bdb864d6bc66e487b12275e5f1fb44f;p=github%2FChocobozzz%2FPeerTube.git

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 31bf1707b..3c21adb44 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -1,12 +1,14 @@
 import { SortMeta } from 'primeng/api'
 import { finalize } from 'rxjs/operators'
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
 import { DropdownAction, Video, VideoService } from '@app/shared/shared-main'
+import { VideoBlockComponent, VideoBlockService } from '@app/shared/shared-moderation'
 import { VideoActionsDisplayType } from '@app/shared/shared-video-miniature'
 import { UserRight, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models'
+import { VideoAdminService } from './video-admin.service'
 
 @Component({
   selector: 'my-video-list',
@@ -14,6 +16,8 @@ import { UserRight, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from
   styleUrls: [ './video-list.component.scss' ]
 })
 export class VideoListComponent extends RestTable implements OnInit {
+  @ViewChild('videoBlockModal') videoBlockModal: VideoBlockComponent
+
   videos: Video[] = []
 
   totalRecords = 0
@@ -35,7 +39,8 @@ export class VideoListComponent extends RestTable implements OnInit {
     report: false,
     duplicate: true,
     mute: true,
-    liveInfo: false
+    liveInfo: false,
+    removeFiles: true
   }
 
   loading = true
@@ -46,7 +51,9 @@ export class VideoListComponent extends RestTable implements OnInit {
     private confirmService: ConfirmService,
     private auth: AuthService,
     private notifier: Notifier,
-    private videoService: VideoService
+    private videoService: VideoService,
+    private videoAdminService: VideoAdminService,
+    private videoBlockService: VideoBlockService
   ) {
     super()
   }
@@ -58,14 +65,41 @@ export class VideoListComponent extends RestTable implements OnInit {
   ngOnInit () {
     this.initialize()
 
-    this.inputFilters = this.videoService.buildAdminInputFilter()
+    this.inputFilters = this.videoAdminService.buildAdminInputFilter()
 
     this.bulkVideoActions = [
       [
         {
           label: $localize`Delete`,
           handler: videos => this.removeVideos(videos),
-          isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO)
+          isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO),
+          iconName: 'delete'
+        },
+        {
+          label: $localize`Block`,
+          handler: videos => this.videoBlockModal.show(videos),
+          isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) && videos.every(v => !v.blacklisted),
+          iconName: 'no'
+        },
+        {
+          label: $localize`Unblock`,
+          handler: videos => this.unblockVideos(videos),
+          isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) && videos.every(v => v.blacklisted),
+          iconName: 'undo'
+        }
+      ],
+      [
+        {
+          label: $localize`Delete HLS files`,
+          handler: videos => this.removeVideoFiles(videos, 'hls'),
+          isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_FILES) && videos.every(v => v.hasHLS() && v.hasWebTorrent()),
+          iconName: 'delete'
+        },
+        {
+          label: $localize`Delete WebTorrent files`,
+          handler: videos => this.removeVideoFiles(videos, 'webtorrent'),
+          isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_FILES) && videos.every(v => v.hasHLS() && v.hasWebTorrent()),
+          iconName: 'delete'
         }
       ]
     ]
@@ -79,18 +113,14 @@ export class VideoListComponent extends RestTable implements OnInit {
     return this.selectedVideos.length !== 0
   }
 
-  onVideoRemoved () {
-    this.reloadData()
-  }
-
-  getPrivacyBadgeClass (privacy: VideoPrivacy) {
-    if (privacy === VideoPrivacy.PUBLIC) return 'badge-blue'
+  getPrivacyBadgeClass (video: Video) {
+    if (video.privacy.id === VideoPrivacy.PUBLIC) return 'badge-green'
 
     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) {
@@ -105,8 +135,15 @@ export class VideoListComponent extends RestTable implements OnInit {
     return video.blacklisted
   }
 
+  isImport (video: Video) {
+    return video.state.id === VideoState.TO_IMPORT
+  }
+
   isHLS (video: Video) {
-    return video.streamingPlaylists.some(p => p.type === VideoStreamingPlaylistType.HLS)
+    const p = video.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS)
+    if (!p) return false
+
+    return p.files.length !== 0
   }
 
   isWebTorrent (video: Video) {
@@ -123,12 +160,12 @@ export class VideoListComponent extends RestTable implements OnInit {
     return files.reduce((p, f) => p += f.size, 0)
   }
 
-  protected reloadData () {
+  reloadData () {
     this.selectedVideos = []
 
     this.loading = true
 
-    this.videoService.getAdminVideos({
+    this.videoAdminService.getAdminVideos({
       pagination: this.pagination,
       sort: this.sort,
       search: this.search
@@ -151,7 +188,38 @@ export class VideoListComponent extends RestTable implements OnInit {
     this.videoService.removeVideo(videos.map(v => v.id))
       .subscribe({
         next: () => {
-          this.notifier.success($localize`${videos.length} videos deleted.`)
+          this.notifier.success($localize`Deleted ${videos.length} videos.`)
+          this.reloadData()
+        },
+
+        error: err => this.notifier.error(err.message)
+      })
+  }
+
+  private unblockVideos (videos: Video[]) {
+    this.videoBlockService.unblockVideo(videos.map(v => v.id))
+      .subscribe({
+        next: () => {
+          this.notifier.success($localize`Unblocked ${videos.length} videos.`)
+          this.reloadData()
+        },
+
+        error: err => this.notifier.error(err.message)
+      })
+  }
+
+  private async removeVideoFiles (videos: Video[], type: 'hls' | 'webtorrent') {
+    const message = type === 'hls'
+      ? $localize`Are you sure you want to delete ${videos.length} HLS streaming playlists?`
+      : $localize`Are you sure you want to delete WebTorrent files of ${videos.length} videos?`
+
+    const res = await this.confirmService.confirm(message, $localize`Delete`)
+    if (res === false) return
+
+    this.videoService.removeVideoFiles(videos.map(v => v.id), type)
+      .subscribe({
+        next: () => {
+          this.notifier.success($localize`Files were removed.`)
           this.reloadData()
         },