diff options
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/api/videos/upload.ts | 5 | ||||
-rw-r--r-- | server/helpers/upload.ts | 9 | ||||
-rw-r--r-- | server/tests/api/videos/resumable-upload.ts | 1 |
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' | |||
2 | import { move } from 'fs-extra' | 2 | import { move } from 'fs-extra' |
3 | import { basename } from 'path' | 3 | import { basename } from 'path' |
4 | import { getLowercaseExtension } from '@server/helpers/core-utils' | 4 | import { getLowercaseExtension } from '@server/helpers/core-utils' |
5 | import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload' | 5 | import { getResumableUploadPath } from '@server/helpers/upload' |
6 | import { uuidToShort } from '@server/helpers/uuid' | 6 | import { uuidToShort } from '@server/helpers/uuid' |
7 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' | 7 | import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' |
8 | import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' | 8 | import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' |
@@ -130,9 +130,6 @@ export async function addVideoResumable (_req: express.Request, res: express.Res | |||
130 | const videoInfo = videoPhysicalFile.metadata | 130 | const videoInfo = videoPhysicalFile.metadata |
131 | const files = { previewfile: videoInfo.previewfile } | 131 | const files = { previewfile: videoInfo.previewfile } |
132 | 132 | ||
133 | // Don't need the meta file anymore | ||
134 | await deleteResumableUploadMetaFile(videoPhysicalFile.path) | ||
135 | |||
136 | return addVideo({ res, videoPhysicalFile, videoInfo, files }) | 133 | return addVideo({ res, videoPhysicalFile, videoInfo, files }) |
137 | } | 134 | } |
138 | 135 | ||
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 @@ | |||
1 | import { METAFILE_EXTNAME } from '@uploadx/core' | ||
2 | import { remove } from 'fs-extra' | ||
3 | import { join } from 'path' | 1 | import { join } from 'path' |
4 | import { RESUMABLE_UPLOAD_DIRECTORY } from '../initializers/constants' | 2 | import { RESUMABLE_UPLOAD_DIRECTORY } from '../initializers/constants' |
5 | 3 | ||
@@ -9,13 +7,8 @@ function getResumableUploadPath (filename?: string) { | |||
9 | return RESUMABLE_UPLOAD_DIRECTORY | 7 | return RESUMABLE_UPLOAD_DIRECTORY |
10 | } | 8 | } |
11 | 9 | ||
12 | function deleteResumableUploadMetaFile (filepath: string) { | ||
13 | return remove(filepath + METAFILE_EXTNAME) | ||
14 | } | ||
15 | |||
16 | // --------------------------------------------------------------------------- | 10 | // --------------------------------------------------------------------------- |
17 | 11 | ||
18 | export { | 12 | export { |
19 | getResumableUploadPath, | 13 | getResumableUploadPath |
20 | deleteResumableUploadMetaFile | ||
21 | } | 14 | } |
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 () { | |||
113 | it('Should correctly delete files after an upload', async function () { | 113 | it('Should correctly delete files after an upload', async function () { |
114 | const uploadId = await prepareUpload() | 114 | const uploadId = await prepareUpload() |
115 | await sendChunks({ pathUploadId: uploadId }) | 115 | await sendChunks({ pathUploadId: uploadId }) |
116 | await server.videos.endResumableUpload({ pathUploadId: uploadId }) | ||
116 | 117 | ||
117 | expect(await countResumableUploads()).to.equal(0) | 118 | expect(await countResumableUploads()).to.equal(0) |
118 | }) | 119 | }) |