Tidy up

Remove testing code and old functions

fileProcessor.js

@@ -12,89 +12,11 @@ const gerberFiles = [
   'CAMOutputs/GerberFiles/profile.gbr'
 ]
 
-let newLayers = [];
+/**
-
+ * Extracts the passed in zip file
-// Use a sample zip archive
+ * @param {string} fileName
-
+ * @returns {Promise} Promise object represents number of files extracted
-const zip =  new StreamZip({
+ */
-  file: './gerber/sho_v2.zip',
-  storeEntries: true
-});
-
-function countFiles() {
-  // Read the zip file
-  zip.on('ready', () => {
-    console.log('Entries read: ' + zip.entriesCount);
-    for (const entry of Object.values(zip.entries())) {
-      const desc = entry.isDirectory ? 'directory' : `${entry.size} bytes`;
-      console.log(`Entry ${entry.name}: ${desc}`);
-    }
-    zip.close()
-  });
-}
-
-function getFiles() {
-  // Get the gerber files from the zip archive
-  zip.on('ready', () => {
-    let fileName = 'CAMOutputs/GerberFiles/silkscreen_top.gbr';
-    zip.stream(fileName, (err, stm) => {
-      newLayers.push({
-        filename: fileName,
-        gerber: stm
-      });
-      stm.on('end', () => zip.close());
-      console.log(newLayers);
-    });
-  });
-}
-
-async function getLayers2(fileName) {
-  const tempDir = path.join(__dirname, 'gerber', 'tmp', 'archive');
-  const archive =  new StreamZip({
-    file: fileName,
-    storeEntries: true
-  });
-  try {
-    archive.on('ready', () => {
-      fs.mkdirSync(tempDir, { recursive: true });
-      archive.extract(null, tempDir, (err, count) => {
-        console.log(err ? 'Extract error' : `Extracted ${count} entries`);
-        const layers = gerberFiles.map(fileName => ({
-          filename: fileName,
-          gerber: fs.createReadStream(path.join(tempDir, fileName))
-        }));
-        archive.close();
-        return layers;
-      });
-    });
-  } catch (err) {
-    console.error(err);
-  }
-}
-
-async function getLayers(fileName) {
-  return new Promise((resolve, reject) => {
-    const tempDir = path.join(__dirname, 'gerber', 'tmp', 'archive');
-    extractArchive(fileName)
-      .then(numfiles => {
-        console.log(`${numfiles} files extracted successfully`);
-        const layers = gerberFiles.map(fileName => ({
-          filename: fileName,
-          gerber: fs.createReadStream(path.join(tempDir, fileName))
-        }));
-        if(numfiles > 0) {
-          // Some files were extracted
-          resolve(layers);
-        } else {
-          reject();
-        }
-      })
-      .catch(e => {
-        console.log(e);
-      })
-  })
-}
-
 function extractArchive(fileName) {
   // Configure archive to use
   const archive =  new StreamZip({
@@ -121,13 +43,27 @@ function extractArchive(fileName) {
   })
 }
 
-// Helper methods
+async function getLayers(fileName) {
-function validFiles(file) {
+  return new Promise((resolve, reject) => {
-  return gerberFiles.includes(file);
+    const tempDir = path.join(__dirname, 'gerber', 'tmp', 'archive');
-}
+    extractArchive(fileName)
-
+      .then(numfiles => {
-function layerBuild(filename) {
+        console.log(`${numfiles} files extracted successfully`);
-  fs.createReadStream(filename);
+        const layers = gerberFiles.map(fileName => ({
+          filename: fileName,
+          gerber: fs.createReadStream(path.join(tempDir, fileName))
+        }));
+        if(numfiles > 0) {
+          // Some files were extracted
+          resolve(layers);
+        } else {
+          reject();
+        }
+      })
+      .catch(e => {
+        console.log(e);
+      })
+  })
 }
 
 async function cleanupFiles() {
@@ -140,20 +76,8 @@ async function cleanupFiles() {
   }
 }
 
-function getStream(fileName) {
+module.exports = {
-  let stream;
+  extractArchive,
-  zip.on('ready', () => {
+  getLayers,
-    stream = zip.entryDataSync(fileName);
+  cleanupFiles
-      zip.close();
-  console.log(stream);
-  })
 }
-
-
-// We want to return an array of layers
-
-
-exports.countFiles = countFiles;
-exports.extractArchive = extractArchive;
-exports.cleanupFiles = cleanupFiles;
-exports.getLayers = getLayers;

index.js

@@ -1,85 +1,46 @@
-const fs          = require('fs');
-const { file } = require('jszip');
 const pcbStackup  = require('pcb-stackup');
 const sharp       = require('sharp');
+const path        = require('path');
 const fileProc    = require('./fileProcessor.js');
 
 // Configuration
-const resizeWidth = 600;
+const config = {
-const density = 1000;
+  resizeWidth: 600,
-const compLevel = 1;
+  density: 1000,
-const destfile = './gerber/pcb3.png';
+  compLevel: 1,
+}
 
-//Sample gerber
+// Functions
-const sampleNames = [
+function gerberToImage(gerber, imageName) {
-  './gerber/default/copper_top.gbr',
+  return new Promise((resolve, reject) => {
-  './gerber/default/drill_1_16.xln',
+    const destFile = path.join(__dirname, 'gerber', 'pcb', imageName);
-  './gerber/default/silkscreen_top.gbr',
+    fileProc.getLayers(gerber)
-  './gerber/default/soldermask_top.gbr',
-  './gerber/default/solderpaste_top.gbr',
-  './gerber/default/profile.gbr',
-]
-
-const samplelayers = sampleNames.map(filename => ({
-  filename,
-  gerber: fs.createReadStream(filename),
-}));
-
-// pcbStackup(layers).then(stackup => {
-//   // Create buffer from SVG string
-//   sharp(Buffer.from(stackup.top.svg), { density: density })
-//   .resize({ width: resizeWidth })
-//   .png({ 
-//     compressionLevel: compLevel })
-//   .toFile(destfile)
-//   .then((info) => {
-//     console.log(info)
-//   })
-//   .catch((e) => {
-//     console.error(e);
-//   })
-// })
-// .catch((e) => {
-//   console.error(e);
-// });
-
-// fileProc.jsTest();
-// console.log(layers);
-
-// fileProc.getLayers();
-// fileProc.getStream('CAMOutputs/GerberFiles/silkscreen_top.gbr');
-// fileProc.extractArchive('./gerber/sho_v2.zip')
-// fileProc.cleanupFiles();
-
-// async () => {
-//   const templayers = await fileProc.getLayers('./gerber/sho_v2.zip');
-//   console.log(templayers);
-// }
-// fileProc.extractArchive('./gerber/sho_v2.zip')
-//   .then(msg => {
-//     console.log('done');
-//   })
-
-// const templayers = fileProc.getLayers('./gerber/sho_v2.zip')
-// console.log(templayers)
-
-fileProc.getLayers('./gerber/Timmy.zip')
       .then(layers => {
         pcbStackup(layers).then(stackup => {
           // Create buffer from SVG string
-      sharp(Buffer.from(stackup.top.svg), { density: density })
+          sharp(Buffer.from(stackup.top.svg), { density: config.density })
-      .resize({ width: resizeWidth })
+          .resize({ width: config.resizeWidth })
           .png({ 
-        compressionLevel: compLevel })
+            compressionLevel: config.compLevel })
-      .toFile(destfile)
+          .toFile(destFile)
           .then((info) => {
-        console.log(info)
+            // Succesful
+            fileProc.cleanupFiles();
+            resolve(info);
           })
           .catch((e) => {
-        console.error(e);
+            fileProc.cleanupFiles();
+            reject(e);
           })
         })
       .catch((e) => {
-      console.error(e);
+        reject(e);
       });
     })
+  })
+}
+
+gerberToImage('./gerber/Timmy.zip', 'timmy.png').then(info => console.log(info))
+  .catch(e => {
+    console.error(e);
+  })