From 4555084a9e8dab78ba42fc54d4c190e22b69173b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20C=2E=20Rivero?= Date: Thu, 4 Jul 2019 02:54:58 -0400 Subject: [PATCH] Adding audio support #3 --- public/styles/media.css | 6 +++++- routes/views.js | 12 ++++++++++-- views/media.pug | 10 +++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/public/styles/media.css b/public/styles/media.css index 4142b7a..d189f2e 100644 --- a/public/styles/media.css +++ b/public/styles/media.css @@ -21,10 +21,14 @@ height: 90vh; } -.page video:focus{ +.page video:focus, .page audio:focus{ outline: none; } +.page audio { + width: 100%; +} + @media only screen and (max-device-width: 824px) { .page { font-size: 30px; diff --git a/routes/views.js b/routes/views.js index 9c8471c..adcebe9 100644 --- a/routes/views.js +++ b/routes/views.js @@ -29,9 +29,17 @@ router.get('/video/:dir_id/', (req, res) => { } return array; }, []); + + const fileUrl = '/api/media/' + req.params['dir_id'] + '/?subdir=' + subdir; + const mimeType = mime.lookup(fileUrl); + if(mimeType.includes("video")) + mediaType = 'video'; + else if(mimeType.includes("audio")) + mediaType = 'audio'; res.render('media', { - videoUrl: '/api/media/' + req.params['dir_id'] + '/?subdir=' + subdir, + Url: fileUrl, + type: mediaType, subtitles, title: path.basename(subdir) }); @@ -59,7 +67,7 @@ router.get('/:dir_id/', (req, res) => { const files = dirs.reduce((array, filePath) => { try { const mimeType = mime.lookup(filePath); - if (fs.statSync(filePath).isFile() && mimeType && mimeType.includes("video")) { + if (fs.statSync(filePath).isFile() && mimeType && (mimeType.includes("video") || mimeType.includes("audio"))) { array.push({ url: '/media/video/' + req.params['dir_id'] + '?subdir=' + path.join(subdir, path.basename(filePath)), name: path.basename(filePath) diff --git a/views/media.pug b/views/media.pug index bdb2743..679e43c 100644 --- a/views/media.pug +++ b/views/media.pug @@ -7,6 +7,10 @@ block styles block content div(class='page') h1= title - video(controls src=videoUrl) - each subtitle in subtitles - track(src=subtitle.url label=subtitle.label) + if type == 'video' + video(controls src=Url) + each subtitle in subtitles + track(src=subtitle.url label=subtitle.label) + else + audio(controls src=Url) + \ No newline at end of file