fsmerge

Author: janproch

src/diflow.ts

@@ -1,6 +1,7 @@
 import path from 'path';
 import { Processor } from './processor';
 import { Command } from 'commander';
+import { filesystemMerge } from './fsmerge';
 
 const program = new Command();
 
@@ -20,7 +21,7 @@ program
     'secret for accessing repo. URLs of git repos should be in shape https://DIFLOW_GIT_SECRET@<url>. You could also use DIFLOW_GIT_SECRET env variable.'
   )
   .option('--clear', 'clear work repos before running')
-  .action(options => {
+  .action(async options => {
     // console.log('repo:', options.repo);
     // console.log('branch:', options.branch);
     // return;
@@ -29,7 +30,18 @@ program
       clear: options.clear,
       secret: options.secret ?? process.env.DIFLOW_GIT_SECRET,
     });
-    processor.process();
+    await processor.process();
+    console.log('Processing complete.');
+  });
+
+program
+  .command('fsmerge')
+  .description('Run simple merge between directories (base+diff=merged)')
+  .requiredOption('-b, --base <string>', 'Foder with base repository')
+  .requiredOption('-d, --diff <string>', 'Foder with diff repository')
+  .requiredOption('-m, --merged <string>', 'Foder with merged repository (output folder)')
+  .action(async options => {
+    await filesystemMerge(options.base, options.diff, options.merged);
     console.log('Processing complete.');
   });
 

src/fsmerge.ts

@@ -0,0 +1,51 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+function skipPath(src: string) {
+  if (src.includes('/node_modules/')) return true;
+  if (src.includes('\\node_modules\\')) return true;
+
+  if (src.includes('/.git/')) return true;
+  if (src.includes('\\.git\\')) return true;
+
+  return false;
+}
+
+async function copyDir(src: string, dest: string) {
+  // Check if the source directory exists
+  if (!await fs.exists(src)) {
+    console.error(`Source directory "${src}" does not exist.`);
+    return;
+  }
+
+  // Create the destination directory if it does not exist
+  if (!await fs.exists(dest)) {
+    await fs.mkdir(dest, { recursive: true });
+  }
+
+  // Read the contents of the source directory
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  for (let entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (skipPath(srcPath)) continue;
+    if (skipPath(destPath)) continue;
+
+    if (entry.isDirectory()) {
+      await copyDir(srcPath, destPath);
+    } else {
+      await fs.copy(destPath, srcPath);
+    }
+  }
+}
+
+export async function filesystemMerge(base: string, diff: string, merged: string) {
+  await fs.ensureDir(merged);
+  console.log('Copying:', base, '=>', merged);
+  await copyDir(base, merged);
+  console.log('Copying:', diff, '=>', merged);
+  await copyDir(diff, merged);
+  console.log('Directories merged successfully');
+}