From 8c50e3e80e97d0855792000722bd7f97093760ae Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Mon, 31 Mar 2025 10:17:57 -0400
Subject: [PATCH] feat(server): consider `JpgFromRaw2` tag for embedded
 previews (#17123)

* add jpgfromraw2

* unused catch
---
 server/src/repositories/media.repository.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/src/repositories/media.repository.ts b/server/src/repositories/media.repository.ts
index 483bd3fd90..eb43b4335b 100644
--- a/server/src/repositories/media.repository.ts
+++ b/server/src/repositories/media.repository.ts
@@ -43,14 +43,18 @@ export class MediaRepository {
 
   async extract(input: string, output: string): Promise<boolean> {
     try {
-      await exiftool.extractJpgFromRaw(input, output);
-    } catch (error: any) {
-      this.logger.debug('Could not extract JPEG from image, trying preview', error.message);
+      await exiftool.extractBinaryTag('JpgFromRaw2', input, output);
+    } catch {
       try {
-        await exiftool.extractPreview(input, output);
+        await exiftool.extractJpgFromRaw(input, output);
       } catch (error: any) {
-        this.logger.debug('Could not extract preview from image', error.message);
-        return false;
+        this.logger.debug('Could not extract JPEG from image, trying preview', error.message);
+        try {
+          await exiftool.extractPreview(input, output);
+        } catch (error: any) {
+          this.logger.debug('Could not extract preview from image', error.message);
+          return false;
+        }
       }
     }