aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/server-commands
diff options
context:
space:
mode:
Diffstat (limited to 'shared/server-commands')
-rw-r--r--shared/server-commands/server/config-command.ts8
-rw-r--r--shared/server-commands/server/servers-command.ts2
-rw-r--r--shared/server-commands/videos/videos-command.ts10
3 files changed, 10 insertions, 10 deletions
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 {
131 } 131 }
132 132
133 // TODO: convert args to object 133 // TODO: convert args to object
134 enableTranscoding (webtorrent = true, hls = true, with0p = false) { 134 enableTranscoding (webVideo = true, hls = true, with0p = false) {
135 return this.updateExistingSubConfig({ 135 return this.updateExistingSubConfig({
136 newConfig: { 136 newConfig: {
137 transcoding: { 137 transcoding: {
@@ -143,7 +143,7 @@ export class ConfigCommand extends AbstractCommand {
143 resolutions: ConfigCommand.getCustomConfigResolutions(true, with0p), 143 resolutions: ConfigCommand.getCustomConfigResolutions(true, with0p),
144 144
145 webtorrent: { 145 webtorrent: {
146 enabled: webtorrent 146 enabled: webVideo
147 }, 147 },
148 hls: { 148 hls: {
149 enabled: hls 149 enabled: hls
@@ -154,7 +154,7 @@ export class ConfigCommand extends AbstractCommand {
154 } 154 }
155 155
156 // TODO: convert args to object 156 // TODO: convert args to object
157 enableMinimumTranscoding (webtorrent = true, hls = true) { 157 enableMinimumTranscoding (webVideo = true, hls = true) {
158 return this.updateExistingSubConfig({ 158 return this.updateExistingSubConfig({
159 newConfig: { 159 newConfig: {
160 transcoding: { 160 transcoding: {
@@ -170,7 +170,7 @@ export class ConfigCommand extends AbstractCommand {
170 }, 170 },
171 171
172 webtorrent: { 172 webtorrent: {
173 enabled: webtorrent 173 enabled: webVideo
174 }, 174 },
175 hls: { 175 hls: {
176 enabled: hls 176 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 {
77 return join(root(), 'test' + this.server.internalServerNumber, directory) 77 return join(root(), 'test' + this.server.internalServerNumber, directory)
78 } 78 }
79 79
80 buildWebTorrentFilePath (fileUrl: string) { 80 buildWebVideoFilePath (fileUrl: string) {
81 return this.buildDirectory(join('videos', basename(fileUrl))) 81 return this.buildDirectory(join('videos', basename(fileUrl)))
82 } 82 }
83 83
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 {
686 }) 686 })
687 } 687 }
688 688
689 removeAllWebTorrentFiles (options: OverrideCommandOptions & { 689 removeAllWebVideoFiles (options: OverrideCommandOptions & {
690 videoId: number | string 690 videoId: number | string
691 }) { 691 }) {
692 const path = '/api/v1/videos/' + options.videoId + '/webtorrent' 692 const path = '/api/v1/videos/' + options.videoId + '/web-videos'
693 693
694 return this.deleteRequest({ 694 return this.deleteRequest({
695 ...options, 695 ...options,
@@ -700,11 +700,11 @@ export class VideosCommand extends AbstractCommand {
700 }) 700 })
701 } 701 }
702 702
703 removeWebTorrentFile (options: OverrideCommandOptions & { 703 removeWebVideoFile (options: OverrideCommandOptions & {
704 videoId: number | string 704 videoId: number | string
705 fileId: number 705 fileId: number
706 }) { 706 }) {
707 const path = '/api/v1/videos/' + options.videoId + '/webtorrent/' + options.fileId 707 const path = '/api/v1/videos/' + options.videoId + '/web-videos/' + options.fileId
708 708
709 return this.deleteRequest({ 709 return this.deleteRequest({
710 ...options, 710 ...options,
@@ -717,7 +717,7 @@ export class VideosCommand extends AbstractCommand {
717 717
718 runTranscoding (options: OverrideCommandOptions & { 718 runTranscoding (options: OverrideCommandOptions & {
719 videoId: number | string 719 videoId: number | string
720 transcodingType: 'hls' | 'webtorrent' 720 transcodingType: 'hls' | 'webtorrent' | 'web-video'
721 }) { 721 }) {
722 const path = '/api/v1/videos/' + options.videoId + '/transcoding' 722 const path = '/api/v1/videos/' + options.videoId + '/transcoding'
723 723