From 336f7326336088638d76b4d035872ac1985cff6b Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 15 Dec 2022 14:25:47 -0700 Subject: [PATCH] Linking to /download for files that should be downloaded. --- app/src/components/Files.js | 17 +++++++++-------- app/src/components/VideoPlayer.js | 3 ++- nginx.conf | 23 +++++++++++++++++++---- nginx.dev.conf | 17 ++++++++++++++++- 4 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/src/components/Files.js b/app/src/components/Files.js index dfa63610..10b64d0c 100644 --- a/app/src/components/Files.js +++ b/app/src/components/Files.js @@ -147,13 +147,13 @@ export function Files() { function EbookCard({file}) { const {s} = useContext(ThemeContext); - const url = `/media/${encodeURIComponent(file.path)}`; + const downloadUrl = `/download/${encodeURIComponent(file.path)}`; let {ebook, suffix} = file; const coverSrc = ebook && ebook.cover_path ? `/media/${encodeURIComponent(ebook.cover_path)}` : null; let cover = ; if (coverSrc) { - cover = ; + cover = ; } suffix = suffix ? _.trimStart(suffix, '.').toUpperCase() : null; @@ -164,7 +164,7 @@ function EbookCard({file}) { - {ebook ? ebook.title : file.title} + {ebook ? ebook.title : file.title} @@ -217,21 +217,22 @@ function ImageCard({file}) { function FileCard({file}) { const {s} = useContext(ThemeContext); + const isEbookType = file.mimetype && ( + file.mimetype.startsWith('application/epub') || file.mimetype.startsWith('application/x-mobipocket-ebook') + ); + if (file.model === 'video' && file['video']) { return ; } else if (file.model === 'archive' && file['archive']) { return ; } else if (file.mimetype && file.mimetype.startsWith('image/')) { return ; - } else if (file.mimetype && ( - file.mimetype.startsWith('application/epub') || file.mimetype.startsWith('application/x-mobipocket-ebook') - )) { + } else if (isEbookType) { return ; } - const url = `/media/${encodeURIComponent(file.path)}`; + const url = `/download/${encodeURIComponent(file.path)}`; const color = mimetypeColor(file.mimetype); - const size = file.size !== null && file.size !== undefined ? humanFileSize(file.size) : null; return diff --git a/app/src/components/VideoPlayer.js b/app/src/components/VideoPlayer.js index 0af3d942..cf53d7f9 100644 --- a/app/src/components/VideoPlayer.js +++ b/app/src/components/VideoPlayer.js @@ -70,6 +70,7 @@ function VideoPage({videoFile, prevFile, nextFile, setFavorite, ...props}) { } let videoUrl = `${MEDIA_PATH}/${encodeURIComponent(video.video_path)}`; + let downloadUrl = `/download/${encodeURIComponent(video.video_path)}`; let posterUrl = video.poster_path ? `${MEDIA_PATH}/${encodeURIComponent(video.poster_path)}` : null; let captionsUrl = video.caption_path ? `${MEDIA_PATH}/${encodeURIComponent(video.caption_path)}` : null; @@ -184,7 +185,7 @@ function VideoPage({videoFile, prevFile, nextFile, setFavorite, ...props}) {

{favorite_button} - +