From 11c7a7b47ff4ba4a2d6612c24185a2b492af9c69 Mon Sep 17 00:00:00 2001 From: localhost Date: Sat, 30 Mar 2024 14:55:10 +0100 Subject: [PATCH] they're actually mp4s --- controller/websocket.js | 12 ++++++------ utils/redis.js | 4 ++-- utils/upload.js | 2 +- utils/ytdlp.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/controller/websocket.js b/controller/websocket.js index 2dab0d9..b79a85f 100644 --- a/controller/websocket.js +++ b/controller/websocket.js @@ -80,8 +80,8 @@ exports.save = async (ws, req) => { const file = fs.readdirSync("videos").find(f => f.includes(id)) if (file) { ws.send('DATA - Uploading file...') - const videoUrl = await upload.uploadVideo(`./videos/${id}.webm`) - fs.unlinkSync(`./videos/${id}.webm`) + const videoUrl = await upload.uploadVideo(`./videos/${id}.mp4`) + fs.unlinkSync(`./videos/${id}.mp4`) await websocket.createDatabaseVideo(id, videoUrl) @@ -178,9 +178,9 @@ exports.playlist = async (ws, req) => { ws.send(`DATA - Downloaded ${video.title}`) ws.send(`DATA - Uploading ${video.title}`) - const videoUrl = await upload.uploadVideo(`./videos/${id}.webm`) + const videoUrl = await upload.uploadVideo(`./videos/${id}.mp4`) ws.send(`DATA - Uploaded ${video.title}`) - fs.unlinkSync(`./videos/${id}.webm`) + fs.unlinkSync(`./videos/${id}.mp4`) await websocket.createDatabaseVideo(id, videoUrl, playlistId) ws.send(`DATA - Created video page for ${video.title}`) @@ -276,9 +276,9 @@ exports.channel = async (ws, req) => { ws.send(`DATA - Downloaded ${video.title}`) ws.send(`DATA - Uploading ${video.title}`) - const videoUrl = await upload.uploadVideo(`./videos/${id}.webm`) + const videoUrl = await upload.uploadVideo(`./videos/${id}.mp4`) ws.send(`DATA - Uploaded ${video.title}`) - fs.unlinkSync(`./videos/${id}.webm`) + fs.unlinkSync(`./videos/${id}.mp4`) await websocket.createDatabaseVideo(id, videoUrl) ws.send(`DATA - Created video page for ${video.title}`) diff --git a/utils/redis.js b/utils/redis.js index de44fbc..14694fe 100644 --- a/utils/redis.js +++ b/utils/redis.js @@ -18,9 +18,9 @@ redis.on('ready', async function () { setInterval(async () => { const files = fs.readdirSync('videos') - const webmFiles = files.filter((file) => file.endsWith('.webm')) + const webmFiles = files.filter((file) => file.endsWith('.mp4')) webmFiles.forEach(async (f) => { - const videoId = f.replace('.webm', '') + const videoId = f.replace('.mp4', '') const isActive = await redis.get(videoId) if (!isActive) { fs.unlinkSync(`./videos/${f}`) diff --git a/utils/upload.js b/utils/upload.js index e0e91b7..1d395af 100644 --- a/utils/upload.js +++ b/utils/upload.js @@ -18,7 +18,7 @@ async function uploadVideo(video) { Bucket: key.bucket, Key: video.split('/')[2], Body: videoFile, - ContentType: 'video/webm', + ContentType: 'video/mp4', }).promise() return uploaded.Location diff --git a/utils/ytdlp.js b/utils/ytdlp.js index 1b060d4..56806ef 100644 --- a/utils/ytdlp.js +++ b/utils/ytdlp.js @@ -28,7 +28,7 @@ async function downloadVideo(url, ws, id) { let prevBytes = 0 let speed = 0 const alreadyPrecentages = [] - const download = wget.download(downloadJson.url, `./videos/${id}.webm`) + const download = wget.download(downloadJson.url, `./videos/${id}.mp4`) download.on('start', fileSize => { size = fileSize