aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-09-09 09:31:50 +0200
committerChocobozzz <me@florianbigard.com>2021-09-09 09:35:30 +0200
commit790c2837ddcb443c0f1ea6adcdcb101dfe159d01 (patch)
tree2f1c957363e1c00475a7ab7c75c09efe61fba004 /server/controllers
parentb4c945f3c727d1ce5de5a4af69d6dfa14c83468e (diff)
downloadPeerTube-790c2837ddcb443c0f1ea6adcdcb101dfe159d01.tar.gz
PeerTube-790c2837ddcb443c0f1ea6adcdcb101dfe159d01.tar.zst
PeerTube-790c2837ddcb443c0f1ea6adcdcb101dfe159d01.zip
Fix silent 500 after resumable upload
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/videos/upload.ts5
1 files changed, 1 insertions, 4 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'
2import { move } from 'fs-extra' 2import { move } from 'fs-extra'
3import { basename } from 'path' 3import { basename } from 'path'
4import { getLowercaseExtension } from '@server/helpers/core-utils' 4import { getLowercaseExtension } from '@server/helpers/core-utils'
5import { deleteResumableUploadMetaFile, getResumableUploadPath } from '@server/helpers/upload' 5import { getResumableUploadPath } from '@server/helpers/upload'
6import { uuidToShort } from '@server/helpers/uuid' 6import { uuidToShort } from '@server/helpers/uuid'
7import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' 7import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
8import { getLocalVideoActivityPubUrl } from '@server/lib/activitypub/url' 8import { 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