simple-photo-gallery 2.0.11-rc.1 → 2.0.11-rc.10

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 { GalleryDataSchema, GalleryDataDeprecatedSchema } from '@simple-photo-gallery/common';
 import ExifReader from 'exifreader';
-import { z } from 'zod';
 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;
@@ -94,10 +78,10 @@ async function generateBlurHash(imagePath, componentX = 4, componentY = 3) {
 // src/modules/build/utils/index.ts
 path7.dirname(new URL(import.meta.url).pathname);
 async function createGallerySocialMediaCardImage(headerPhotoPath, title, ouputPath, ui) {
-  ui.start(`Creating social media card image`);
+  ui?.start(`Creating social media card image`);
   const headerBasename = path7.basename(headerPhotoPath, path7.extname(headerPhotoPath));
   if (fs8.existsSync(ouputPath)) {
-    ui.success(`Social media card image already exists`);
+    ui?.success(`Social media card image already exists`);
     return headerBasename;
   }
   const image = await loadImage(headerPhotoPath);
@@ -116,23 +100,23 @@ async function createGallerySocialMediaCardImage(headerPhotoPath, title, ouputPa
   `;
   const finalImageBuffer = await sharp2(resizedImageBuffer).composite([{ input: Buffer.from(svgText), top: 0, left: 0 }]).jpeg({ quality: 90 }).toBuffer();
   await sharp2(finalImageBuffer).toFile(outputPath);
-  ui.success(`Created social media card image successfully`);
+  ui?.success(`Created social media card image successfully`);
   return headerBasename;
 }
 async function createOptimizedHeaderImage(headerPhotoPath, outputFolder, ui) {
-  ui.start(`Creating optimized header images`);
+  ui?.start(`Creating optimized header images`);
   const image = await loadImage(headerPhotoPath);
   const headerBasename = path7.basename(headerPhotoPath, path7.extname(headerPhotoPath));
   const generatedFiles = [];
-  ui.debug("Generating blurhash for header image");
+  ui?.debug("Generating blurhash for header image");
   const blurHash = await generateBlurHash(headerPhotoPath);
   const landscapeYFactor = 3 / 4;
   for (const width of HEADER_IMAGE_LANDSCAPE_WIDTHS) {
-    ui.debug(`Creating landscape header image ${width}`);
+    ui?.debug(`Creating landscape header image ${width}`);
     const avifFilename = `${headerBasename}_landscape_${width}.avif`;
     const jpgFilename = `${headerBasename}_landscape_${width}.jpg`;
     if (fs8.existsSync(path7.join(outputFolder, avifFilename))) {
-      ui.debug(`Landscape header image ${width} AVIF already exists`);
+      ui?.debug(`Landscape header image ${width} AVIF already exists`);
     } else {
       await cropAndResizeImage(
         image.clone(),
@@ -144,7 +128,7 @@ async function createOptimizedHeaderImage(headerPhotoPath, outputFolder, ui) {
     }
     generatedFiles.push(avifFilename);
     if (fs8.existsSync(path7.join(outputFolder, jpgFilename))) {
-      ui.debug(`Landscape header image ${width} JPG already exists`);
+      ui?.debug(`Landscape header image ${width} JPG already exists`);
     } else {
       await cropAndResizeImage(image.clone(), path7.join(outputFolder, jpgFilename), width, width * landscapeYFactor, "jpg");
     }
@@ -152,23 +136,23 @@ async function createOptimizedHeaderImage(headerPhotoPath, outputFolder, ui) {
   }
   const portraitYFactor = 4 / 3;
   for (const width of HEADER_IMAGE_PORTRAIT_WIDTHS) {
-    ui.debug(`Creating portrait header image ${width}`);
+    ui?.debug(`Creating portrait header image ${width}`);
     const avifFilename = `${headerBasename}_portrait_${width}.avif`;
     const jpgFilename = `${headerBasename}_portrait_${width}.jpg`;
     if (fs8.existsSync(path7.join(outputFolder, avifFilename))) {
-      ui.debug(`Portrait header image ${width} AVIF already exists`);
+      ui?.debug(`Portrait header image ${width} AVIF already exists`);
     } else {
       await cropAndResizeImage(image.clone(), path7.join(outputFolder, avifFilename), width, width * portraitYFactor, "avif");
     }
     generatedFiles.push(avifFilename);
     if (fs8.existsSync(path7.join(outputFolder, jpgFilename))) {
-      ui.debug(`Portrait header image ${width} JPG already exists`);
+      ui?.debug(`Portrait header image ${width} JPG already exists`);
     } else {
       await cropAndResizeImage(image.clone(), path7.join(outputFolder, jpgFilename), width, width * portraitYFactor, "jpg");
     }
     generatedFiles.push(jpgFilename);
   }
-  ui.success(`Created optimized header image successfully`);
+  ui?.success(`Created optimized header image successfully`);
   return { headerBasename, generatedFiles, blurHash };
 }
 function hasOldHeaderImages(outputFolder, currentHeaderBasename) {
@@ -186,9 +170,9 @@ function hasOldHeaderImages(outputFolder, currentHeaderBasename) {
   return false;
 }
 function cleanupOldHeaderImages(outputFolder, currentHeaderBasename, ui) {
-  ui.start(`Cleaning up old header images`);
+  ui?.start(`Cleaning up old header images`);
   if (!fs8.existsSync(outputFolder)) {
-    ui.debug(`Output folder ${outputFolder} does not exist, skipping cleanup`);
+    ui?.debug(`Output folder ${outputFolder} does not exist, skipping cleanup`);
     return;
   }
   const files = fs8.readdirSync(outputFolder);
@@ -198,20 +182,20 @@ function cleanupOldHeaderImages(outputFolder, currentHeaderBasename, ui) {
     const portraitMatch = file.match(/^(.+)_portrait_\d+\.(avif|jpg)$/);
     if (landscapeMatch && landscapeMatch[1] !== currentHeaderBasename) {
       const filePath = path7.join(outputFolder, file);
-      ui.debug(`Deleting old landscape header image: ${file}`);
+      ui?.debug(`Deleting old landscape header image: ${file}`);
       fs8.unlinkSync(filePath);
       deletedCount++;
     } else if (portraitMatch && portraitMatch[1] !== currentHeaderBasename) {
       const filePath = path7.join(outputFolder, file);
-      ui.debug(`Deleting old portrait header image: ${file}`);
+      ui?.debug(`Deleting old portrait header image: ${file}`);
       fs8.unlinkSync(filePath);
       deletedCount++;
     }
   }
   if (deletedCount > 0) {
-    ui.success(`Deleted ${deletedCount} old header image(s)`);
+    ui?.success(`Deleted ${deletedCount} old header image(s)`);
   } else {
-    ui.debug(`No old header images to clean up`);
+    ui?.debug(`No old header images to clean up`);
   }
 }
 function findGalleries(basePath, recursive) {
@@ -253,90 +237,6 @@ function parseTelemetryOption(value) {
   }
   return value;
 }
-var ThumbnailSchema = z.object({
-  path: z.string(),
-  pathRetina: z.string(),
-  width: z.number(),
-  height: z.number(),
-  blurHash: z.string().optional()
-});
-var MediaFileSchema = z.object({
-  type: z.enum(["image", "video"]),
-  filename: z.string(),
-  alt: z.string().optional(),
-  width: z.number(),
-  height: z.number(),
-  thumbnail: ThumbnailSchema.optional(),
-  lastMediaTimestamp: z.string().optional()
-});
-var MediaFileDeprecatedSchema = z.object({
-  type: z.enum(["image", "video"]),
-  path: z.string(),
-  alt: z.string().optional(),
-  width: z.number(),
-  height: z.number(),
-  thumbnail: ThumbnailSchema.optional(),
-  lastMediaTimestamp: z.string().optional()
-});
-var GallerySectionSchema = z.object({
-  title: z.string().optional(),
-  description: z.string().optional(),
-  images: z.array(MediaFileSchema)
-});
-var GallerySectionDeprecatedSchema = z.object({
-  title: z.string().optional(),
-  description: z.string().optional(),
-  images: z.array(MediaFileDeprecatedSchema)
-});
-var SubGallerySchema = z.object({
-  title: z.string(),
-  headerImage: z.string(),
-  path: z.string()
-});
-var GalleryMetadataSchema = z.object({
-  image: z.string().optional(),
-  imageWidth: z.number().optional(),
-  imageHeight: z.number().optional(),
-  ogUrl: z.string().optional(),
-  ogType: z.string().optional(),
-  ogSiteName: z.string().optional(),
-  twitterSite: z.string().optional(),
-  twitterCreator: z.string().optional(),
-  author: z.string().optional(),
-  keywords: z.string().optional(),
-  canonicalUrl: z.string().optional(),
-  language: z.string().optional(),
-  robots: z.string().optional()
-});
-var GalleryDataSchema = z.object({
-  title: z.string(),
-  description: z.string(),
-  mediaBasePath: z.string().optional(),
-  url: z.string().optional(),
-  headerImage: z.string(),
-  headerImageBlurHash: z.string().optional(),
-  thumbnailSize: z.number().optional(),
-  metadata: GalleryMetadataSchema,
-  mediaBaseUrl: z.string().optional(),
-  thumbsBaseUrl: z.string().optional(),
-  analyticsScript: z.string().optional(),
-  sections: z.array(GallerySectionSchema),
-  subGalleries: z.object({ title: z.string(), galleries: z.array(SubGallerySchema) })
-});
-var GalleryDataDeprecatedSchema = z.object({
-  title: z.string(),
-  description: z.string(),
-  url: z.string().optional(),
-  headerImage: z.string(),
-  thumbnailSize: z.number().optional(),
-  metadata: GalleryMetadataSchema,
-  mediaBaseUrl: z.string().optional(),
-  analyticsScript: z.string().optional(),
-  sections: z.array(GallerySectionDeprecatedSchema),
-  subGalleries: z.object({ title: z.string(), galleries: z.array(SubGallerySchema) })
-});
-
-// src/utils/gallery.ts
 function parseGalleryJson(galleryJsonPath, ui) {
   let galleryContent;
   try {
@@ -583,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");
@@ -710,7 +626,7 @@ async function processVideo(videoPath, thumbnailPath, thumbnailPathRetina, thumb
     lastMediaTimestamp: fileMtime.toISOString()
   };
 }
-async function processMediaFile(mediaFile, mediaBasePath, galleryDir, thumbnailsPath, thumbnailSize, ui) {
+async function processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailSize, ui) {
   try {
     const filePath = path7.resolve(path7.join(mediaBasePath, mediaFile.filename));
     const fileName = mediaFile.filename;
@@ -763,14 +679,7 @@ async function processGalleryThumbnails(galleryDir, ui) {
     let processedCount = 0;
     for (const section of galleryData.sections) {
       for (const [index, mediaFile] of section.images.entries()) {
-        section.images[index] = await processMediaFile(
-          mediaFile,
-          mediaBasePath,
-          galleryDir,
-          thumbnailsPath,
-          thumbnailSize,
-          ui
-        );
+        section.images[index] = await processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailSize, ui);
       }
       processedCount += section.images.length;
     }
@@ -965,26 +874,26 @@ async function cleanGallery(galleryDir, ui) {
   if (fs8.existsSync(indexHtmlPath)) {
     try {
       fs8.rmSync(indexHtmlPath);
-      ui.debug(`Removed: ${indexHtmlPath}`);
+      ui?.debug(`Removed: ${indexHtmlPath}`);
       filesRemoved++;
     } catch (error) {
-      ui.warn(`Failed to remove index.html: ${error}`);
+      ui?.warn(`Failed to remove index.html: ${error}`);
     }
   }
   const galleryPath = path7.join(galleryDir, "gallery");
   if (fs8.existsSync(galleryPath)) {
     try {
       fs8.rmSync(galleryPath, { recursive: true, force: true });
-      ui.debug(`Removed directory: ${galleryPath}`);
+      ui?.debug(`Removed directory: ${galleryPath}`);
       filesRemoved++;
     } catch (error) {
-      ui.warn(`Failed to remove gallery directory: ${error}`);
+      ui?.warn(`Failed to remove gallery directory: ${error}`);
     }
   }
   if (filesRemoved > 0) {
-    ui.success(`Cleaned gallery at: ${galleryDir}`);
+    ui?.success(`Cleaned gallery at: ${galleryDir}`);
   } else {
-    ui.info(`No gallery files found at: ${galleryDir}`);
+    ui?.info(`No gallery files found at: ${galleryDir}`);
   }
   return { processedGalleryCount: filesRemoved };
 }
@@ -1248,7 +1157,7 @@ async function waitForUpdateCheck(checkPromise) {
 // package.json
 var package_default = {
   name: "simple-photo-gallery",
-  version: "2.0.11-rc.1"};
+  version: "2.0.11-rc.10"};
 
 // src/index.ts
 var program = new Command();