Prefer web videos in favour of webtorrent

8 files changed, 20 insertions, 22 deletions

diff --git a/shared/models/search/videos-common-query.model.ts b/shared/models/search/videos-common-query.model.ts
index da479c928..2c52ca8cf 100644
--- a/shared/models/search/videos-common-query.model.ts
+++ b/shared/models/search/videos-common-query.model.ts
@@ -30,7 +30,9 @@ export interface VideosCommonQuery {
   tagsAllOf?: string[]
 
   hasHLSFiles?: boolean
-  hasWebtorrentFiles?: boolean
+
+  hasWebtorrentFiles?: boolean // TODO: remove in v7
+  hasWebVideoFiles?: boolean
 
   skipCount?: boolean
 
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index 9c40079fb..c14806dab 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -148,17 +148,17 @@ export interface HLSTranscodingPayload extends BaseTranscodingPayload {
   fps: number
   copyCodecs: boolean
 
-  deleteWebTorrentFiles: boolean
+  deleteWebVideoFiles: boolean
 }
 
-export interface NewWebTorrentResolutionTranscodingPayload extends BaseTranscodingPayload {
-  type: 'new-resolution-to-webtorrent'
+export interface NewWebVideoResolutionTranscodingPayload extends BaseTranscodingPayload {
+  type: 'new-resolution-to-web-video'
   resolution: VideoResolution
   fps: number
 }
 
 export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
-  type: 'merge-audio-to-webtorrent'
+  type: 'merge-audio-to-web-video'
 
   resolution: VideoResolution
   fps: number
@@ -167,7 +167,7 @@ export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {
 }
 
 export interface OptimizeTranscodingPayload extends BaseTranscodingPayload {
-  type: 'optimize-to-webtorrent'
+  type: 'optimize-to-web-video'
 
   quickTranscode: boolean
 
@@ -176,7 +176,7 @@ export interface OptimizeTranscodingPayload extends BaseTranscodingPayload {
 
 export type VideoTranscodingPayload =
   HLSTranscodingPayload
-  | NewWebTorrentResolutionTranscodingPayload
+  | NewWebVideoResolutionTranscodingPayload
   | OptimizeTranscodingPayload
   | MergeAudioTranscodingPayload
 
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts
index f3cceb5f2..c1d5ffba4 100644
--- a/shared/models/users/user-update-me.model.ts
+++ b/shared/models/users/user-update-me.model.ts
@@ -5,8 +5,6 @@ export interface UserUpdateMe {
   description?: string
   nsfwPolicy?: NSFWPolicyType
 
-  // FIXME: deprecated in favour of p2pEnabled in 4.1
-  webTorrentEnabled?: boolean
   p2pEnabled?: boolean
 
   autoPlayVideo?: boolean
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index 0761c1e32..9de4118b4 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -22,8 +22,6 @@ export interface User {
   autoPlayNextVideo: boolean
   autoPlayNextVideoPlaylist: boolean
 
-  // @deprecated in favour of p2pEnabled
-  webTorrentEnabled: boolean
   p2pEnabled: boolean
 
   videosHistoryEnabled: boolean
diff --git a/shared/models/videos/transcoding/video-transcoding-create.model.ts b/shared/models/videos/transcoding/video-transcoding-create.model.ts
index aeb393e57..c6e756a0a 100644
--- a/shared/models/videos/transcoding/video-transcoding-create.model.ts
+++ b/shared/models/videos/transcoding/video-transcoding-create.model.ts
@@ -1,3 +1,3 @@
 export interface VideoTranscodingCreate {
-  transcodingType: 'hls' | 'webtorrent'
+  transcodingType: 'hls' | 'webtorrent' | 'web-video' // TODO: remove webtorrent in v7
 }
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts
index 114db8091..00dc8e11c 100644
--- a/shared/server-commands/server/config-command.ts
+++ b/shared/server-commands/server/config-command.ts
@@ -131,7 +131,7 @@ export class ConfigCommand extends AbstractCommand {
   }
 
   // TODO: convert args to object
-  enableTranscoding (webtorrent = true, hls = true, with0p = false) {
+  enableTranscoding (webVideo = true, hls = true, with0p = false) {
     return this.updateExistingSubConfig({
       newConfig: {
         transcoding: {
@@ -143,7 +143,7 @@ export class ConfigCommand extends AbstractCommand {
           resolutions: ConfigCommand.getCustomConfigResolutions(true, with0p),
 
           webtorrent: {
-            enabled: webtorrent
+            enabled: webVideo
           },
           hls: {
             enabled: hls
@@ -154,7 +154,7 @@ export class ConfigCommand extends AbstractCommand {
   }
 
   // TODO: convert args to object
-  enableMinimumTranscoding (webtorrent = true, hls = true) {
+  enableMinimumTranscoding (webVideo = true, hls = true) {
     return this.updateExistingSubConfig({
       newConfig: {
         transcoding: {
@@ -170,7 +170,7 @@ export class ConfigCommand extends AbstractCommand {
           },
 
           webtorrent: {
-            enabled: webtorrent
+            enabled: webVideo
           },
           hls: {
             enabled: hls
diff --git a/shared/server-commands/server/servers-command.ts b/shared/server-commands/server/servers-command.ts
index 19645cb93..4e66a900c 100644
--- a/shared/server-commands/server/servers-command.ts
+++ b/shared/server-commands/server/servers-command.ts
@@ -77,7 +77,7 @@ export class ServersCommand extends AbstractCommand {
     return join(root(), 'test' + this.server.internalServerNumber, directory)
   }
 
-  buildWebTorrentFilePath (fileUrl: string) {
+  buildWebVideoFilePath (fileUrl: string) {
     return this.buildDirectory(join('videos', basename(fileUrl)))
   }
 
diff --git a/shared/server-commands/videos/videos-command.ts b/shared/server-commands/videos/videos-command.ts
index 93ca623e1..9602fa7da 100644
--- a/shared/server-commands/videos/videos-command.ts
+++ b/shared/server-commands/videos/videos-command.ts
@@ -686,10 +686,10 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
-  removeAllWebTorrentFiles (options: OverrideCommandOptions & {
+  removeAllWebVideoFiles (options: OverrideCommandOptions & {
     videoId: number | string
   }) {
-    const path = '/api/v1/videos/' + options.videoId + '/webtorrent'
+    const path = '/api/v1/videos/' + options.videoId + '/web-videos'
 
     return this.deleteRequest({
       ...options,
@@ -700,11 +700,11 @@ export class VideosCommand extends AbstractCommand {
     })
   }
 
-  removeWebTorrentFile (options: OverrideCommandOptions & {
+  removeWebVideoFile (options: OverrideCommandOptions & {
     videoId: number | string
     fileId: number
   }) {
-    const path = '/api/v1/videos/' + options.videoId + '/webtorrent/' + options.fileId
+    const path = '/api/v1/videos/' + options.videoId + '/web-videos/' + options.fileId
 
     return this.deleteRequest({
       ...options,
@@ -717,7 +717,7 @@ export class VideosCommand extends AbstractCommand {
 
   runTranscoding (options: OverrideCommandOptions & {
     videoId: number | string
-    transcodingType: 'hls' | 'webtorrent'
+    transcodingType: 'hls' | 'webtorrent' | 'web-video'
   }) {
     const path = '/api/v1/videos/' + options.videoId + '/transcoding'