simple-photo-gallery 2.0.17 → 2.1.0

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import process3, { stdout } from 'process';
+import process4, { stdout } from 'process';
 import { Command } from 'commander';
 import { LogLevels, createConsola } from 'consola';
 import { execSync, spawn } from 'child_process';
@@ -9,15 +9,16 @@ import { Buffer } from 'buffer';
 import sharp2 from 'sharp';
 import { encode } from 'blurhash';
 import { GalleryDataSchema, GalleryDataDeprecatedSchema } from '@simple-photo-gallery/common';
+import { extractThumbnailConfigFromGallery, loadThemeConfig, mergeThumbnailConfig } from '@simple-photo-gallery/common/theme';
 import ExifReader from 'exifreader';
 import ffprobe from 'node-ffprobe';
+import { fileURLToPath } from 'url';
 import os from 'os';
 import Conf from 'conf';
 import axios from 'axios';
 import { compareSemVer, parseSemVer } from 'semver-parser';
 
 // src/config/index.ts
-var DEFAULT_THUMBNAIL_SIZE = 300;
 var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".jpg", ".jpeg", ".png", ".gif", ".webp", ".tiff", ".tif", ".svg", ".avif"]);
 var VIDEO_EXTENSIONS = /* @__PURE__ */ new Set([".mp4", ".avi", ".mov", ".wmv", ".flv", ".webm", ".mkv", ".m4v", ".3gp"]);
 var HEADER_IMAGE_LANDSCAPE_WIDTHS = [3840, 2560, 1920, 1280, 960, 640];
@@ -46,7 +47,7 @@ async function cropAndResizeImage(image, outputPath, width, height, format = "av
     withoutEnlargement: true
   }).toFormat(format).toFile(outputPath);
 }
-async function createImageThumbnails(image, metadata, outputPath, outputPathRetina, size) {
+async function createImageThumbnails(image, metadata, outputPath, outputPathRetina, size, sizeDimension = "auto") {
   const originalWidth = metadata.width || 0;
   const originalHeight = metadata.height || 0;
   if (originalWidth === 0 || originalHeight === 0) {
@@ -55,12 +56,20 @@ async function createImageThumbnails(image, metadata, outputPath, outputPathReti
   const aspectRatio = originalWidth / originalHeight;
   let width;
   let height;
-  if (originalWidth > originalHeight) {
+  if (sizeDimension === "width") {
     width = size;
     height = Math.round(size / aspectRatio);
-  } else {
+  } else if (sizeDimension === "height") {
     width = Math.round(size * aspectRatio);
     height = size;
+  } else {
+    if (originalWidth > originalHeight) {
+      width = size;
+      height = Math.round(size / aspectRatio);
+    } else {
+      width = Math.round(size * aspectRatio);
+      height = size;
+    }
   }
   await resizeImage(image, outputPath, width, height);
   await resizeImage(image, outputPathRetina, width * 2, height * 2);
@@ -76,6 +85,30 @@ async function generateBlurHash(imagePath, componentX = 4, componentY = 3) {
 }
 
 // src/modules/build/utils/index.ts
+function wrapText(text, maxCharsPerLine) {
+  const words = text.split(" ");
+  const lines = [];
+  let currentLine = "";
+  for (const word of words) {
+    const testLine = currentLine ? `${currentLine} ${word}` : word;
+    if (word.length > maxCharsPerLine) {
+      if (currentLine) {
+        lines.push(currentLine);
+        currentLine = "";
+      }
+      lines.push(word);
+    } else if (testLine.length > maxCharsPerLine && currentLine) {
+      lines.push(currentLine);
+      currentLine = word;
+    } else {
+      currentLine = testLine;
+    }
+  }
+  if (currentLine) {
+    lines.push(currentLine);
+  }
+  return lines;
+}
 async function createGallerySocialMediaCardImage(headerPhotoPath, title, ouputPath, ui) {
   ui?.start(`Creating social media card image`);
   const headerBasename = path7.basename(headerPhotoPath, path7.extname(headerPhotoPath));
@@ -87,14 +120,38 @@ async function createGallerySocialMediaCardImage(headerPhotoPath, title, ouputPa
   const resizedImageBuffer = await image.resize(1200, 631, { fit: "cover" }).jpeg({ quality: 90 }).toBuffer();
   const outputPath = ouputPath;
   await sharp2(resizedImageBuffer).toFile(outputPath);
+  const CANVAS_WIDTH = 1200;
+  const CANVAS_HEIGHT = 631;
+  const FONT_SIZE = 72;
+  const MARGIN = 50;
+  const CHAR_WIDTH_RATIO = 0.6;
+  const usableWidth = CANVAS_WIDTH - 2 * MARGIN;
+  const maxCharsPerLine = Math.floor(usableWidth / (FONT_SIZE * CHAR_WIDTH_RATIO));
+  const lines = wrapText(title, maxCharsPerLine);
+  const lineHeight = FONT_SIZE * 1.2;
+  const totalTextHeight = FONT_SIZE + (lines.length - 1) * lineHeight;
+  const startY = CANVAS_HEIGHT - MARGIN - totalTextHeight + FONT_SIZE;
+  const leftX = MARGIN;
+  const tspanElements = lines.map((line, index) => {
+    const yPosition = startY + index * lineHeight;
+    const escapedLine = line.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+    return `<tspan x="${leftX}" y="${yPosition}">${escapedLine}</tspan>`;
+  }).join("\n      ");
   const svgText = `
-    <svg width="1200" height="631" xmlns="http://www.w3.org/2000/svg">
+    <svg width="${CANVAS_WIDTH}" height="${CANVAS_HEIGHT}" xmlns="http://www.w3.org/2000/svg">
       <defs>
+        <linearGradient id="darkGradient" x1="0%" y1="0%" x2="0%" y2="100%">
+          <stop offset="0%" style="stop-color:rgb(0,0,0);stop-opacity:0" />
+          <stop offset="100%" style="stop-color:rgb(0,0,0);stop-opacity:0.65" />
+        </linearGradient>
         <style>
-          .title { font-family: 'Arial, sans-serif'; font-size: 96px; font-weight: bold; fill: white; stroke: black; stroke-width: 5; paint-order: stroke; text-anchor: middle; }
+          .title { font-family: 'Arial, sans-serif'; font-size: ${FONT_SIZE}px; font-weight: bold; fill: white; text-anchor: start; }
         </style>
       </defs>
-      <text x="600" y="250" class="title">${title}</text>
+      <rect x="0" y="0" width="${CANVAS_WIDTH}" height="${CANVAS_HEIGHT}" fill="url(#darkGradient)" />
+      <text x="${leftX}" class="title">
+      ${tspanElements}
+      </text>
     </svg>
   `;
   const finalImageBuffer = await sharp2(resizedImageBuffer).composite([{ input: Buffer.from(svgText), top: 0, left: 0 }]).jpeg({ quality: 90 }).toBuffer();
@@ -278,11 +335,15 @@ function migrateGalleryJson(deprecatedGalleryData, galleryJsonPath, ui) {
       filename: path7.basename(image.path)
     }))
   }));
+  const thumbnails2 = deprecatedGalleryData.thumbnailSize === void 0 ? void 0 : { size: deprecatedGalleryData.thumbnailSize };
   const galleryData = {
     ...deprecatedGalleryData,
+    thumbnailSize: void 0,
+    // Remove old field
     headerImage: path7.basename(deprecatedGalleryData.headerImage),
     sections,
-    mediaBasePath
+    mediaBasePath,
+    thumbnails: thumbnails2
   };
   ui.debug("Backing up old gallery.json file");
   fs8.copyFileSync(galleryJsonPath, `${galleryJsonPath}.old`);
@@ -353,9 +414,18 @@ async function getGallerySettingsFromUser(galleryName, defaultImage, ui) {
     default: defaultImage,
     placeholder: defaultImage
   });
-  return { title, description, url, headerImage };
+  return {
+    title,
+    description,
+    url,
+    headerImage,
+    thumbnails: {
+      size: "",
+      edge: void 0
+    }
+  };
 }
