simple-photo-gallery 2.0.11-rc.6 → 2.0.11-rc.8

package/dist/index.js

@@ -8,8 +8,8 @@ import path7 from 'path';
 import { Buffer } from 'buffer';
 import sharp2 from 'sharp';
 import { encode } from 'blurhash';
-import ExifReader from 'exifreader';
 import { GalleryDataSchema, GalleryDataDeprecatedSchema } from '@simple-photo-gallery/common';
+import ExifReader from 'exifreader';
 import ffprobe from 'node-ffprobe';
 import os from 'os';
 import Conf from 'conf';
@@ -46,22 +46,6 @@ async function cropAndResizeImage(image, outputPath, width, height, format = "av
     withoutEnlargement: true
   }).toFormat(format).toFile(outputPath);
 }
-async function getImageDescription(imagePath) {
-  try {
-    const tags = await ExifReader.load(imagePath);
-    if (tags.description?.description) return tags.description.description;
-    if (tags.ImageDescription?.description) return tags.ImageDescription.description;
-    if (tags.UserComment && typeof tags.UserComment === "object" && tags.UserComment !== null && "description" in tags.UserComment) {
-      return tags.UserComment.description;
-    }
-    if (tags.ExtDescrAccessibility?.description) return tags.ExtDescrAccessibility.description;
-    if (tags["Caption/Abstract"]?.description) return tags["Caption/Abstract"].description;
-    if (tags.XPTitle?.description) return tags.XPTitle.description;
-    if (tags.XPComment?.description) return tags.XPComment.description;
-  } catch {
-    return void 0;
-  }
-}
 async function createImageThumbnails(image, metadata, outputPath, outputPathRetina, size) {
   const originalWidth = metadata.width || 0;
   const originalHeight = metadata.height || 0;
@@ -499,6 +483,22 @@ async function getFileMtime(filePath) {
   const stats = await promises.stat(filePath);
   return stats.mtime;
 }
+async function getImageDescription(image) {
+  try {
+    const tags = await ExifReader.load(image);
+    if (tags.description?.description) return tags.description.description;
+    if (tags.ImageDescription?.description) return tags.ImageDescription.description;
+    if (tags.UserComment && typeof tags.UserComment === "object" && tags.UserComment !== null && "description" in tags.UserComment) {
+      return tags.UserComment.description;
+    }
+    if (tags.ExtDescrAccessibility?.description) return tags.ExtDescrAccessibility.description;
+    if (tags["Caption/Abstract"]?.description) return tags["Caption/Abstract"].description;
+    if (tags.XPTitle?.description) return tags.XPTitle.description;
+    if (tags.XPComment?.description) return tags.XPComment.description;
+  } catch {
+    return void 0;
+  }
+}
 async function getVideoDimensions(filePath) {
   const data = await ffprobe(filePath);
   const videoStream = data.streams.find((stream) => stream.codec_type === "video");
@@ -1157,7 +1157,7 @@ async function waitForUpdateCheck(checkPromise) {
 // package.json
 var package_default = {
   name: "simple-photo-gallery",
-  version: "2.0.11-rc.6"};
+  version: "2.0.11-rc.8"};
 
 // src/index.ts
 var program = new Command();