From dcdf4699969d15e0ee7b61b02fff0c0ca8ad1abd Mon Sep 17 00:00:00 2001 From: Filip Borum Poulsen Date: Wed, 4 Dec 2024 19:46:13 +0100 Subject: [PATCH] Changes --- index.js | 31 +++++++++++++++++-------------- video-player.service | 6 +++--- video-player2.service | 6 +++--- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/index.js b/index.js index 1da7721..a5ae43b 100644 --- a/index.js +++ b/index.js @@ -68,21 +68,21 @@ app.get('/videos', (req, res) => { let process = null; let mayRestart = false; -// if (fs.existsSync('/tmp/video')) { -// const initialVideo = fs.readFileSync('/tmp/video'); -// startVideo(initialVideo); -// } +if (fs.existsSync('/selectedvideo')) { + const initialVideo = fs.readFileSync('/selectedvideo'); + startVideo(initialVideo); +} function startVideo(path) { process = require('child_process').spawn('ffplay', ['-fs', '-loop', '2147483647', '-hide_banner', '-loglevel', 'error', path]); - process.stdout.on('data', (data) => { - console.log(`stdout: ${data}`); - }); + // process.stdout.on('data', (data) => { + // console.log(`stdout: ${data}`); + // }); - process.stderr.on('data', (data) => { - console.error(`stderr: ${data}`); - }); + // process.stderr.on('data', (data) => { + // console.error(`stderr: ${data}`); + // }); process.on("exit", () => { if (!mayRestart) { @@ -109,7 +109,7 @@ app.post('/play', (req, res) => { video = path.join('/video/', path.basename(video)) } - fs.writeFileSync('/tmp/video', video); + fs.writeFileSync('/selectedvideo', video); startVideo(video); @@ -123,9 +123,12 @@ app.post('/upload', function (req, res) { } // The name of the input field (i.e. "sampleFile") is used to retrieve the uploaded file - const uploadPath = path.join(__dirname, '/public/videos/'); + // const uploadPath = path.join(__dirname, '/public/videos/'); + const uploadPath = "/video"; - req.files.file.mv(uploadPath + "video.mp4", function (err) { + console.log(req.files.file); + + req.files.file.mv(path.join(uploadPath, req.files.file.name), function (err) { if (err) { return res.status(500); } @@ -138,4 +141,4 @@ app.post('/upload', function (req, res) { } res.redirect('/'); -}); \ No newline at end of file +}); diff --git a/video-player.service b/video-player.service index 1a55348..fa6a14f 100644 --- a/video-player.service +++ b/video-player.service @@ -3,12 +3,12 @@ Description=Video Player After=multi-user.target [Service] -WorkingDirectory=/home/steady/video-player -ExecStart=node /home/steady/video-player/index.js +WorkingDirectory=/home/pi/video-player +ExecStart=node /home/pi/video-player/index.js Environment=DISPLAY=:0 User=1000 Group=1000 Restart=always [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/video-player2.service b/video-player2.service index f419363..20a864f 100644 --- a/video-player2.service +++ b/video-player2.service @@ -2,10 +2,10 @@ Description=Video Player [Service] -WorkingDirectory=/home/steady/video-player -ExecStart=ffplay -fs -loop 2147483647 /home/steady/video-player/public/videos/video.mp4 +WorkingDirectory=/home/pi/video-player +ExecStart=ffplay -fs -loop 2147483647 $(cat /selectedvideo) Environment=DISPLAY=:0 Environment=AUDIODEV="hw:2,0" User=1000 Group=1000 -Restart=always \ No newline at end of file +Restart=always