Fix silent 500 after resumable upload

3 files changed, 3 insertions, 12 deletions

diff --git a/server/controllers/api/videos/upload.ts b/server/controllers/api/videos/upload.ts
index 7e87df8b1..55cb9cf20 100644
--- a/server/controllers/api/videos/upload.ts
+++ b/server/controllers/api/videos/upload.ts
@@ -2,7 +2,7 @@ import express from 'express'
 import { move } from 'fs-extra'
 import { basename } from 'path'
 import { getLowercaseExtension } from '@server/helpers/core-utils'
-import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload'
+import { getResumableUploadPath } from '@server/helpers/upload'
 import { uuidToShort } from '@server/helpers/uuid'
 import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
 import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url'
@@ -130,9 +130,6 @@ export async function addVideoResumable (_req: express.Request, res: express.Res
   const videoInfo = videoPhysicalFile.metadata
   const files = { previewfile: videoInfo.previewfile }
 
-  // Don't need the meta file anymore
-  await deleteResumableUploadMetaFile(videoPhysicalFile.path)
-
   return addVideo({ res, videoPhysicalFile, videoInfo, files })
 }
 
diff --git a/server/helpers/upload.ts b/server/helpers/upload.ts
index 030a6b7d5..3cb17edd0 100644
--- a/server/helpers/upload.ts
+++ b/server/helpers/upload.ts
@@ -1,5 +1,3 @@
-import { METAFILE_EXTNAME } from '@uploadx/core'
-import { remove } from 'fs-extra'
 import { join } from 'path'
 import { RESUMABLE_UPLOAD_DIRECTORY } from '../initializers/constants'
 
@@ -9,13 +7,8 @@ function getResumableUploadPath (filename?: string) {
   return RESUMABLE_UPLOAD_DIRECTORY
 }
 
-function deleteResumableUploadMetaFile (filepath: string) {
-  return remove(filepath + METAFILE_EXTNAME)
-}
-
 // ---------------------------------------------------------------------------
 
 export {
-  getResumableUploadPath,
-  deleteResumableUploadMetaFile
+  getResumableUploadPath
 }
diff --git a/server/tests/api/videos/resumable-upload.ts b/server/tests/api/videos/resumable-upload.ts
index 857859fd3..59970aa94 100644
--- a/server/tests/api/videos/resumable-upload.ts
+++ b/server/tests/api/videos/resumable-upload.ts
@@ -113,6 +113,7 @@ describe('Test resumable upload', function () {
     it('Should correctly delete files after an upload', async function () {
       const uploadId = await prepareUpload()
       await sendChunks({ pathUploadId: uploadId })
+      await server.videos.endResumableUpload({ pathUploadId: uploadId })
 
       expect(await countResumableUploads()).to.equal(0)
     })