Merge pull request #163 from waifuvault/fix-hidden-filenames

fix bug for hidden filenames
waifuvault · Jun 27, 2024 · 24675d6 · 24675d6
2 parents 10cf7bf + b65b2ea
commit 24675d6
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/public/secure/files.ejs b/src/public/secure/files.ejs
@@ -185,15 +185,19 @@
             function fileEmbedRender() {
                 return function(data, type, row) {
                     const url = row.url;
+                    const ext = url.match(/\.(mp4|ogg|webm)$/)?.[1];
+                    let filename = data || `${row.fileName}`; // filename here is originalFileName. but hidden files do not have it, so get the filename on disk
+                    if(ext && !data){
+                        filename+=`.${ext}`;
+                    }
                     if(url.match(/\.(jpeg|jpg|gif|png|webp)$/) != null){
-                        return `<span class="text-primary" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="<img src='${url}' />">${data}</span>`;
+                        return `<span class="text-primary" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="<img src='${url}' />">${filename}</span>`;
                     }else if(url.match(/\.(mp4|ogg|webm)$/) != null){
-                        const ext = url.match(/\.(mp4|ogg|webm)$/)[1];
                         let type = `video/${ext}`;
                         const videoTag = `<video width='320' height='240' autoplay><source src='${url}' type='${type}'></video>`;
-                        return `<span class="text-primary" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="${videoTag}">${data}</span>`;
+                        return `<span class="text-primary" data-bs-toggle="tooltip" data-bs-html="true" data-bs-title="${videoTag}">${filename}</span>`;
                     }
-                    return `<span>${data}</span>`;
+                    return `<span>${filename}</span>`;
                 };
             }