-async function createGalleryJson(mediaFiles, galleryJsonPath, scanPath, subGalleries = [], useDefaultSettings, ctaBanner, ui) {
+async function createGalleryJson(mediaFiles, galleryJsonPath, scanPath, subGalleries = [], useDefaultSettings, ctaBanner, configOptions, ui) {
   const galleryDir = path7.dirname(galleryJsonPath);
   const isSameLocation = path7.relative(scanPath, path7.join(galleryDir, "..")) === "";
   const mediaBasePath = isSameLocation ? void 0 : scanPath;
@@ -363,12 +433,23 @@ async function createGalleryJson(mediaFiles, galleryJsonPath, scanPath, subGalle
     ...subGallery,
     headerImage: subGallery.headerImage ? path7.relative(galleryDir, subGallery.headerImage) : ""
   }));
+  const thumbnailsConfig = {};
+  if (configOptions.thumbnailSize !== void 0) {
+    thumbnailsConfig.size = configOptions.thumbnailSize;
+  }
+  if (configOptions.thumbnailEdge !== void 0) {
+    thumbnailsConfig.edge = configOptions.thumbnailEdge;
+  }
   let galleryData = {
     title: "My Gallery",
     description: "My gallery with fantastic photos.",
     headerImage: mediaFiles[0]?.filename || "",
     mediaBasePath,
     metadata: {},
+    // Include theme if provided via CLI
+    ...configOptions.theme && { theme: configOptions.theme },
+    // Include thumbnails if any values were set via CLI
+    ...Object.keys(thumbnailsConfig).length > 0 && { thumbnails: thumbnailsConfig },
     sections: [
       {
         images: mediaFiles
@@ -381,13 +462,15 @@ async function createGalleryJson(mediaFiles, galleryJsonPath, scanPath, subGalle
     ...ctaBanner !== void 0 && { ctaBanner }
   };
   if (!useDefaultSettings) {
+    const userSettings = await getGallerySettingsFromUser(
+      path7.basename(path7.join(galleryDir, "..")),
+      path7.basename(mediaFiles[0]?.filename || ""),
+      ui
+    );
+    const { thumbnails: thumbnails2, ...otherSettings } = userSettings;
     galleryData = {
       ...galleryData,
-      ...await getGallerySettingsFromUser(
-        path7.basename(path7.join(galleryDir, "..")),
-        path7.basename(mediaFiles[0]?.filename || ""),
-        ui
-      )
+      ...otherSettings
     };
   }
   await promises.writeFile(galleryJsonPath, JSON.stringify(galleryData, null, 2));
@@ -402,7 +485,7 @@ async function galleryExists(outputPath) {
     return false;
   }
 }
-async function processDirectory(scanPath, outputPath, recursive, useDefaultSettings, force, ctaBanner, ui) {
+async function processDirectory(scanPath, outputPath, recursive, useDefaultSettings, force, ctaBanner, configOptions, ui) {
   ui.start(`Scanning ${scanPath}`);
   let totalFiles = 0;
   let totalGalleries = 1;
@@ -418,6 +501,7 @@ async function processDirectory(scanPath, outputPath, recursive, useDefaultSetti
         useDefaultSettings,
         force,
         ctaBanner,
+        configOptions,
         ui
       );
       totalFiles += result2.totalFiles;
@@ -443,7 +527,16 @@ async function processDirectory(scanPath, outputPath, recursive, useDefaultSetti
     }
     try {
       await promises.mkdir(galleryPath, { recursive: true });
-      await createGalleryJson(mediaFiles, galleryJsonPath, scanPath, subGalleries, useDefaultSettings, ctaBanner, ui);
+      await createGalleryJson(
+        mediaFiles,
+        galleryJsonPath,
+        scanPath,
+        subGalleries,
+        useDefaultSettings,
+        ctaBanner,
+        configOptions,
+        ui
+      );
       ui.success(
         `Create gallery with ${mediaFiles.length} files and ${subGalleries.length} subgalleries at: ${galleryJsonPath}`
       );
@@ -467,6 +560,11 @@ async function init(options, ui) {
   try {
     const scanPath = path7.resolve(options.photos);
     const outputPath = options.gallery ? path7.resolve(options.gallery) : scanPath;
+    const configOptions = {
+      theme: options.theme,
+      thumbnailSize: options.thumbnailSize,
+      thumbnailEdge: options.thumbnailEdge
+    };
     const result = await processDirectory(
       scanPath,
       outputPath,
@@ -474,6 +572,7 @@ async function init(options, ui) {
       options.default,
       options.force,
       options.ctaBanner,
+      configOptions,
       ui
     );
     ui.box(
@@ -523,9 +622,25 @@ async function getVideoDimensions(filePath) {
   }
   return dimensions;
 }
-async function createVideoThumbnails(inputPath, videoDimensions, outputPath, outputPathRetina, height, verbose = false) {
+async function createVideoThumbnails(inputPath, videoDimensions, outputPath, outputPathRetina, size, sizeDimension = "auto", verbose = false) {
   const aspectRatio = videoDimensions.width / videoDimensions.height;
-  const width = Math.round(height * aspectRatio);
+  let width;
+  let height;
+  if (sizeDimension === "width") {
+    width = size;
+    height = Math.round(size / aspectRatio);
+  } else if (sizeDimension === "height") {
+    width = Math.round(size * aspectRatio);
+    height = size;
+  } else {
+    if (videoDimensions.width > videoDimensions.height) {
+      width = size;
+      height = Math.round(size / aspectRatio);
+    } else {
+      width = Math.round(size * aspectRatio);
+      height = size;
+    }
+  }
   const tempFramePath = `${outputPath}.temp.png`;
   return new Promise((resolve, reject) => {
     const ffmpeg = spawn("ffmpeg", [
@@ -566,7 +681,7 @@ async function createVideoThumbnails(inputPath, videoDimensions, outputPath, out
 }
 
 // src/modules/thumbnails/index.ts
-async function processImage(imagePath, thumbnailPath, thumbnailPathRetina, thumbnailSize, lastMediaTimestamp) {
+async function processImage(imagePath, thumbnailPath, thumbnailPathRetina, thumbnailSize, thumbnailSizeDimension = "auto", lastMediaTimestamp) {
   const fileMtime = await getFileMtime(imagePath);
   if (lastMediaTimestamp && fileMtime <= lastMediaTimestamp && fs8.existsSync(thumbnailPath)) {
     return void 0;
@@ -585,7 +700,8 @@ async function processImage(imagePath, thumbnailPath, thumbnailPathRetina, thumb
     metadata,
     thumbnailPath,
     thumbnailPathRetina,
-    thumbnailSize
+    thumbnailSize,
+    thumbnailSizeDimension
   );
   const blurHash = await generateBlurHash(thumbnailPath);
   return {
@@ -604,7 +720,7 @@ async function processImage(imagePath, thumbnailPath, thumbnailPathRetina, thumb
     lastMediaTimestamp: fileMtime.toISOString()
   };
 }
-async function processVideo(videoPath, thumbnailPath, thumbnailPathRetina, thumbnailSize, verbose, lastMediaTimestamp) {
+async function processVideo(videoPath, thumbnailPath, thumbnailPathRetina, thumbnailSize, thumbnailSizeDimension = "auto", verbose, lastMediaTimestamp) {
   const fileMtime = await getFileMtime(videoPath);
   if (lastMediaTimestamp && fileMtime <= lastMediaTimestamp && fs8.existsSync(thumbnailPath)) {
     return void 0;
@@ -616,6 +732,7 @@ async function processVideo(videoPath, thumbnailPath, thumbnailPathRetina, thumb
     thumbnailPath,
     thumbnailPathRetina,
     thumbnailSize,
+    thumbnailSizeDimension,
     verbose
   );
   const blurHash = await generateBlurHash(thumbnailPath);
@@ -635,7 +752,7 @@ async function processVideo(videoPath, thumbnailPath, thumbnailPathRetina, thumb
     lastMediaTimestamp: fileMtime.toISOString()
   };
 }
-async function processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailSize, ui) {
+async function processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailConfig, ui) {
   try {
     const filePath = path7.resolve(path7.join(mediaBasePath, mediaFile.filename));
     const fileName = mediaFile.filename;
@@ -646,7 +763,22 @@ async function processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbn
     const lastMediaTimestamp = mediaFile.lastMediaTimestamp ? new Date(mediaFile.lastMediaTimestamp) : void 0;
     const verbose = ui.level === LogLevels.debug;
     ui.debug(`  Processing ${mediaFile.type}: ${fileName}`);
-    const updatedMediaFile = await (mediaFile.type === "image" ? processImage(filePath, thumbnailPath, thumbnailPathRetina, thumbnailSize, lastMediaTimestamp) : processVideo(filePath, thumbnailPath, thumbnailPathRetina, thumbnailSize, verbose, lastMediaTimestamp));
+    const updatedMediaFile = await (mediaFile.type === "image" ? processImage(
+      filePath,
+      thumbnailPath,
+      thumbnailPathRetina,
+      thumbnailConfig.size,
+      thumbnailConfig.edge,
+      lastMediaTimestamp
+    ) : processVideo(
+      filePath,
+      thumbnailPath,
+      thumbnailPathRetina,
+      thumbnailConfig.size,
+      thumbnailConfig.edge,
+      verbose,
+      lastMediaTimestamp
+    ));
     if (!updatedMediaFile) {
       ui.debug(`  Skipping ${fileName} because it has already been processed`);
       if (mediaFile.thumbnail && !mediaFile.thumbnail.blurHash && fs8.existsSync(thumbnailPath)) {
@@ -682,19 +814,30 @@ async function processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbn
     return { ...mediaFile, thumbnail: void 0 };
   }
 }
-async function processGalleryThumbnails(galleryDir, ui) {
+async function processGalleryThumbnails(galleryDir, ui, cliThumbnailConfig) {
   const galleryJsonPath = path7.join(galleryDir, "gallery", "gallery.json");
   const thumbnailsPath = path7.join(galleryDir, "gallery", "images");
   ui.start(`Creating thumbnails: ${galleryDir}`);
   try {
     fs8.mkdirSync(thumbnailsPath, { recursive: true });
     const galleryData = parseGalleryJson(galleryJsonPath, ui);
-    const thumbnailSize = galleryData.thumbnailSize || DEFAULT_THUMBNAIL_SIZE;
+    const galleryThumbnailConfig = extractThumbnailConfigFromGallery(galleryData);
+    let themeConfig;
+    if (galleryData.theme) {
+      try {
+        const themeDir = await resolveThemeDir(galleryData.theme, ui);
+        themeConfig = loadThemeConfig(themeDir);
+      } catch {
+        ui.debug(`Could not load theme config from ${galleryData.theme}, using defaults`);
+      }
+    }
+    const thumbnailConfig = mergeThumbnailConfig(cliThumbnailConfig, galleryThumbnailConfig, themeConfig);
+    ui.debug(`Thumbnail config: size=${thumbnailConfig.size}, edge=${thumbnailConfig.edge}`);
     const mediaBasePath = galleryData.mediaBasePath ?? path7.join(galleryDir);
     let processedCount = 0;
     for (const section of galleryData.sections) {
       for (const [index, mediaFile] of section.images.entries()) {
-        section.images[index] = await processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailSize, ui);
+        section.images[index] = await processMediaFile(mediaFile, mediaBasePath, thumbnailsPath, thumbnailConfig, ui);
       }
       processedCount += section.images.length;
     }
@@ -713,10 +856,11 @@ async function thumbnails(options, ui) {
       ui.error("No galleries found.");
       return { processedGalleryCount: 0, processedMediaCount: 0 };
     }
+    const cliThumbnailConfig = options.thumbnailSize !== void 0 || options.thumbnailEdge !== void 0 ? { size: options.thumbnailSize, edge: options.thumbnailEdge } : void 0;
     let totalGalleries = 0;
     let totalProcessed = 0;
     for (const galleryDir of galleryDirs) {
-      const processed = await processGalleryThumbnails(galleryDir, ui);
+      const processed = await processGalleryThumbnails(galleryDir, ui, cliThumbnailConfig);
       if (processed > 0) {
         ++totalGalleries;
         totalProcessed += processed;
@@ -775,7 +919,7 @@ async function scanAndAppendNewFiles(galleryDir, galleryJsonPath, galleryData, u
   }
   return galleryData;
 }
-async function buildGallery(galleryDir, templateDir, scan, shouldCreateThumbnails, ui, baseUrl, thumbsBaseUrl) {
+async function buildGallery(galleryDir, templateDir, scan, shouldCreateThumbnails, ui, baseUrl, thumbsBaseUrl, cliThumbnailConfig, cliTheme) {
   ui.start(`Building gallery ${galleryDir}`);
   const galleryJsonPath = path7.join(galleryDir, "gallery", "gallery.json");
   let galleryData = parseGalleryJson(galleryJsonPath, ui);
@@ -828,18 +972,35 @@ async function buildGallery(galleryDir, templateDir, scan, shouldCreateThumbnail
     galleryData.thumbsBaseUrl = thumbsBaseUrl;
     fs8.writeFileSync(galleryJsonPath, JSON.stringify(galleryData, null, 2));
   }
+  if (cliTheme && galleryData.theme !== cliTheme) {
+    ui.debug("Updating gallery.json with theme");
+    galleryData.theme = cliTheme;
+    fs8.writeFileSync(galleryJsonPath, JSON.stringify(galleryData, null, 2));
+  }
+  if (cliThumbnailConfig) {
+    const needsUpdate = cliThumbnailConfig.size !== void 0 && galleryData.thumbnails?.size !== cliThumbnailConfig.size || cliThumbnailConfig.edge !== void 0 && galleryData.thumbnails?.edge !== cliThumbnailConfig.edge;
+    if (needsUpdate) {
+      ui.debug("Updating gallery.json with thumbnail settings");
+      galleryData.thumbnails = {
+        ...galleryData.thumbnails,
+        ...cliThumbnailConfig.size !== void 0 && { size: cliThumbnailConfig.size },
+        ...cliThumbnailConfig.edge !== void 0 && { edge: cliThumbnailConfig.edge }
+      };
+      fs8.writeFileSync(galleryJsonPath, JSON.stringify(galleryData, null, 2));
+    }
+  }
   if (!galleryData.metadata.image) {
     ui.debug("Updating gallery.json with social media card URL");
     galleryData.metadata.image = thumbsBaseUrl ? `${thumbsBaseUrl}/${path7.basename(socialMediaCardImagePath)}` : `${galleryData.url || ""}/${path7.relative(galleryDir, socialMediaCardImagePath)}`;
     fs8.writeFileSync(galleryJsonPath, JSON.stringify(galleryData, null, 2));
   }
   if (shouldCreateThumbnails) {
-    await processGalleryThumbnails(galleryDir, ui);
+    await processGalleryThumbnails(galleryDir, ui, cliThumbnailConfig);
   }
   ui.debug("Building gallery from template");
   try {
-    process3.env.GALLERY_JSON_PATH = galleryJsonPath;
-    process3.env.GALLERY_OUTPUT_DIR = path7.join(galleryDir, "gallery");
+    process4.env.GALLERY_JSON_PATH = galleryJsonPath;
+    process4.env.GALLERY_OUTPUT_DIR = path7.join(galleryDir, "gallery");
     execSync("npx astro build", { cwd: templateDir, stdio: ui.level === LogLevels.debug ? "inherit" : "ignore" });
   } catch (error) {
     ui.error(`Build failed for ${galleryDir}`);
@@ -856,6 +1017,25 @@ async function buildGallery(galleryDir, templateDir, scan, shouldCreateThumbnail
   fs8.rmSync(buildDir, { recursive: true, force: true });
   ui.success(`Gallery built successfully`);
 }
+function isLocalThemePath(theme) {
+  return theme.startsWith("./") || theme.startsWith("../") || theme.startsWith("/");
+}
+async function resolveThemeDir(theme, ui) {
+  if (isLocalThemePath(theme)) {
+    const themeDir = path7.resolve(theme);
+    const packageJsonPath = path7.join(themeDir, "package.json");
+    if (!fs8.existsSync(packageJsonPath)) {
+      throw new Error(`Theme directory not found or invalid: ${themeDir}. package.json not found.`);
+    }
+    ui.debug(`Using local theme: ${themeDir}`);
+    return themeDir;
+  } else {
+    const themePath = await import.meta.resolve(`${theme}/package.json`);
+    const themeDir = path7.dirname(new URL(themePath).pathname);
+    ui.debug(`Using npm theme package: ${theme} (${themeDir})`);
+    return themeDir;
+  }
+}
 async function build(options, ui) {
   try {
     const galleryDirs = findGalleries(options.gallery, options.recursive);
@@ -863,20 +1043,41 @@ async function build(options, ui) {
       ui.error("No galleries found.");
       return { processedGalleryCount: 0 };
     }
-    const themePath = await import.meta.resolve("@simple-photo-gallery/theme-modern/package.json");
-    const themeDir = path7.dirname(new URL(themePath).pathname);
+    const cliThumbnailConfig = options.thumbnailSize !== void 0 || options.thumbnailEdge !== void 0 ? { size: options.thumbnailSize, edge: options.thumbnailEdge } : void 0;
     let totalGalleries = 0;
     for (const dir of galleryDirs) {
+      const galleryJsonPath = path7.join(dir, "gallery", "gallery.json");
+      const galleryData = parseGalleryJson(galleryJsonPath, ui);
+      const themeIdentifier = options.theme || galleryData.theme || "@simple-photo-gallery/theme-modern";
+      const themeDir = await resolveThemeDir(themeIdentifier, ui);
       const baseUrl = options.baseUrl ? `${options.baseUrl}${path7.relative(options.gallery, dir)}` : void 0;
       const thumbsBaseUrl = options.thumbsBaseUrl ? `${options.thumbsBaseUrl}${path7.relative(options.gallery, dir)}` : void 0;
-      await buildGallery(path7.resolve(dir), themeDir, options.scan, options.thumbnails, ui, baseUrl, thumbsBaseUrl);
+      await buildGallery(
+        path7.resolve(dir),
+        themeDir,
+        options.scan,
+        options.thumbnails,
+        ui,
+        baseUrl,
+        thumbsBaseUrl,
+        cliThumbnailConfig,
+        options.theme
+      );
       ++totalGalleries;
     }
     ui.box(`Built ${totalGalleries} ${totalGalleries === 1 ? "gallery" : "galleries"} successfully`);
     return { processedGalleryCount: totalGalleries };
   } catch (error) {
-    if (error instanceof Error && error.message.includes("Cannot find package")) {
-      ui.error("Theme package not found: @simple-photo-gallery/theme-modern/package.json");
+    if (error instanceof Error) {
+      if (error.message.includes("Cannot find package")) {
+        ui.error(
+          `Theme package not found: ${options.theme || "@simple-photo-gallery/theme-modern"}. Make sure it's installed.`
+        );
+      } else if (error.message.includes("Theme directory not found") || error.message.includes("package.json not found")) {
+        ui.error(error.message);
+      } else {
+        ui.error("Error building gallery");
+      }
     } else {
       ui.error("Error building gallery");
     }
@@ -934,6 +1135,162 @@ async function clean(options, ui) {
     throw error;
   }
 }
+function findMonorepoRoot(startDir) {
+  let dir = path7.resolve(startDir);
+  while (true) {
+    const pkgPath = path7.join(dir, "package.json");
+    if (fs8.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs8.readFileSync(pkgPath, "utf8"));
+        if (pkg && typeof pkg === "object" && "workspaces" in pkg) {
+          return dir;
+        }
+      } catch {
+      }
+    }
+    const parent = path7.dirname(dir);
+    if (parent === dir) {
+      return void 0;
+    }
+    dir = parent;
+  }
+}
+function validateThemeName(name) {
+  if (!name || name.trim().length === 0) {
+    throw new Error("Theme name cannot be empty");
+  }
+  if (!/^[a-z0-9-]+$/i.test(name)) {
+    throw new Error("Theme name can only contain letters, numbers, and hyphens");
+  }
+  return true;
+}
+async function ensureDirectory(dirPath, ui) {
+  try {
+    await fs8.promises.mkdir(dirPath, { recursive: true });
+    ui.debug(`Created directory: ${dirPath}`);
+  } catch (error) {
+    if (error instanceof Error && "code" in error && error.code !== "EEXIST") {
+      throw new Error(`Failed to create directory ${dirPath}: ${error.message}`);
+    }
+  }
+}
+var EXCLUDE_PATTERNS = ["node_modules", ".astro", "dist", "_build", ".git", "*.log", ".DS_Store"];
+function shouldExclude(name) {
+  if (name === "README.md" || name === "README_BASE.md") {
+    return true;
+  }
+  return EXCLUDE_PATTERNS.some((pattern) => {
+    if (pattern.includes("*")) {
+      const regexPattern = pattern.split("*").join(".*");
+      const regex = new RegExp(regexPattern);
+      return regex.test(name);
+    }
+    return name === pattern;
+  });
+}
+async function copyDirectory(src, dest, ui) {
+  await fs8.promises.mkdir(dest, { recursive: true });
+  const entries = await fs8.promises.readdir(src, { withFileTypes: true });
+  for (const entry of entries) {
+    if (shouldExclude(entry.name)) {
+      ui.debug(`Skipping excluded file/directory: ${entry.name}`);
+      continue;
+    }
+    const srcPath = path7.join(src, entry.name);
+    const destPath = path7.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      await copyDirectory(srcPath, destPath, ui);
+    } else {
+      await fs8.promises.copyFile(srcPath, destPath);
+      ui.debug(`Copied file: ${destPath}`);
+    }
+  }
+}
+function findBaseThemePath() {
+  const moduleDir = path7.dirname(fileURLToPath(import.meta.url));
+  const bundledTemplatePath = path7.resolve(moduleDir, "../../../src/modules/create-theme/templates/base");
+  if (fs8.existsSync(bundledTemplatePath)) {
+    return bundledTemplatePath;
+  }
+  const monorepoRoot = findMonorepoRoot(process4.cwd());
+  const workspaceRoot = monorepoRoot ?? process4.cwd();
+  const workspaceBaseThemePath = path7.join(workspaceRoot, "themes", "base");
+  if (fs8.existsSync(workspaceBaseThemePath)) {
+    return workspaceBaseThemePath;
+  }
+  throw new Error(
+    `Base theme template not found. Tried:
+  - ${bundledTemplatePath}
+  - ${workspaceBaseThemePath}
+
+Please ensure the templates are included in the package or themes/base exists in the workspace.`
+  );
+}
+async function updatePackageJson(themeDir, themeName, ui) {
+  const packageJsonPath = path7.join(themeDir, "package.json");
+  const packageJsonContent = await fs8.promises.readFile(packageJsonPath, "utf8");
+  const packageJson = JSON.parse(packageJsonContent);
+  packageJson.name = themeName;
+  await fs8.promises.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n", "utf8");
+  ui.debug(`Updated package.json with theme name: ${themeName}`);
+}
+async function createReadmeFromBase(baseThemePath, themeDir, themeName, ui) {
+  const readmeBasePath = path7.join(baseThemePath, "README_BASE.md");
+  const readmePath = path7.join(themeDir, "README.md");
+  if (!fs8.existsSync(readmeBasePath)) {
+    throw new Error(`README_BASE.md not found in template: ${readmeBasePath}`);
+  }
+  let readme = await fs8.promises.readFile(readmeBasePath, "utf8");
+  const displayName = themeName.split("-").filter(Boolean).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+  readme = readme.replaceAll("{THEME_NAME}", displayName);
+  readme = readme.replaceAll("{THEME_NAME_LOWER}", displayName.toLowerCase());
+  await fs8.promises.writeFile(readmePath, readme, "utf8");
+  ui.debug(`Created README.md from README_BASE.md for theme: ${themeName}`);
+}
+async function createTheme(options, ui) {
+  try {
+    validateThemeName(options.name);
+    let themeDir;
+    if (options.path) {
+      themeDir = path7.resolve(options.path);
+    } else {
+      const monorepoRoot = findMonorepoRoot(process4.cwd());
+      const baseDir = monorepoRoot ?? process4.cwd();
+      const themesBaseDir = path7.resolve(baseDir, "themes");
+      themeDir = path7.join(themesBaseDir, options.name);
+      if (!fs8.existsSync(themesBaseDir)) {
+        await ensureDirectory(themesBaseDir, ui);
+      }
+    }
+    if (fs8.existsSync(themeDir)) {
+      throw new Error(`Theme directory already exists: ${themeDir}. Cannot overwrite existing theme.`);
+    }
+    ui.start(`Creating theme: ${options.name}`);
+    const baseThemePath = findBaseThemePath();
+    ui.debug(`Using base theme from: ${baseThemePath}`);
+    ui.debug("Copying base theme files...");
+    await copyDirectory(baseThemePath, themeDir, ui);
+    ui.debug("Updating theme-specific files...");
+    await updatePackageJson(themeDir, options.name, ui);
+    await createReadmeFromBase(baseThemePath, themeDir, options.name, ui);
+    ui.success(`Theme created successfully at: ${themeDir}`);
+    ui.info(`
+Next steps:`);
+    ui.info(`1. cd ${themeDir}`);
+    ui.info(`2. yarn install`);
+    ui.info(`3. Customize your theme in src/pages/index.astro`);
+    ui.info(`4. Initialize a gallery (run from directory with your images): spg init -p <images-folder>`);
+    ui.info(`5. Build a gallery with your theme: spg build --theme ${themeDir} -g <gallery-folder>`);
+    return { processedGalleryCount: 0 };
+  } catch (error) {
+    if (error instanceof Error) {
+      ui.error(error.message);
+    } else {
+      ui.error("Failed to create theme");
+    }
+    throw error;
+  }
+}
 
 // src/modules/telemetry/index.ts
 async function telemetry(options, ui, telemetryService2) {
@@ -963,7 +1320,7 @@ var ApiTelemetryClient = class {
       axios.post(this.endpoint, event, {
         headers: {
           "content-type": "application/json",
-          "user-agent": `simple-photo-gallery/${event.packageVersion} (${process3.platform}; ${process3.arch})`
+          "user-agent": `simple-photo-gallery/${event.packageVersion} (${process4.platform}; ${process4.arch})`
         }
       });
     } catch {
@@ -1000,11 +1357,11 @@ var TelemetryService = class {
     if (override) {
       return override === "1";
     }
-    if (process3.env.CI || process3.env.DO_NOT_TRACK) {
+    if (process4.env.CI || process4.env.DO_NOT_TRACK) {
       return false;
     }
-    if (process3.env.SPG_TELEMETRY) {
-      return process3.env.SPG_TELEMETRY === "1";
+    if (process4.env.SPG_TELEMETRY) {
+      return process4.env.SPG_TELEMETRY === "1";
     }
     const stored = this.getStoredPreference();
     if (stored === void 0) {
@@ -1046,7 +1403,7 @@ var TelemetryService = class {
       durationMs: now - startedAt,
       packageName: this.packageName,
       packageVersion: this.packageVersion,
-      nodeVersion: process3.version,
+      nodeVersion: process4.version,
       osPlatform: os.platform(),
       osRelease: os.release(),
       osArch: os.arch(),
@@ -1080,7 +1437,7 @@ var TelemetryService = class {
   /** Returns the telemetry client. */
   getClient() {
     if (!this.client) {
-      switch (process3.env.SPG_TELEMETRY_PROVIDER) {
+      switch (process4.env.SPG_TELEMETRY_PROVIDER) {
         case "none": {
           this.client = void 0;
           break;
@@ -1172,7 +1529,7 @@ async function waitForUpdateCheck(checkPromise) {
 // package.json
 var package_default = {
   name: "simple-photo-gallery",
-  version: "2.0.17"};
+  version: "2.1.0"};
 
 // src/index.ts
 var program = new Command();
@@ -1214,7 +1571,7 @@ function withCommandContext(handler) {
     } catch (error) {
       ui.debug(error);
       errorInfo = error instanceof Error ? { name: error.name, message: error.message } : { name: "UnknownError", message: String(error) };
-      process3.exitCode = 1;
+      process4.exitCode = 1;
     }
     const updateInfo = await waitForUpdateCheck(updateCheckPromise);
     if (updateInfo) {
@@ -1236,14 +1593,21 @@ function withCommandContext(handler) {
 program.command("init").description("Initialize a gallery by scaning a folder for images and videos").option(
   "-p, --photos <path>",
   "Path to the folder where the photos are stored. Default: current working directory",
-  process3.cwd()
+  process4.cwd()
 ).option(
   "-g, --gallery <path>",
   "Path to the directory where the gallery will be initialized. Default: same directory as the photos folder"
-).option("-r, --recursive", "Recursively create galleries from all photos subdirectories", false).option("-d, --default", "Use default gallery settings instead of asking the user", false).option("-f, --force", "Force override existing galleries without asking", false).option("--cta-banner", "Add a Simple Photo Gallery call-to-action banner to the end of the gallery", false).action(withCommandContext((options, ui) => init(options, ui)));
-program.command("thumbnails").description("Create thumbnails for all media files in the gallery").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process3.cwd()).option("-r, --recursive", "Scan subdirectories recursively", false).action(withCommandContext((options, ui) => thumbnails(options, ui)));
-program.command("build").description("Build the HTML gallery in the specified directory").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process3.cwd()).option("-r, --recursive", "Scan subdirectories recursively", false).option("-b, --base-url <url>", "Base URL where the photos are hosted").option("-t, --thumbs-base-url <url>", "Base URL where the thumbnails are hosted").option("--no-thumbnails", "Skip creating thumbnails when building the gallery", true).option("--no-scan", "Do not scan for new photos when building the gallery", true).action(withCommandContext((options, ui) => build(options, ui)));
-program.command("clean").description("Remove all gallery files and folders (index.html, gallery/)").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process3.cwd()).option("-r, --recursive", "Clean subdirectories recursively", false).action(withCommandContext((options, ui) => clean(options, ui)));
+).option("-r, --recursive", "Recursively create galleries from all photos subdirectories", false).option("-d, --default", "Use default gallery settings instead of asking the user", false).option("-f, --force", "Force override existing galleries without asking", false).option("--cta-banner", "Add a Simple Photo Gallery call-to-action banner to the end of the gallery", false).option("--theme <package|path>", "Theme package name or local path to store in gallery.json").option("--thumbnail-size <pixels>", "Thumbnail size in pixels to store in gallery.json", Number.parseInt).option("--thumbnail-edge <mode>", "How thumbnail size is applied: auto, width, or height").action(withCommandContext((options, ui) => init(options, ui)));
+program.command("thumbnails").description("Create thumbnails for all media files in the gallery").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process4.cwd()).option("-r, --recursive", "Scan subdirectories recursively", false).option("--thumbnail-size <pixels>", "Override thumbnail size in pixels", Number.parseInt).option("--thumbnail-edge <mode>", "Override how thumbnail size is applied: auto, width, or height").action(withCommandContext((options, ui) => thumbnails(options, ui)));
+program.command("build").description("Build the HTML gallery in the specified directory").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process4.cwd()).option("-r, --recursive", "Scan subdirectories recursively", false).option("-b, --base-url <url>", "Base URL where the photos are hosted").option("-t, --thumbs-base-url <url>", "Base URL where the thumbnails are hosted").option("--no-thumbnails", "Skip creating thumbnails when building the gallery", true).option("--no-scan", "Do not scan for new photos when building the gallery", true).option(
+  "--theme <package|path>",
+  "Theme package name (e.g., @simple-photo-gallery/theme-modern) or local path (e.g., ./themes/my-theme)"
+).option("--thumbnail-size <pixels>", "Override thumbnail size in pixels", Number.parseInt).option("--thumbnail-edge <mode>", "Override how thumbnail size is applied: auto, width, or height").action(withCommandContext((options, ui) => build(options, ui)));
+program.command("clean").description("Remove all gallery files and folders (index.html, gallery/)").option("-g, --gallery <path>", "Path to the directory of the gallery. Default: current working directory", process4.cwd()).option("-r, --recursive", "Clean subdirectories recursively", false).action(withCommandContext((options, ui) => clean(options, ui)));
+program.command("create-theme").description("Create a new theme template").argument("<name>", "Name of the theme to create").option("-p, --path <path>", "Path where the theme should be created. Default: ./themes/<name>").action(async (name, options, command) => {
+  const handler = withCommandContext((opts, ui) => createTheme({ name, path: opts.path }, ui));
+  await handler(options, command);
+});
 program.command("telemetry").description("Manage anonymous telemetry preferences. Use 1 to enable, 0 to disable, or no argument to check status").option("-s, --state <state>", "Enable (1) or disable (0) telemetry", parseTelemetryOption).action(withCommandContext((options, ui) => telemetry(options, ui, telemetryService)));
 program.parse();
 //# sourceMappingURL=index.js.map