From 784e2ad5c34bcfef36a3f69e9e9acd7cbb3d6428 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jul 2023 09:21:13 +0200 Subject: Prefer web videos in favour of webtorrent --- server/controllers/api/runners/jobs-files.ts | 4 ++-- server/controllers/api/users/me.ts | 9 ++------ server/controllers/api/videos/files.ts | 34 +++++++++++++++------------- 3 files changed, 22 insertions(+), 25 deletions(-) (limited to 'server/controllers/api') diff --git a/server/controllers/api/runners/jobs-files.ts b/server/controllers/api/runners/jobs-files.ts index 4e69fb902..cb4eff570 100644 --- a/server/controllers/api/runners/jobs-files.ts +++ b/server/controllers/api/runners/jobs-files.ts @@ -1,6 +1,6 @@ import express from 'express' import { logger, loggerTagsFactory } from '@server/helpers/logger' -import { proxifyHLS, proxifyWebTorrentFile } from '@server/lib/object-storage' +import { proxifyHLS, proxifyWebVideoFile } from '@server/lib/object-storage' import { VideoPathManager } from '@server/lib/video-path-manager' import { getStudioTaskFilePath } from '@server/lib/video-studio' import { apiRateLimiter, asyncMiddleware } from '@server/middlewares' @@ -70,7 +70,7 @@ async function getMaxQualityVideoFile (req: express.Request, res: express.Respon } // Web video - return proxifyWebTorrentFile({ + return proxifyWebVideoFile({ req, res, filename: file.filename diff --git a/server/controllers/api/users/me.ts b/server/controllers/api/users/me.ts index 218091d91..4753308e8 100644 --- a/server/controllers/api/users/me.ts +++ b/server/controllers/api/users/me.ts @@ -213,19 +213,14 @@ async function updateMe (req: express.Request, res: express.Response) { 'noInstanceConfigWarningModal', 'noAccountSetupWarningModal', 'noWelcomeModal', - 'emailPublic' + 'emailPublic', + 'p2pEnabled' ] for (const key of keysToUpdate) { if (body[key] !== undefined) user.set(key, body[key]) } - if (body.p2pEnabled !== undefined) { - user.set('p2pEnabled', body.p2pEnabled) - } else if (body.webTorrentEnabled !== undefined) { // FIXME: deprecated in 4.1 - user.set('p2pEnabled', body.webTorrentEnabled) - } - if (body.email !== undefined) { if (CONFIG.SIGNUP.REQUIRES_EMAIL_VERIFICATION) { user.pendingEmail = body.email diff --git a/server/controllers/api/videos/files.ts b/server/controllers/api/videos/files.ts index 6d9c0b843..67b60ff63 100644 --- a/server/controllers/api/videos/files.ts +++ b/server/controllers/api/videos/files.ts @@ -2,7 +2,8 @@ import express from 'express' import toInt from 'validator/lib/toInt' import { logger, loggerTagsFactory } from '@server/helpers/logger' import { federateVideoIfNeeded } from '@server/lib/activitypub/videos' -import { removeAllWebTorrentFiles, removeHLSFile, removeHLSPlaylist, removeWebTorrentFile } from '@server/lib/video-file' +import { updatePlaylistAfterFileChange } from '@server/lib/hls' +import { removeAllWebVideoFiles, removeHLSFile, removeHLSPlaylist, removeWebVideoFile } from '@server/lib/video-file' import { VideoFileModel } from '@server/models/video/video-file' import { HttpStatusCode, UserRight } from '@shared/models' import { @@ -12,11 +13,10 @@ import { videoFileMetadataGetValidator, videoFilesDeleteHLSFileValidator, videoFilesDeleteHLSValidator, - videoFilesDeleteWebTorrentFileValidator, - videoFilesDeleteWebTorrentValidator, + videoFilesDeleteWebVideoFileValidator, + videoFilesDeleteWebVideoValidator, videosGetValidator } from '../../../middlewares' -import { updatePlaylistAfterFileChange } from '@server/lib/hls' const lTags = loggerTagsFactory('api', 'video') const filesRouter = express.Router() @@ -40,17 +40,19 @@ filesRouter.delete('/:id/hls/:videoFileId', asyncMiddleware(removeHLSFileController) ) -filesRouter.delete('/:id/webtorrent', +filesRouter.delete( + [ '/:id/webtorrent', '/:id/web-videos' ], // TODO: remove webtorrent in V7 authenticate, ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteWebTorrentValidator), - asyncMiddleware(removeAllWebTorrentFilesController) + asyncMiddleware(videoFilesDeleteWebVideoValidator), + asyncMiddleware(removeAllWebVideoFilesController) ) -filesRouter.delete('/:id/webtorrent/:videoFileId', +filesRouter.delete( + [ '/:id/webtorrent/:videoFileId', '/:id/web-videos/:videoFileId' ], // TODO: remove webtorrent in V7 authenticate, ensureUserHasRight(UserRight.MANAGE_VIDEO_FILES), - asyncMiddleware(videoFilesDeleteWebTorrentFileValidator), - asyncMiddleware(removeWebTorrentFileController) + asyncMiddleware(videoFilesDeleteWebVideoFileValidator), + asyncMiddleware(removeWebVideoFileController) ) // --------------------------------------------------------------------------- @@ -96,24 +98,24 @@ async function removeHLSFileController (req: express.Request, res: express.Respo // --------------------------------------------------------------------------- -async function removeAllWebTorrentFilesController (req: express.Request, res: express.Response) { +async function removeAllWebVideoFilesController (req: express.Request, res: express.Response) { const video = res.locals.videoAll - logger.info('Deleting WebTorrent files of %s.', video.url, lTags(video.uuid)) + logger.info('Deleting Web Video files of %s.', video.url, lTags(video.uuid)) - await removeAllWebTorrentFiles(video) + await removeAllWebVideoFiles(video) await federateVideoIfNeeded(video, false, undefined) return res.sendStatus(HttpStatusCode.NO_CONTENT_204) } -async function removeWebTorrentFileController (req: express.Request, res: express.Response) { +async function removeWebVideoFileController (req: express.Request, res: express.Response) { const video = res.locals.videoAll const videoFileId = +req.params.videoFileId - logger.info('Deleting WebTorrent file %d of %s.', videoFileId, video.url, lTags(video.uuid)) + logger.info('Deleting Web Video file %d of %s.', videoFileId, video.url, lTags(video.uuid)) - await removeWebTorrentFile(video, videoFileId) + await removeWebVideoFile(video, videoFileId) await federateVideoIfNeeded(video, false, undefined) return res.sendStatus(HttpStatusCode.NO_CONTENT_204) -- cgit v1.2.3