Merge pull request #225 from waifuvault/add-video-thumbnails

enable thumbnails for videos
waifuvault · Jan 30, 2025 · 2c62233 · 2c62233
2 parents e36ed98 + 8dbef9c
commit 2c62233
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,7 +67,9 @@
     "express": "^4.21.2",
     "express-rate-limit": "^7.5.0",
     "express-session": "^1.18.1",
+    "ffmpeg-static": "^5.2.0",
     "file-type": "^20.0.0",
+    "fluent-ffmpeg": "^2.1.3",
     "helmet": "^8.0.0",
     "http-status-codes": "^2.3.0",
     "is-localhost-ip": "^2.0.0",
@@ -100,6 +102,7 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
     "@types/express-session": "^1.18.1",
+    "@types/fluent-ffmpeg": "^2.1.27",
     "@types/jsdom": "^21.1.7",
     "@types/method-override": "^3.0.0",
     "@types/multer": "^1.4.12",

diff --git a/src/model/dto/PublicAlbumDto.ts b/src/model/dto/PublicAlbumDto.ts
@@ -93,10 +93,16 @@ export class PublicAlbumDto {
     }
 
     private static getThumbnail(album: AlbumModel, file: FileUploadModel): string | null {
-        if (!FileUtils.isImage(file) || file.fileProtectionLevel !== "None") {
+        if (!PublicAlbumDto.isValidForThumbnail(file)) {
             return null;
         }
         const baseUrl = constant(GlobalEnv.BASE_URL) as string;
         return `${baseUrl}/rest/album/operations/${album.publicToken}/thumbnail?imageId=${file.id}`;
     }
+
+    private static isValidForThumbnail(file: FileUploadModel): boolean {
+        return (
+            (FileUtils.isImage(file) || FileUtils.isVideoSupportedByFfmpeg(file)) && file.fileProtectionLevel === "None"
+        );
+    }
 }