From d07d2a3a36f86b42279566f4f852b39e21e211cc Mon Sep 17 00:00:00 2001 From: localhost Date: Mon, 1 Jan 2024 18:04:49 +0100 Subject: [PATCH] Revert "avoid vm running out of disk space again" This reverts commit d7efc8f8484d847ae3d2c8df08d893fc4026dc90. --- controller/websocket.js | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/controller/websocket.js b/controller/websocket.js index 684f1f1..3142707 100644 --- a/controller/websocket.js +++ b/controller/websocket.js @@ -80,22 +80,15 @@ exports.save = async (ws, req) => { } else { const file = fs.readdirSync("videos").find(f => f.includes(id)) if (file) { - try { - fs.renameSync(`./videos/${file}`, `./videos/${id}.webm`) - - ws.send('DATA - Uploading file...') - const videoUrl = await upload.uploadVideo(`./videos/${id}.webm`) - fs.unlinkSync(`./videos/${id}.webm`) + fs.renameSync(`./videos/${file}`, `./videos/${id}.webm`) + + ws.send('DATA - Uploading file...') + const videoUrl = await upload.uploadVideo(`./videos/${id}.webm`) + fs.unlinkSync(`./videos/${id}.webm`) - await websocket.createDatabaseVideo(id, videoUrl) - ws.send(`DONE - ${process.env.FRONTEND}/watch?v=${id}`) - } catch (e) { - ws.send('DATA - Server side error while processing video. Please try again.') - fs.unlinkSync(`./videos/${id}.webm`) - logger.error(e) - } - } else { - ws.send('DATA - Failed to find file video.') + await websocket.createDatabaseVideo(id, videoUrl) + + ws.send(`DONE - ${process.env.FRONTEND}/watch?v=${id}`) } await redis.del(id) @@ -196,7 +189,6 @@ exports.playlist = async (ws, req) => { ws.send(`DATA - Created video page for ${video.title}`) } catch (e) { ws.send(`DATA - Failed downloading video ${video.title}. Going to next video`) - fs.unlinkSync(`./videos/${id}.webm`) logger.error(e) } } else { @@ -295,7 +287,6 @@ exports.channel = async (ws, req) => { ws.send(`DATA - Created video page for ${video.title}`) } catch (e) { ws.send(`DATA - Failed downloading video ${video.title}. Going to next video`) - fs.unlinkSync(`./videos/${id}.webm`) logger.error(e) } } else {