Refactor Dockerfile to execute start.sh and update .gitignore to exclude *.png files. Enhance fetchImages.js with improved path normalization and debug logging for asset checks, ensuring more reliable image fetching and processing.

.gitignore

@@ -3,7 +3,6 @@ dist
 build
 images/
 *.html
-*.png
 *.jpg
 *.jpeg
 *.gif

Dockerfile

@@ -5,5 +5,6 @@ COPY package.json package-lock.json ./
 RUN npm install
 
 COPY . .
+RUN chmod +x start.sh
 
-CMD ["sh", "-c", "node fetchImages.js && node generateSite.js"]
+CMD ["./start.sh"]

docker-compose.yml

@@ -4,8 +4,8 @@ services:
   gallery:
     build: .
     volumes:
-      - ./public:/app/public
       - ./images:/app/images
+      - ./images.json:/app/images.json
     expose:
       - "3000"
     environment:

fetchImages.js

@@ -62,20 +62,22 @@ async function getAlbumAssets() {
             const fileName = `${asset.id}_${asset.originalFileName || 'untitled'}`;
             const outputPath = path.join(config.outputDir, fileName);
             
-            // Add debug logging to understand the state
-            console.log(`Checking asset ${asset.id}:`);
-            console.log(`- Expected path: ${outputPath}`);
-            
             // Check if file already exists and is in our metadata
             const existingImage = existingImages.find(img => img.id === asset.id);
             if (existingImage) {
-                console.log(`- Found in metadata: ${existingImage.localPath}`);
+                // Normalize the paths to ensure consistent comparison
-                if (fs.existsSync(existingImage.localPath)) {
+                const normalizedExistingPath = path.normalize(existingImage.localPath);
-                    console.log(`- File exists on disk, skipping download`);
+                const normalizedOutputPath = path.normalize(outputPath);
+                
+                console.log(`Checking paths:`);
+                console.log(`- Current path: ${normalizedOutputPath}`);
+                console.log(`- Existing path: ${normalizedExistingPath}`);
+                
+                if (fs.existsSync(normalizedOutputPath)) {
+                    console.log(`File exists, skipping: ${fileName}`);
                     images.push(existingImage);
                     continue;
                 }
-                console.log(`- File not found on disk at ${existingImage.localPath}`);
             }
             
             console.log(`Downloading: ${fileName}`);

start.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+node generateSite.js &  # Run the site generator in background
+node fetchImages.js     # Run the image fetcher in foreground